Ticket #1424: html5-timers-managed.patch

html5/js/Protocol.js

@@ -122 +122 @@
         this.websocket.onmessage = function (e) {
                 // push arraybuffer values onto the end
                 me.rQ.push(new Uint8Array(e.data));
+                if (me.rQ_interval_id === null) {
+                        me.rQ_interval_id = setInterval(function() {
+                                me.process_receive_queue();
+                        }, this.process_interval);
+                }
         };
         this.start_processing();
 }
@@ -139 +144 @@
 }
 
 XpraProtocol.prototype.start_processing = function() {
-        var me = this;
-        if(this.rQ_interval_id === null){
-                this.rQ_interval_id = setInterval(function(){
-                        if (me.rQ.length > 0) {
-                                me.process_receive_queue();
-                        }
-                }, this.process_interval);
-        }
-
-        if(this.sQ_interval_id === null){
-                this.sQ_interval_id = setInterval(function(){
-                        if(me.sQ.length > 0){
-                                me.process_send_queue();
-                        }
-                }, this.process_interval);
-        }
-
-        if(this.mQ_interval_id === null){
-                this.mQ_interval_id = setInterval(function(){
-                        if(me.mQ.length > 0){
-                                me.process_message_queue();
-                        }
-                }, this.process_interval);
-        }
 }
 XpraProtocol.prototype.stop_processing = function() {
         clearInterval(this.rQ_interval_id);
@@ -177 +158 @@
 
 
 XpraProtocol.prototype.process_receive_queue = function() {
+        if (this.rQ.length === 0) {
+                clearInterval(this.rQ_interval_id);
+                this.rQ_interval_id = null;
+                return;
+        }
+
         var i = 0, j = 0;
         if (this.header.length<8 && this.rQ.length>0) {
                 //add from receive queue data to header until we get the 8 bytes we need:
@@ -349 +336 @@
                         }
                         if (this.is_worker){
                                 this.mQ[this.mQ.length] = packet;
+                                if(this.mQ_interval_id === null){
+                                        var me = this;
+                                        this.mQ_interval_id = setInterval(function() {
+                                                me.process_message_queue();
+                                        }, this.process_interval);
+                                }
                         } else {
                                 this.packet_handler(packet, this.packet_ctx);
                         }
@@ -360 +353 @@
         }
 
         // see if buffer still has unread packets
-        if (this.rQ.length > 0) {
-                this.process_receive_queue();
+        if (this.rQ.length === 0) {
+                clearInterval(this.rQ_interval_id);
+                this.rQ_interval_id = null;
         }
 }
 
 XpraProtocol.prototype.process_send_queue = function() {
+        clearInterval(this.sQ_interval_id);
+        this.sQ_interval_id = null;
         while(this.sQ.length !== 0) {
                 var packet = this.sQ.shift();
                 if(!packet){
@@ -412 +408 @@
 }
 
 XpraProtocol.prototype.process_message_queue = function() {
+        clearInterval(this.mQ_interval_id);
+        this.mQ_interval_id = null;
         while(this.mQ.length !== 0){
                 var packet = this.mQ.shift();
 
@@ -426 +424 @@
 
 XpraProtocol.prototype.send = function(packet) {
         this.sQ[this.sQ.length] = packet;
+        if(this.sQ_interval_id === null){
+                var me = this;
+                this.sQ_interval_id = setInterval(function() {
+                        me.process_send_queue();
+                }, this.process_interval);
+        }
 }
 
 XpraProtocol.prototype.set_packet_handler = function(callback, ctx) {