Count aborted pools

Author: duddu

lib/runner/extensions/control.command.js

@@ -108,9 +108,9 @@ module.exports = {
             // clear instruction pool and as such there will be nothing next to execute
             this.getPool(payload.coords.ref).clear();
 
-            if (!this.hasPendingInstructions() && !this.__aborted) {
-                this.__aborted = true;
-
+            // wait until all pools have been cleared, then trigger abort
+            this.__aborted = (this.__aborted || 0) + 1;
+            if (this.__aborted === _.size(this.pools)) {
                 this.triggers.abort(null);
 
                 // execute the userback sent as part of the command and do so in a try block

lib/runner/run.js

@@ -189,14 +189,6 @@ _.assign(Run.prototype, {
         return this.pools[pid];
     },
 
-    /**
-     * @private
-     * @return {Boolean}
-     */
-    hasPendingInstructions: function () {
-        return !_.isEmpty(_.pickBy(this.pools, '_queue.length'));
-    },
-
     /**
      * @private
      *