1. Set timeout and stop CFA if it hasn't finished by then.

2. (Minor) Rm some prints from evtclassify.js,
   indentation change in benchmark.js

lib/cfa2/benchmark.js

@@ -2,26 +2,26 @@
 ;
 
 var print = console.log,
-  readFileSync = require('fs').readFileSync,
-  spawn = require('child_process').spawn,
-  parse = require('../../narcissus/lib/parser').parse,
-  getTags = require('./jscfa').getTags;
+readFileSync = require('fs').readFileSync,
+spawn = require('child_process').spawn,
+parse = require('../../narcissus/lib/parser').parse,
+getTags = require('./jscfa').getTags;
 
 var arg = process.argv[2], files = [], done = false;
 
 if ((arg === "sunspider") || (arg === "v8/v6")) {
   var ls = spawn('ls', [arg]);
   ls.stdout.on('data', function(data) {
-      var fs = (""+data).split("\n");
-      for (var i = 0, len = fs.length; i < len; i++)
-        /js$/.test(fs[i]) && files.push(arg + "/" + fs[i]);
-    });
+    var fs = (""+data).split("\n");
+    for (var i = 0, len = fs.length; i < len; i++)
+      /js$/.test(fs[i]) && files.push(arg + "/" + fs[i]);
+  });
   ls.on('exit', function() {
-      for (var i = 0, len = files.length; i < len; i++) run(files[i]);
-    });
- }
- else 
-   run(arg);
+    for (var i = 0, len = files.length; i < len; i++) run(files[i]);
+  });
+}
+else 
+  run(arg);
 
 function run(file) {
   getTags(parse(readFileSync(file), file, 1), file, [], {});

lib/cfa2/evtclassify.js

@@ -22,7 +22,7 @@ var resultsDir = process.argv[5] || ".";
 try {
   var ast = desugar(parse(readFileSync(addon), addon, 1));
   var lines = ast.tokenizer.source.split("\n");
-  var results = analyze_addon(ast);
+  var results = analyze_addon(ast, 300);
   var evts = [], contentObjs = [];
 
   results.forEach(function(r) {
@@ -37,7 +37,6 @@ try {
   humanReadableResults(evts, contentObjs);
   print("done with humanreadableresults");
   var fhandle = readFileSync(coordsFile);
-  print("readfilesync success");
   var coords = parseCoords(fhandle);
   var entries = [];
 
@@ -105,7 +104,6 @@ function humanReadableResults(evts, contentObjs) {
 }
 
 function parseCoords(src) {
-  print("entering parsecoords");
   var obj = JSON.parse(src);
   var result = [];
   for (var key in obj) {
@@ -125,13 +123,11 @@ function parseCoords(src) {
            : 0;
   }
   result.sort(compareLines);
-  print("exiting parsecoords");
   return result;
 }
 
 // line: 1-indexed
 function getRealPath(line, coords) {
-  //print("entering getrealpath");
   var entry;
   for (var i = coords.length - 1; i >= 0; i--) {
     entry = coords[i];
@@ -140,7 +136,6 @@ function getRealPath(line, coords) {
   }
   var scriptOffset = line - entry.line;
   var scriptStart = entry.realLine;
-  //print("exiting getrealpath");
   return {
     path: entry.realPath,
     line: scriptStart + scriptOffset

lib/cfa2/jscfa.js

@@ -1466,6 +1466,7 @@ var flags;
 var exports_object;
 var exports_object_av_addr;
 var commonJSmode;
+var timeout = 120; // stop after 2 minutes if you're not done
 
 // A summary contains a function node (fn), an array of abstract values (args),
 // a timestamp (ts) and abstract values (res) and (err). It means: when we call
@@ -3451,6 +3452,8 @@ function evalFun(fn, args, withNew, cn) {
       errval = avjoin(errval, errav);
   }
 
+  if (process.uptime() > timeout) throw new Error("timeout");
+
   // if (timestamp > big_ts) {
   //   print("big ts: " + timestamp);
   //   dumpHeap("heapdump" + timestamp + ".txt");
@@ -3666,10 +3669,12 @@ function cfa2(ast) {
     // dumpHeap("heapdump.txt");
   }
   catch (e) {
-    print(e.message);
-    console.trace();
-    if (! ("code" in e)) e.code = CFA_ERROR;
-    throw e;
+    if (e.message !== "timeout") {
+      print(e.message);
+      console.trace();
+      if (! ("code" in e)) e.code = CFA_ERROR;
+      throw e;
+    }
   }
 }
 
@@ -4312,8 +4317,9 @@ var eventKinds = {
   // ViewChanged event from greasemonkey?
 };
 
-function analyze_addon(ast) {
+function analyze_addon(ast, tmout) {
   print("Doing CFA");
+  timeout = tmout;
   cfa2(ast);
   // Addresses are irrelevant outside jscfa, convert results to array.
   var rs = [];