Optimize clearing by marking entry.isRunnable

Gruntfile.js

@@ -12,7 +12,10 @@ module.exports = function(grunt) {
   grunt.initConfig({
     pkg: "<json:package.json>",
     nodeunit: {
-      files: ["test/**/*.js"]
+      files: [
+        "test/common/bootstrap.js",
+        "test/**/*.js"
+      ]
     },
     jshint: {
       all: {

README.md

@@ -48,11 +48,11 @@ temporal.delay(500, function() {
 
 // Add a task with an id
 temporal.delay({
+  id: "myTask",
   time:500, 
-  operation: function() {
+  task: function() {
     console.log("500ms later...");
   }),
-  id: "myTask"
 });
 
 // Selectively delete tasks

lib/temporal.js

@@ -1,3 +1,5 @@
+"use strict";
+
 var Emitter = require("events").EventEmitter;
 var util = require("util");
 
@@ -17,9 +19,12 @@ var isProcessing = false;
 // Queue emitters are stored privately in a Map to avoid using
 // |this| alias patterns.
 var priv = new Map();
+var taskId = 0;
 
-var tick = global.setImmediate || process.nextTick;
+// Entries stored by id
+var entriesById = new Map();
 
+var tick = global.setImmediate || process.nextTick;
 /**
  * Task create a temporal task item
  * @param {Object} entry Options for entry {time, task}
@@ -31,24 +36,25 @@ function Task(entry) {
 
   this.called = 0;
   this.now = this.calledAt = Date.now();
-
-  if (entry.id) {
-    this.id = entry.id;
-  }
+  this.id = entry.id || ++taskId;
 
   priv.set(this, entry);
 
   // Side table property definitions
   entry.isRunnable = true;
   entry.later = this.now + entry.time;
 
-
   if (!queue[entry.later]) {
     queue[entry.later] = [];
   }
 
-  // console.log( entry.later, this );
   queue[entry.later].push(this);
+
+  if (!entriesById.has(this.id)) {
+    entriesById.set(this.id, []);
+  }
+
+  entriesById.get(this.id).push(entry);
 }
 
 // Inherit EventEmitter API
@@ -231,33 +237,32 @@ function processQueue() {
 }
 
 ["loop", "delay"].forEach(function(type) {
-  exportable[type] = function(time, operation) {
-
-    var opts;
+  exportable[type] = function(time, task) {
+    var options;
 
     if (typeof time === "function") {
-      operation = time;
+      task = time;
       time = 10;
     }
 
     if (typeof time === "object") {
-      opts = time;
-      opts.type = type;
+      options = time;
+      options.type = type;
     } else {
-      opts = {
-        time: time,
-        type: type,
-        task: operation
+      options = {
+        time,
+        type,
+        task,
       };
     }
 
-    var task = new Task(opts);
+    var instance = new Task(options);
 
     if (!isProcessing) {
       processQueue();
     }
 
-    return task;
+    return instance;
   };
 });
 
@@ -278,32 +283,49 @@ exportable.repeat = function(n, ms, callback) {
   });
 };
 
-exportable.clear = function(id) {
+exportable.clear = function(input) {
 
-  if (typeof id === "undefined") {
+  var id;
+
+  if (typeof input === "undefined") {
     isProcessing = false;
     queue = {};
   } else {
-    queue = filterQueue(queue, id);
+    id = input instanceof Task ? input.id : input;
+
+    let entries = entriesById.get(id);
+
+    if (entries) {
+      for (let entry of entries) {
+        entry.isRunnable = false;
+      }
+    }
+    entriesById.delete(id);
   }
 
-  if (Object.keys(queue).length === 0) {
-    exportable.removeAllListeners();
+  if (entriesById.size === 0) {
+    isProcessing = false;
+    queue = {};
   }
 
+  if (isEmpty(queue)) {
+    exportable.removeAllListeners();
+  }
 };
 
-function filterQueue(queue, id) {
-  var filtered = {};
-  Object.keys(queue).forEach(function(key) {
-    queue[key] = queue[key].filter(function(entry) {
-      return entry.id !== id;
-    });
-    if (queue[key].length > 0) {
-      filtered[key] = queue[key];
-    }
-  });
-  return filtered;
+function isEmpty(o) {
+  for (let p in o) {
+    return (p, false);
+  }
+  return true;
+}
+
+if (global.TEST_ENV) {
+  exportable.test = {
+    get entriesById() {
+      return entriesById;
+    },
+  };
 }
 
 module.exports = exportable;

package.json

@@ -43,7 +43,8 @@
     "grunt-contrib-jshint": "latest",
     "grunt-contrib-nodeunit": "latest",
     "grunt-contrib-watch": "latest",
-    "grunt-jsbeautifier": "latest"
+    "grunt-jsbeautifier": "latest",
+    "sinon": "^4.0.0"
   },
   "keywords": [
     "schedule",

test/common/bootstrap.js

@@ -0,0 +1,3 @@
+"use strict";
+
+global.TEST_ENV = true;