modified JSONP statistics,

rearranged OSRM debug so that it works in IE
Project-OSRM · Mar 28, 2012 · 0ab287e · 0ab287e
1 parent 49cc0bf
commit 0ab287e
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 17 deletions.
diff --git a/WebContent/OSRM.JSONP.js b/WebContent/OSRM.JSONP.js
@@ -26,7 +26,6 @@ OSRM.JSONP = {
 	callbacks: {},
 	timeouts: {},
 	timers: {},
-	durations: {},
 
 
 	// default callback routines
@@ -51,7 +50,7 @@ OSRM.JSONP = {
 				OSRM.JSONP.fences[id] = undefined;						// clean fence
 			}
 
-			OSRM.debug.log("[jsonp] timout handling: "+id+" "+ (new Date() - OSRM.JSONP.durations[id]) );
+//			OSRM.debug.log("[jsonp] timout handling: "+id);
 		};
 
 		// wrap callback function
@@ -67,7 +66,8 @@ OSRM.JSONP = {
 				OSRM.JSONP.fences[id] = undefined;						// clean fence
 			}
 
-			OSRM.debug.log("[jsonp] response handling: "+id+" "+ (new Date() - OSRM.JSONP.durations[id]) );
+			OSRM.JSONP.sum[id] += new Number( new Date() - OSRM.JSONP.durations[id] );
+			OSRM.debug.log("[jsonp] response handling: "+id+" "+ (OSRM.JSONP.sum[id]/OSRM.JSONP.counter[id]).toFixed(2) );
 		};
 
 		// clean DOM (unfortunately, script elements cannot be reused by all browsers)
@@ -84,8 +84,12 @@ OSRM.JSONP = {
 
 		// start timeout timer
 		OSRM.JSONP.timers[id] = setTimeout(OSRM.JSONP.timeouts[id], timeout);
-		OSRM.JSONP.durations[id] = new Date();
-
+
+		// statistics
+		if(!OSRM.JSONP.durations) { OSRM.JSONP.durations = {}; OSRM.JSONP.counter = {}; OSRM.JSONP.sum = {}; }
+		if(OSRM.JSONP.counter[id]) OSRM.JSONP.counter[id]++; else {OSRM.JSONP.counter[id] = 1;OSRM.JSONP.sum[id] = 0;}
+		OSRM.JSONP.durations[id] = new Date();		
+
 //		OSRM.debug.log("[jsonp] init: "+id);		
 		return true;
 	},
@@ -96,6 +100,5 @@ OSRM.JSONP = {
 		OSRM.JSONP.callbacks = {};
 		OSRM.JSONP.timeouts = {};
 		OSRM.JSONP.timers = {};
-		OSRM.JSONP.durations = {};
 	}
 };
diff --git a/WebContent/OSRM.debug.js b/WebContent/OSRM.debug.js
@@ -21,6 +21,16 @@ or see http://www.gnu.org/licenses/agpl.txt.
 OSRM.debug = {};
 
 
+//working functions
+OSRM.debug.log = function(text) {
+	OSRM.debug.content.innerHTML += text + "<hr style='border:none; margin:2px; height:1px; color:#F0F0F0; background:#F0F0F0;'/>";
+	OSRM.debug.content.scrollTop = OSRM.debug.content.scrollHeight; 
+};
+OSRM.debug.clear = function() {
+	OSRM.debug.content.innerHTML = "";
+};	
+
+
 // add elements to DOM
 OSRM.debug.init = function() {
 	//create DOM objects for debug output
@@ -53,14 +63,4 @@ OSRM.debug.init = function() {
 if(document.addEventListener)	// FF, CH
 	document.addEventListener("DOMContentLoaded", OSRM.debug.init, false);
 else	// IE
-	OSRM.debug.init();
-
-
-// working functions
-OSRM.debug.log = function(text) {
-	OSRM.debug.content.innerHTML += text + "<hr style='border:none; margin:2px; height:1px; color:#F0F0F0; background:#F0F0F0;'/>";
-	OSRM.debug.content.scrollTop = OSRM.debug.content.scrollHeight; 
-};
-OSRM.debug.clear = function() {
-	OSRM.debug.content.innerHTML = "";
-};	
+	OSRM.debug.init();