Qdo should kill its subordinate qsub more aggressively

[gem5.git] / util / qdo

diff --git a/util/qdo b/util/qdo
index 9593ed5ed4852a9bdee04ce34ed130c39dae159f..135cce4ef657b646d111a6dfb8a1a6c4678dd3c4 100755 (executable)
--- a/util/qdo
+++ b/util/qdo
@@ -60,8 +60,11 @@ if cmd == []:
     print >>sys.stderr, "%s: missing command" % progname
     sys.exit(1)
 
-if not options.job_name:
-    options.job_name = cmd[0]
+# If we want to do this, need to add check here to make sure cmd[0] is
+# a valid PBS job name, else qsub will die on us.
+#
+#if not options.job_name:
+#    options.job_name = cmd[0]
 
 cwd = os.getcwd()
 
@@ -96,7 +99,7 @@ class Shell(pexpect.spawn):
             self.expect('\$ ', options.qsub_timeout)
         except pexpect.TIMEOUT:
             print >>sys.stderr, "%s: qsub timed out." % progname
-            self.kill(15)
+            self.kill(9)
             self.close(wait=True)
             sys.exit(1)
         self.do_command('unset PROMPT_COMMAND; PS1="qdo$ "')
@@ -144,7 +147,8 @@ if False and len(cmd) > 50:
     print "%s: running %s on poolfs" % (progname, cmd[0])
 else:
     shell_cmd = 'qsub -I -S /bin/sh'
-    shell_cmd += ' -N "%s"' % options.job_name
+    if options.job_name:
+        shell_cmd += ' -N "%s"' % options.job_name
     if options.dest_queue:
         shell_cmd += ' -q ' + options.dest_queue