Merge pull request #68 from jitsi/performanceTime_format

Fixes the performance time structure which is used by torture

JitsiConference.js

@@ -845,10 +845,10 @@ JitsiConference.prototype.getLogs = function () {
 };
 
 /**
- * Returns measured performanceTimes.
+ * Returns measured connectionTimes.
  */
-JitsiConference.prototype.getPerformanceTimes = function () {
-    return this.room.performanceTimes;
+JitsiConference.prototype.getConnectionTimes = function () {
+    return this.room.connectionTimes;
 };
 
 /**
@@ -885,7 +885,7 @@ function setupListeners(conference) {
         if (conference.room.isFocus(jingleSession.peerjid)) {
             // Accept incoming call
             conference.room.setJingleSession(jingleSession);
-            conference.room.performanceTimes["session.initiate"] = now;
+            conference.room.connectionTimes["session.initiate"] = now;
             jingleSession.initialize(false /* initiator */, conference.room);
             conference.rtc.onIncommingCall(jingleSession);
             jingleSession.acceptOffer(jingleOffer, null,

JitsiConnection.js

@@ -94,10 +94,10 @@ JitsiConnection.prototype.removeEventListener = function (event, listener) {
 }
 
 /**
- * Returns measured performanceTimes.
+ * Returns measured connectionTimes.
  */
-JitsiConnection.prototype.getPerformanceTimes = function () {
-    return this.xmpp.performanceTimes;
+JitsiConnection.prototype.getConnectionTimes = function () {
+    return this.xmpp.connectionTimes;
 };
 
 module.exports = JitsiConnection;

connection_optimization/external_connect.js

@@ -33,7 +33,7 @@ function createConnectionExternally(webserviceUrl, success_callback,
 
     xhttp.onreadystatechange = function() {
         if (xhttp.readyState == xhttp.DONE) {
-            var now = window.performanceTimes["external_connect.done"] =
+            var now = window.connectionTimes["external_connect.done"] =
                 window.performance.now();
             console.log("(TIME) external connect XHR done:\t", now);
             if (xhttp.status == HTTP_STATUS_OK) {
@@ -53,8 +53,8 @@ function createConnectionExternally(webserviceUrl, success_callback,
     xhttp.timeout = 3000;
 
     xhttp.open("GET", webserviceUrl, true);
-    window.performanceTimes = {};
-    var now = window.performanceTimes["external_connect.sending"] =
+    window.connectionTimes = {};
+    var now = window.connectionTimes["external_connect.sending"] =
         window.performance.now();
     console.log("(TIME) Sending external connect XHR:\t", now);
     xhttp.send();

modules/xmpp/ChatRoom.js

@@ -83,7 +83,7 @@ function ChatRoom(connection, jid, password, XMPP, options, settings) {
     this.lastPresences = {};
     this.phoneNumber = null;
     this.phonePin = null;
-    this.performanceTimes = {};
+    this.connectionTimes = {};
 }
 
 ChatRoom.prototype.initPresenceMap = function () {
@@ -264,9 +264,9 @@ ChatRoom.prototype.onPresence = function (pres) {
         }
         if (!this.joined) {
             this.joined = true;
-            var now = this.performanceTimes["muc.joined"] =
+            var now = this.connectionTimes["muc.joined"] =
                 window.performance.now();
-            console.log("(TIME) MUC joined:\t", now);
+            logger.log("(TIME) MUC joined:\t", now);
             this.eventEmitter.emit(XMPPEvents.MUC_JOINED);
         }
     } else if (this.members[from] === undefined) {

modules/xmpp/JingleSessionPC.js

@@ -152,11 +152,9 @@ JingleSessionPC.prototype.doInitialize = function () {
      */
     this.peerconnection.oniceconnectionstatechange = function (event) {
         if (!(self && self.peerconnection)) return;
-        self.room.performanceTimes["ice.state"] =
-            self.room.performanceTimes["ice.state"] || [];
         var now = window.performance.now();
-        self.room.performanceTimes["ice.state"].push(
-            {state: self.peerconnection.iceConnectionState, time: now});
+        self.room.connectionTimes["ice.state." +
+            self.peerconnection.iceConnectionState] = now;
         logger.log("(TIME) ICE " + self.peerconnection.iceConnectionState +
                     ":\t", now);
         self.updateModifySourcesQueue();

modules/xmpp/strophe.jingle.js

@@ -95,7 +95,7 @@ module.exports = function(XMPP, eventEmitter) {
             switch (action) {
                 case 'session-initiate':
                     var now = window.performance.now();
-                    console.log("(TIME) received session-initiate:\t", now);
+                    logger.log("(TIME) received session-initiate:\t", now);
                     var startMuted = $(iq).find('jingle>startmuted');
                     if (startMuted && startMuted.length > 0) {
                         var audioMuted = startMuted.attr("audio");

modules/xmpp/xmpp.js

@@ -37,7 +37,7 @@ function XMPP(options, token) {
     this.eventEmitter = new EventEmitter();
     this.connection = null;
     this.disconnectInProgress = false;
-    this.performanceTimes = {status: []};
+    this.connectionTimes = {};
     this.forceMuted = false;
     this.options = options;
     initStrophePlugins(this);
@@ -62,9 +62,7 @@ XMPP.prototype.getConnection = function () { return this.connection; };
  */
 XMPP.prototype.connectionHandler = function (password, status, msg) {
     var now = window.performance.now();
-    this.performanceTimes["status"].push(
-        {state: Strophe.getStatusString(status),
-        time: now});
+    this.connectionTimes[Strophe.getStatusString(status).toLowerCase()] = now;
     logger.log("(TIME) Strophe " + Strophe.getStatusString(status) +
         (msg ? "[" + msg + "]" : "") + ":\t", now);
     if (status === Strophe.Status.CONNECTED ||
@@ -171,7 +169,7 @@ XMPP.prototype._connect = function (jid, password) {
  * @param options {object} connecting options - rid, sid, jid and password.
  */
  XMPP.prototype.attach = function (options) {
-    var now = this.performanceTimes["attaching"] = window.performance.now();
+    var now = this.connectionTimes["attaching"] = window.performance.now();
     logger.log("(TIME) Strophe Attaching\t:" + now);
     this.connection.attach(options.jid, options.sid, parseInt(options.rid,10)+1,
         this.connectionHandler.bind(this, options.password));