Merge pull request #3 from kurellajunior/master

Minor changes and enhancements

Author: Sebmaster

lib/thread.js

@@ -35,8 +35,8 @@
 			this._resolved = 2;
 			this._result = err;
 
-			for (var i = 0; i < this._errCallbacks.length; ++i) {
-				this._errCallbacks[i](res);
+			for (var iE = 0; iE < this._errCallbacks.length; ++iE) {
+				this._errCallbacks[iE](res);
 			}
 		}
 
@@ -95,12 +95,12 @@
 		this.operation.then(function () {
 			var wrk = new Worker(that.options.path);
 			wrk.postMessage(Thread.getWorkerSource(cb));
-			wrk.postMessage(that.data);
 			wrk.onmessage = function (msg) {
 				wrk.terminate();
 				that.data = msg.data;
 				newOp.resolve(null, that.data);
 			};
+			wrk.postMessage(that.data);
 		});
 		this.operation = newOp;
 		return this;
@@ -110,12 +110,12 @@
 		var that = this;
 		var wrk = new Worker(that.options.path);
 		wrk.postMessage(Thread.getWorkerSource(cb));
-		wrk.postMessage(that.data[i]);
 		wrk.onmessage = function (msg) {
 			wrk.terminate();
 			that.data[i] = msg.data;
 			done();
 		};
+		wrk.postMessage(that.data[i]);
 	};
 
 	Thread.prototype.map = function (cb) {
@@ -148,12 +148,12 @@
 		var that = this;
 		var wrk = new Worker(that.options.path);
 		wrk.postMessage(Thread.getWorkerSource(cb));
-		wrk.postMessage(data);
 		wrk.onmessage = function (msg) {
 			wrk.terminate();
 			that.data[that.data.length] = msg.data;
 			done();
 		};
+		wrk.postMessage(data);
 	};
 
 	Thread.prototype.reduce = function (cb) {

test/eval.spec.js

@@ -8,7 +8,6 @@ describe('eval.js', function () {
 
 	it('should eval the given code', function () {
 		var wrk = new Worker(__dirname + '/../lib/eval.js');
-		wrk.postMessage('process.send(JSON.stringify("abc"))');
 
 		var result = null;
 		var done = false;
@@ -18,6 +17,7 @@ describe('eval.js', function () {
 				done = true;
 				wrk.terminate();
 			};
+			wrk.postMessage('process.send(JSON.stringify("abc"))');
 		});
 
 		waitsFor(function () {

test/performance.spec.js

@@ -14,34 +14,38 @@
 		var p2 = new Thread([1000, 2000, 3000]);
 
 		var start = Date.now();
-		var start2 = Date.now();
-
 		var time = null;
-		var time2 = null;
 
 		runs(function () {
 			p.spawn(function (data) {
 				for (var i = 0; i < data.length; ++i) {
 					var n = data[i];
-					var i = 0;
-					while (++i < n * n) { }
-					data[i] = i;
+					var square;
+					for (square = 0; square < n * n; ++square) { }
+					data[i] = square;
 				}
 				return data;
 			}).then(function (data) {
 				time = Date.now() - start;
-				result = data;
 			});
+		});
+
+		waitsFor(function () {
+			return time !== null;
+		}, "Sequential should finish", 5000);
 
+		var start2 = Date.now();
+		var time2 = null;
+
+		runs(function () {
 			p2.map(slowSquare).then(function (data) {
 				time2 = Date.now() - start2;
-				result = data;
 			});
 		});
 
 		waitsFor(function () {
-			return time != null && time2 != null;
-		}, "it should finish", 5000);
+			return time2 !== null;
+		}, "Parallel should finish", 5000);
 
 		runs(function () {
 			expect(time2).toBeLessThan(time / cpus);