Browse Source

Kills processes dead

msmith-techempower 8 years ago
parent
commit
c04bf5626e
2 changed files with 1 additions and 6 deletions
  1. 1 2
      toolset/benchmark/benchmarker.py
  2. 0 4
      toolset/setup/linux/TFBReaper.c

+ 1 - 2
toolset/benchmark/benchmarker.py

@@ -694,8 +694,7 @@ class Benchmarker:
   ############################################################
   ############################################################
   def __stop_test(self, ppid, out):
   def __stop_test(self, ppid, out):
     try:
     try:
-      subprocess.check_call(['pkill', '-9', '-P', str(ppid)], stderr=out, stdout=out)
-      subprocess.check_call(['kill', '-9', str(ppid)], stderr=out, stdout=out)
+      subprocess.check_call(['pkill', '-P', str(ppid)], stderr=out, stdout=out)
       retcode = 0
       retcode = 0
     except Exception:
     except Exception:
       retcode = 1
       retcode = 1

+ 0 - 4
toolset/setup/linux/TFBReaper.c

@@ -52,10 +52,6 @@ int main(int argc, char *argv[])
   int status;
   int status;
   wait(&status);
   wait(&status);
 
 
-  // We still need to wait forever in order to properly clean
-  // existing processes started by us.
-  for(;;){}
-
   return ret;
   return ret;
 }
 }