[PATCH] D49851: [clang-tidy] run-clang-tidy add synchronisation to the output

[Andi via Phabricator via cfe-commits]

Abpostelnicu created this revision.
Abpostelnicu added a project: clang-tools-extra.
Herald added subscribers: cfe-commits, xazax.hun.

The goal of this patch is to add synchronisation of the output of the tool with 
the actual files that are verified. Without it the output of clang-tidy will 
get mixed with the clang-tidy command that is also passed to stdout.


Repository:
  rCTE Clang Tools Extra

https://reviews.llvm.org/D49851

Files:
  clang-tidy/tool/run-clang-tidy.py


Index: clang-tidy/tool/run-clang-tidy.py
===================================================================
--- clang-tidy/tool/run-clang-tidy.py
+++ clang-tidy/tool/run-clang-tidy.py
@@ -153,7 +153,7 @@
   subprocess.call(invocation)
 
 
-def run_tidy(args, tmpdir, build_path, queue, failed_files):
+def run_tidy(args, tmpdir, build_path, queue, lock, failed_files):
   """Takes filenames out of queue and runs clang-tidy on them."""
   while True:
     name = queue.get()
@@ -161,10 +161,15 @@
                                      tmpdir, build_path, args.header_filter,
                                      args.extra_arg, args.extra_arg_before,
                                      args.quiet, args.config)
-    sys.stdout.write(' '.join(invocation) + '\n')
-    return_code = subprocess.call(invocation)
-    if return_code != 0:
+
+    proc = subprocess.Popen(invocation, stdout=subprocess.PIPE, 
stderr=subprocess.PIPE)
+    output, err = proc.communicate()
+    if proc.returncode:
       failed_files.append(name)
+    with lock:
+      sys.stdout.write(' '.join(invocation) + '\n' + output + '\n')
+      if len(err):
+        sys.stderr.write(err + '\n')
     queue.task_done()
 
 
@@ -263,9 +268,10 @@
     task_queue = queue.Queue(max_task)
     # List of files with a non-zero return code.
     failed_files = []
+    lock = threading.Lock()
     for _ in range(max_task):
       t = threading.Thread(target=run_tidy,
-                           args=(args, tmpdir, build_path, task_queue, 
failed_files))
+                           args=(args, tmpdir, build_path, task_queue, lock, 
failed_files))
       t.daemon = True
       t.start()
 



Index: clang-tidy/tool/run-clang-tidy.py
===================================================================
--- clang-tidy/tool/run-clang-tidy.py
+++ clang-tidy/tool/run-clang-tidy.py
@@ -153,7 +153,7 @@
   subprocess.call(invocation)
 
 
-def run_tidy(args, tmpdir, build_path, queue, failed_files):
+def run_tidy(args, tmpdir, build_path, queue, lock, failed_files):
   """Takes filenames out of queue and runs clang-tidy on them."""
   while True:
     name = queue.get()
@@ -161,10 +161,15 @@
                                      tmpdir, build_path, args.header_filter,
                                      args.extra_arg, args.extra_arg_before,
                                      args.quiet, args.config)
-    sys.stdout.write(' '.join(invocation) + '\n')
-    return_code = subprocess.call(invocation)
-    if return_code != 0:
+
+    proc = subprocess.Popen(invocation, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    output, err = proc.communicate()
+    if proc.returncode:
       failed_files.append(name)
+    with lock:
+      sys.stdout.write(' '.join(invocation) + '\n' + output + '\n')
+      if len(err):
+        sys.stderr.write(err + '\n')
     queue.task_done()
 
 
@@ -263,9 +268,10 @@
     task_queue = queue.Queue(max_task)
     # List of files with a non-zero return code.
     failed_files = []
+    lock = threading.Lock()
     for _ in range(max_task):
       t = threading.Thread(target=run_tidy,
-                           args=(args, tmpdir, build_path, task_queue, failed_files))
+                           args=(args, tmpdir, build_path, task_queue, lock, failed_files))
       t.daemon = True
       t.start()
 

_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits