use sys.exit on good paths to not create zombies (#160)

* use sys.exit on good paths to not create zombies

* fix syntax

Author: adrpo

testmodel.py

@@ -52,14 +52,23 @@ def writeResult():
     fp.flush()
     os.fsync(fp.fileno())
 
-def writeResultAndExit(exitStatus):
+startJob=monotonic()
+
+def writeResultAndExit(exitStatus, useOsExit=False):
   writeResult()
   print("Calling exit ...")
   with open(errFile, 'a+') as fp:
-    fp.write("[Calling os._exit(%s)]\n" % exitStatus)
+    if useOsExit:
+      msg = "[Calling os._exit(%s), Time elapsed: %s]\n"
+    else:
+      msg = "[Calling sys.exit(%s), Time elapsed: %s]\n"
+    fp.write(msg % (exitStatus, monotonic()-startJob))
     fp.flush()
   sys.stdout.flush()
-  os._exit(exitStatus)
+  if useOsExit:
+    os._exit(exitStatus)
+  else:
+    sys.exit(exitStatus)
 
 def sendExpressionTimeout(omc, cmd, timeout):
   with open(errFile, 'a+') as fp:
@@ -108,7 +117,7 @@ def target(res):
           pass
       with open(errFile, 'a+') as fp:
         fp.write("Aborted the command.\n")
-      writeResultAndExit(0)
+      writeResultAndExit(0, True)
     if res[1] is None:
       res[1] = ""
   if res[1] is not None:
@@ -324,7 +333,7 @@ def loadLibraryInNewOM():
   execstat["parsing"]=monotonic()-start
   with open(errFile, 'a+') as fp:
     fp.write("Timeout error for cmd: %s\n%s"%(cmd,str(e)))
-  writeResultAndExit(0)
+  writeResultAndExit(0, True)
 execstat["parsing"]=monotonic()-start
 
 try:
@@ -468,7 +477,7 @@ def sendExpressionOldOrNew(cmd):
   execstat["build"] = monotonic()-start
   with open(errFile, 'a+') as fp:
     fp.write(str(e))
-  writeResultAndExit(0)
+  writeResultAndExit(0, True)
 
 writeResult()
 # Do the simulation
@@ -518,7 +527,7 @@ def sendExpressionOldOrNew(cmd):
   execstat["phase"] = 6
 except TimeoutError as e:
   execstat["sim"] = monotonic()-start
-  writeResultAndExit(0)
+  writeResultAndExit(0, True)
 
 if referenceFile=="":
   writeResultAndExit(0)