diag/net: more powerfil d3 vis
Juan Batiz-Benet committed
Jan 16, 2015 at 02:12 UTC
cff596d42a09de543fe4e4a510952cf08687703e
2 files changed
+16
-4
diagnostics/d3/chord.html
+9
-3
@@ -109,9 +109,12 @@ d3.json(hash, function(error, data) {
109
.attr("dy", 3)
110
// .attr("text-anchor", function(d) { return d.x < 180 ? "start" : "end"; })
111
// .attr("transform", function(d) { return d.x < 180 ? null : "rotate(180)"; })
112
- .text(function(d) { return d.conns + " - " + d.name; })
112
+ .text(function(d) { return d.conns + " - " + (d.rtkey || d.name); })
113
.attr("transform", function(d) { return "rotate(" + (d.x - 90 + rotate) + ")translate(" + d.y + ")"; })
114
115
+ node.append("svg:title")
116
+ .text(function(d) { return d.name; });
117
+
118
// var mid = svg.selectAll(".node-mid")
119
// .data(graph.mids)
120
// .enter().append("g")
@@ -135,8 +138,11 @@ function parseGraph(graph2) {
138
graph.mids = []
139
140
graph2.nodes.sort(function(a, b) {
138
- if (a.name > b.name) return 1;
139
- if (a.name < b.name) return -1;
141
+ var aname = a.rtkey || a.name
142
+ var bname = b.rtkey || b.name
143
+
144
+ if (aname > bname) return 1;
145
+ if (aname < bname) return -1;
146
return 0;
147
})
148
diagnostics/vis.go
+7
-1
@@ -4,11 +4,15 @@ import (
4
"encoding/json"
5
"fmt"
6
"io"
7
+
8
+ peer "github.com/jbenet/go-ipfs/p2p/peer"
9
+ rtable "github.com/jbenet/go-ipfs/routing/kbucket"
10
)
11
12
type node struct {
13
Name string `json:"name"`
14
Value uint64 `json:"value"`
15
+ RtKey string `json:"rtkey"`
16
}
17
18
type link struct {
@@ -24,7 +28,9 @@ func GetGraphJson(dinfo []*DiagInfo) []byte {
28
for _, di := range dinfo {
29
names[di.ID] = len(nodes)
30
val := di.BwIn + di.BwOut + 10
27
- nodes = append(nodes, &node{Name: di.ID, Value: val})
31
+ // include the routing table key, for proper routing table display
32
+ rtk := peer.ID(rtable.ConvertPeerID(peer.ID(di.ID))).Pretty()
33
+ nodes = append(nodes, &node{Name: di.ID, Value: val, RtKey: rtk})
34
}
35
36
var links []*link