Black list all /.vol/... paths in OSX.

They are not accessible by Carbon and are not useful for the tracing at the
moment.

Improve logging, remove unnecessary ones and add more interesting ones.

R=cmp@chromium.org
NOTRY=true
BUG=
TEST=


Review URL: https://chromiumcodereview.appspot.com/10584013

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@143333 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 11 insertions, 4 deletions

diff --git a/tools/isolate/trace_inputs.py b/tools/isolate/trace_inputs.py
index aa11640..e72f46f 100755
--- a/tools/isolate/trace_inputs.py
+++ b/tools/isolate/trace_inputs.py
@@ -1759,8 +1759,6 @@ class Dtrace(ApiBase):
       trace_child_process.py starts the executable to trace.
       """
       logging.info('trace(%s, %s, %s, %s)' % (cmd, cwd, tracename, output))
-      logging.info('Running: %s' % cmd)
-      logging.debug('Our pid: %d' % os.getpid())
       with self._lock:
         if not self._initialized:
           raise TracingFailure(
@@ -1873,10 +1871,15 @@ class Dtrace(ApiBase):
   @classmethod
   def parse_log(cls, logname, blacklist):
     logging.info('parse_log(%s, %s)' % (logname, blacklist))
+
+    def blacklist_more(filepath):
+      # All the HFS metadata is in the form /.vol/...
+      return blacklist(filepath) or re.match(r'^\/\.vol\/.+$', filepath)
+
     data = read_json(logname)
     out = []
     for item in data['traces']:
-      context = cls.Context(blacklist, item['pid'], item['cwd'])
+      context = cls.Context(blacklist_more, item['pid'], item['cwd'])
       for line in open(logname + '.log', 'rb'):
         context.on_line(line)
       out.append(
diff --git a/tools/isolate/trace_test_cases.py b/tools/isolate/trace_test_cases.py
index ed2dc9e..0a44335 100755
--- a/tools/isolate/trace_test_cases.py
+++ b/tools/isolate/trace_test_cases.py
@@ -56,6 +56,8 @@ class Tracer(object):
             'valid': valid,
             'output': output,
           })
+      logging.debug(
+          'Tracing %s done: %d, %.1fs' % (test_case, returncode,  duration))
       if not valid:
         self.progress.increase_count()
       if retry:
diff --git a/tools/isolate/worker_pool.py b/tools/isolate/worker_pool.py
index 8edaee6..af0d4c9 100644
--- a/tools/isolate/worker_pool.py
+++ b/tools/isolate/worker_pool.py
@@ -6,6 +6,7 @@
 thread-local result storage.
 """
 
+import logging
 import Queue
 import sys
 import time
@@ -55,7 +56,8 @@ class WorkerThread(threading.Thread):
       try:
         func, args, kwargs = task
         self.outputs.append(func(*args, **kwargs))
-      except Exception:
+      except Exception, e:
+        logging.error('Caught exception! %s' % e)
         self.exceptions.append(sys.exc_info())
       finally:
         self._tasks.task_done()