proper dispose if ide plugins

Conflicts:

	server/cloud9/ide.js

README.md

@@ -90,6 +90,14 @@ If you get an error about unable to load o3-xml or an architecture error, you wi
 
 after this you can start cloud9 manually using node bin/cloud9.js
 
+## How to compile a custom node.js binary
+
+There is a known V8 bug in the 0.2.x banch of node, which prevents the debugger from working under Linux. To work around this bug the node binary has to be compiled with gcc 4.4:
+
+    $ export GCC_VERSION=44
+    $ configure
+    $ make
+
 ## Documentation
 
 Documentation is in the making. 

server/cloud9/ext/debugger/index.js

@@ -88,19 +88,7 @@ sys.inherits(DebuggerPlugin, Plugin);
                     this.ide.broadcast('{"type": "node-debug-ready"}');
                 break;
             case "kill":
-                var child = this.child;
-                if (!child)
-                    break;
-                try {
-                    child.kill();
-                    // check after 2sec if the process is really dead
-                    // If not kill it harder
-                    setTimeout(function() {
-                        if (child.pid > 0)
-                            child.kill("SIGKILL");
-                    }, 2000)
-                }
-                catch(e) {}
+                this.$kill();
                 break;
             default:
                 res = false;
@@ -109,6 +97,22 @@ sys.inherits(DebuggerPlugin, Plugin);
         return res;
     };
 
+    this.$kill = function() {
+        var child = this.child;
+        if (!child)
+            return;
+        try {
+            child.kill();
+            // check after 2sec if the process is really dead
+            // If not kill it harder
+            setTimeout(function() {
+                if (child.pid > 0)
+                    child.kill("SIGKILL");
+            }, 2000)
+        }
+        catch(e) {}
+    };
+
     this.$run = function(message, client) {
         var _self = this;
 
@@ -205,4 +209,10 @@ sys.inherits(DebuggerPlugin, Plugin);
 
         this.nodeDebugProxy.connect();
     };
+
+    this.dispose = function(callback) {
+        this.$kill();
+        callback();
+    };
+
 }).call(DebuggerPlugin.prototype);

server/cloud9/ext/shell-git/index.js

@@ -75,4 +75,10 @@ sys.inherits(ShellGitPlugin, Plugin);
 
         return true;
     };
+
+    this.dispose = function(callback) {
+        // TODO kill all running processes!
+        callback();
+    };
+
 }).call(ShellGitPlugin.prototype);

server/cloud9/ext/shell/index.js

@@ -163,4 +163,9 @@ sys.inherits(ShellPlugin, Plugin);
             callback(tail, matches);
         });
     };
+
+    this.dispose = function(callback) {
+        // TODO kill all running processes!
+        callback();
+    }
 }).call(ShellPlugin.prototype);

server/cloud9/ext/watcher/index.js

@@ -10,20 +10,21 @@ var fs      = require("fs"),
 function cloud9WatcherPlugin(ide) {
     this.ide = ide;
     this.hooks  = ["disconnect", "command"];
+    this.filenames = {};
 }
 
 (function() {
-    var filenames = {};
-
     function unwatchFile(filename) {
         // console.log("No longer watching file " + filename);
-        delete filenames[filename];
+        delete this.filenames[filename];
         fs.unwatchFile(filename);
         return true;
     }
 
+    // TODO: this does not look correct. There could be more than one client be
+    // attached. There needs to be a per client list with ref counting
     this.disconnect = function() {
-        for (var filename in filenames) 
+        for (var filename in this.filenames) 
             unwatchFile(filename);
         return true;
     };
@@ -39,7 +40,7 @@ function cloud9WatcherPlugin(ide) {
             filename = path.replace(/\/workspace/, this.ide.workspaceDir);
             switch (type) {
             case "watchFile":
-                if (filenames[filename]) 
+                if (this.filenames[filename]) 
                     ; // console.log("Already watching file " + filename);
                 else {
                     // console.log("Watching file " + filename);
@@ -73,7 +74,7 @@ function cloud9WatcherPlugin(ide) {
                         }));
                         // console.log("Sent " + subtype + " notification for file " + filename);
                     });
-                    filenames[filename] = filename;
+                    this.filenames[filename] = filename;
                 }
                 return true;
             case "unwatchFile":
@@ -83,6 +84,13 @@ function cloud9WatcherPlugin(ide) {
             }
         }
     };
+
+    this.dispose = function(callback) {
+        for (filename in this.filenames)
+            unwatchFile(this.filenames[filename]);
+        callback();
+    };
+
 }).call(cloud9WatcherPlugin.prototype = new plugin());
 
 module.exports = cloud9WatcherPlugin;

server/cloud9/ide.js

@@ -130,6 +130,7 @@ sys.inherits(Ide, EventEmitter);
     this.addClientConnection = function(client, message) {
         var _self = this;
         this.clients[client.sessionId] = client;
+        this.onClientCountChange();
 
         client.on("message", function(message) {
             _self.onClientMessage(message, client);
@@ -138,11 +139,16 @@ sys.inherits(Ide, EventEmitter);
         client.on("disconnect", function() {
             _self.execHook("disconnect");
             delete _self.clients[client.sessionId];
+            _self.onClientCountChange();
         });
 
         if (message)
             _self.onClientMessage(message, client);            
     };
+
+    this.onClientCountChange = function() {
+        this.emit("clientCountChange", Object.keys(this.clients).length);
+    };
 
     this.onClientMessage = function(message, client) {
         try {
@@ -187,8 +193,8 @@ sys.inherits(Ide, EventEmitter);
         // if we get here, no hook function was successfully delegated to an
         // extension.
 
-        this.error("Error: no handler found for hook '" + hook + "'. Arguments: "
-            + sys.inspect(args), 9, args[0]);
+        //this.error("Error: no handler found for hook '" + hook + "'. Arguments: "
+        //    + sys.inspect(args), 9, args[0]);
     };
 
     this.error = function(description, code, message, client) {
@@ -205,4 +211,17 @@ sys.inherits(Ide, EventEmitter);
         else
             this.broadcast(error);
     };
+
+    this.dispose = function(callback) {
+        var count;
+        for (var name in this.exts) {
+            count++;
+            var ext = this.exts[name];
+            ext.dispose(function() {
+                count--;
+                if (count == 0)
+                    callback();
+            });
+        }
+    };
 }).call(Ide.prototype);

server/cloud9/plugin.js

@@ -58,6 +58,11 @@ function cloud9Plugin() {}
 
         return child;
     };
+
+    this.dispose = function(callback) {
+        callback();
+    };
+
 }).call(cloud9Plugin.prototype = new Events.EventEmitter());
 
 module.exports = cloud9Plugin;