Merge pull request +9053 from c9/fix-vfs-cpu

Fix vfs cpu

.gitignore

@@ -44,7 +44,6 @@ node_modules/kaefer/node_modules/
 !node_modules/react-bootstrap
 !node_modules/oldclient
 !node_modules/vargs
-!node_modules/chrome-cpu-profiler
 
 node_modules/oldclient/node_modules
 node_modules/oldclient/plugins-server/c9.api.project/tmp*

node_modules/kaefer/lib/reliable_socket.js

@@ -54,6 +54,11 @@ var ReliableSocket = module.exports = function(socket, options) {
     this.on("stats", this.onStats.bind(this));
     this.on("stats_reply", this.onStatsReply.bind(this));
     socket.on("error", function(e){ console.error(e.message); });
+    
+    // var that = this;
+    // setInterval(function() {
+    //     console.log(that._getStats());
+    // }, 3000);
 };
 
 util.inherits(ReliableSocket, EventEmitter);

node_modules/kaefer/lib/version.js

@@ -2,6 +2,6 @@ define(function(require, exports, module) {
 
 // on each backwards incompatible protocol change the version number must be
 // increased
-exports.protocol = 10;
+exports.protocol = 11;
 
 });

node_modules/vfs-socket/consumer.js

@@ -39,6 +39,8 @@ function Consumer() {
 
         // Endpoint for readable streams at options.stream
         destroy: destroy,
+        resume: resume,
+        pause: pause,
 
         // Endpoint for processes in meta.process
         onExit: onExit,
@@ -190,6 +192,12 @@ function Consumer() {
             stream.destroy = function () {
                 remote.destroy(id);
             };
+            stream.pause = function () {
+                remote.pause(id);
+            };
+            stream.resume = function () {
+                remote.resume(id);
+            };
         }
 
         return stream;

node_modules/vfs-socket/worker.js

@@ -17,6 +17,8 @@ function Worker(vfs) {
 
         // Endpoint for readable stream at meta.stream (and meta.process.{stdout,stderr})
         destroy: destroy,
+        resume: resume,
+        pause: pause,
 
         // Endpoints for readable streams at options.stream
         onData: onData,
@@ -155,6 +157,12 @@ function Worker(vfs) {
             stream.destroy = function () {
                 remote.destroy(id);
             };
+            stream.resume = function () {
+                remote.resume(id);
+            };
+            stream.pause = function () {
+                remote.pause(id);
+            };
         }
 
         return stream;
@@ -240,6 +248,13 @@ function Worker(vfs) {
             return pty && pty.token;
         
         var pid = storeProcess(pty, true); delete pty.token;
+        
+        if (!pty.resume && pty.socket && pty.socket.resume)
+            pty.resume = pty.socket.resume.bind(pty.socket);
+            
+        if (!pty.pause && pty.socket && pty.socket.pause)
+            pty.pause = pty.socket.pause.bind(pty.socket);
+        
         var token = storeStream(pty); delete pty.token;
         token.pid = pid;
         pty.token = token;
@@ -302,6 +317,16 @@ function Worker(vfs) {
         if (chunk) stream.end(chunk);
         else stream.end();
     }
+    function resume(id) {
+        var stream = streams[id];
+        if (!stream) return;
+        return stream.resume && stream.resume();
+    }
+    function pause(id) {
+        var stream = streams[id];
+        if (!stream) return;
+        return stream.pause && stream.pause();
+    }
 
     function kill(pid, code) {
         var process = processes[pid];