Merge branch 'master' into gh-pages

kripken · May 2, 2013 · 54247cb · 54247cb
2 parents 2f02dfb + 339fabb
commit 54247cb
Show file tree

Hide file tree

Showing 8 changed files with 7,886 additions and 67,651 deletions.
diff --git a/banana/game/bb.js b/banana/game/bb.js
diff --git a/banana/game/headless.js b/banana/game/headless.js
@@ -21,6 +21,18 @@ var window = {
   //
 
   headless: true,
+  useFakeWorkers: false, // affects determinism, so not comparable to non-headless builds
+
+  fakeWorkers: {
+    'crunch-worker.js': function(data, postMessage) {
+      postMessage({
+        filename: data.filename,
+        data: data.data,
+        callbackID: data.callbackID,
+        time: 0
+      });
+    }
+  },
 
   stopped: false,
   fakeNow: 0, // we don't use Date.now()
@@ -241,7 +253,13 @@ var Worker = function(workerPath) {
     headlessPrint('main thread sending message ' + msg.messageId + ' to worker ' + workerPath);
     window.setTimeout(function() {
       headlessPrint('worker ' + workerPath + ' receiving message ' + msg.messageId);
-      onmessage({ data: duplicateJSON(msg) });
+      var start = Date.realNow();
+      if (window.useFakeWorkers && workerPath in window.fakeWorkers) {
+        window.fakeWorkers[workerPath](msg, postMessage);
+      } else {
+        onmessage({ data: duplicateJSON(msg) });
+      }
+      headlessPrint('worker ' + workerPath + ' took ' + (Date.realNow() - start) + ' ms');
     });
   };
   var thisWorker = this;
@@ -250,7 +268,9 @@ var Worker = function(workerPath) {
     headlessPrint('worker ' + workerPath + ' sending message ' + msg.messageId);
     window.setTimeout(function() {
       headlessPrint('main thread receiving message ' + msg.messageId + ' from ' + workerPath);
+      var start = Date.realNow();
       thisWorker.onmessage({ data: duplicateJSON(msg) });
+      headlessPrint('main thread ' + workerPath + ' took ' + (Date.realNow() - start) + ' ms');
     });
   };
 };

diff --git a/banana/game/zee-worker.js b/banana/game/zee-worker.js
diff --git a/banana/js/game-setup.js b/banana/js/game-setup.js
@@ -33,10 +33,23 @@ if (checkPageParam('deterministic')) {
   })();
 }
 
+var commandlineArgs = (typeof arguments != 'undefined') ? arguments : [];
+
 var Module = {
   // If the url has 'serve' in it, run a listen server and let others connect to us
   arguments: checkPageParam('serve') ? ['-d1', '-j28780'] : [],
-  benchmark: checkPageParam('benchmark') ? { totalIters: 2000, iter: 0 } : null,
+  benchmark: checkPageParam('benchmark') ? { totalIters: (function() {
+    var arg = typeof commandlineArgs[0] == 'string' ? parseInt(commandlineArgs[0]) : -1;
+    switch(arg) {
+      case 0: return 1;
+      case 1: return 20;
+      case 2: return 50;
+      case 3: return 100;
+      case 4: return 400;
+      case 5: return 800;
+      default: return 2000;
+    }
+  })(), iter: 0 } : null,
   failed: false,
   preRun: [],
   postRun: [],