change activeWorkers API

README.md

@@ -110,11 +110,13 @@ Terminates the entire cluster and removes all listeners.
 
 ### cluster.activeWorkers()
 
-Returns a list of the workers that are currently serving requests
+Returns a hash of all worker slots (0 <= WORKER_ID < N). If a worker isn't
+available at that slot, the value in the hash is null or undefined. Otherwise,
+the value will be a worker object that is ready to serve requests.
 
 ### cluster.workers()
 
-Returns a list of all the workers, including those that are not
+Returns an array of all the workers, including those that are not
 yet ready or those that will be replaced.
 
 # worker cleanup

index.js

@@ -41,7 +41,12 @@ module.exports = function(file, opt) {
 
     var workers = [];
 
-    var activeWorkers = [];
+    var activeWorkers = {length: opt.workers};
+    function deactivate(w) {
+        if (activeWorkers[w._rc_wid] == w) {
+            activeWorkers[w._rc_wid] = null;
+        }
+    }
 
     function emit() {
         channel.emit.apply(self, arguments);
@@ -67,7 +72,7 @@ module.exports = function(file, opt) {
         });
         w.process.on('exit', function() {
             utils.removeFrom(workers, w);
-            utils.removeFrom(activeWorkers, w)
+            deactivate(w);
         });
         workers.push(w);
         return w;
@@ -78,7 +83,7 @@ module.exports = function(file, opt) {
         if (worker._rc_isReplaced) return;
         worker._rc_isReplaced = true;
 
-        utils.removeFrom(activeWorkers, worker)
+        deactivate(worker);
 
         var now  = Date.now()
         var time = backoff(now)
@@ -133,7 +138,7 @@ module.exports = function(file, opt) {
             process.nextTick(trykillfn);
         }
 
-        utils.removeFrom(activeWorkers, worker)
+        deactivate(worker);
     }
 
 
@@ -171,7 +176,7 @@ module.exports = function(file, opt) {
         });
         // When a worker becomes ready, add it to the active list
         channel.on('ready', function workerReady(w) {
-            activeWorkers.push(w);
+            activeWorkers[w._rc_wid] = w;
         })
 
     }

test/lib/server.js

@@ -6,16 +6,13 @@ if (null == process.env.WORKER_ID)
 var s = http.createServer(function(req, res) {
     var params = req.url.split('/').slice(1);
     setTimeout(function() { 
-        if (process.argv[2] === 'fail') {
-            // we can only communicate with the test through an error. 404 is as good as any.
-            res.writeHead(404);
-            res.end('FAIL');
-        } else {
-            res.writeHead(200);
-            res.end("hello world\n");
-        }
+        res.writeHead(200);
+        res.end("hello world\n");
     }, params[0] || 1);
 });
 
 s.listen(8000);
 
+setTimeout(function() {
+    throw new Error("Unclean exit!");
+}, 500);

test/termination.js

@@ -35,7 +35,14 @@ function pids() {
 }
 
 function activePids() {
-    return lib.balancer.activeWorkers().map(function(w) { return w.process.pid; });
+    var pids = [];
+    var aw = lib.balancer.activeWorkers();
+    for (var key in aw) {
+        if (key != 'length' && aw[key]) {
+            pids.push(aw[key].process.pid);
+        }
+    }
+    return pids;
 }
 function activeCount() {
     return Object.keys(require('cluster').workers).length