Showing latency in the visualizer now.

Author: ebfull

index.html

@@ -193,7 +193,9 @@ <h1>time between each block</h1>
 						.size([this.width,this.height])
 						.nodes([]) // no nodes
 						.friction(0.5)
-						.linkDistance(this.linkDistance)
+						.linkDistance(function(link) {
+							return link.linkDistance;
+						})
 						.charge(this.charge)
 						.gravity(this.gravity);
 
@@ -278,14 +280,14 @@ <h1>time between each block</h1>
 					return this.nindex-1;
 				},
 
-				connect: function(a, b) {
+				connect: function(a, b, latency) {
 					if (this.edges.hasOwnProperty(a + '-' + b) || this.edges.hasOwnProperty(b + '-' + a))
 						return false; // we're already connected
 
 					if (a==b)
 						return false; // can't connect to ourself silly!
 
-					this.edges[a + '-' + b] = {source:this.nodes[this.getKeyForID(a)],target:this.nodes[this.getKeyForID(b)]};
+					this.edges[a + '-' + b] = {source:this.nodes[this.getKeyForID(a)],target:this.nodes[this.getKeyForID(b)],linkDistance:latency};
 					this.links.push(this.edges[a + '-' + b]);
 
 					this.updated = true;

network.js

@@ -461,7 +461,7 @@ Network.prototype = {
 	// connects two nodes in the visualizer
 	connect: function (a, b) {
 		if (this.visualizer) {
-			this.visualizer.connect(this.nodes[a]._vid, this.nodes[b]._vid);
+			this.visualizer.connect(this.nodes[a]._vid, this.nodes[b]._vid, latency(this.nodes[a].id, this.nodes[b].id));
 		}
 	},
 

sim.js

@@ -19,7 +19,8 @@ client.init(function() {
 	var self = this;
 
 	// mincen client specific stuff
-	var mapMasters = {};
+	this.mapMasters = {};
+	var mapMasters = this.mapMasters;
 	mapMasters[this.id] = {num:10, last:-1};
 	var shares = [];
 	var shareh = -1;
@@ -92,6 +93,13 @@ client.init(function() {
 				self.inventory.relay(b.id, true);
 
 				self.blockchain.chainstate.enter(b);
+
+				if (!(self.id in mapMasters)) {
+					mapMasters[self.id] = {num:0,last:0};
+				}
+
+				mapMasters[self.id].num++;
+				mapMasters[self.id].last = b.h;
 			} else {
 				// ship off an unsignedblock to get it signed by the master
 				self.inventory.createObj("unsignedblock", {id:"unsigned_" + b.id, b:b})
@@ -206,9 +214,9 @@ client.init(function() {
 		return true;
 	})
 	this.tick(100 * 1000, function() {
-		if (this.peermgr.numActive() != this.peermgr.maxpeers) {
-			return true;
-		}
+		//if (this.peermgr.numActive() != this.peermgr.maxpeers) {
+		//	return true;
+		//}
 		// every 100 seconds boot off a poorly performing peer
 		var worst_n = Infinity;
 		var worst = null;