Changeset 36680 for branches/eam_branches/ps2-tc3-20130727/Ohana/src/opihi/pcontrol/job.c

Timestamp:

Apr 21, 2014, 5:42:34 AM (12 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ps2-tc3-20130727

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/opihi (modified) (1 prop)
• Ohana/src/opihi/pcontrol/job.c (modified) (4 diffs)

branches/eam_branches/ps2-tc3-20130727/Ohana/src/opihi/pcontrol/job.c

@@ -5 +5 @@
   char *Host = NULL;
   char **targv = NULL;
-  int i, N, Mode, targc, Timeout, priority;
+  int i, N, Mode, targc, Timeout, nicelevel;
   IDtype JobID;
   char **xhosts = NULL;
@@ -43 +43 @@
   }
 
-  priority = 0;
+  nicelevel = 0;
   if ((N = get_argument (argc, argv, "-nice"))) {
     remove_argument (N, &argc, argv);
-    priority = atoi (argv[N]);
+    nicelevel = atoi (argv[N]);
     remove_argument (N, &argc, argv);
   }
@@ -76 +76 @@
 
   // a JobID < 0 mean the job was not accepted
-  JobID = AddJob (Host, Mode, Timeout, priority, targc, targv, Nxhosts, xhosts);
+  JobID = AddJob (Host, Mode, Timeout, nicelevel, targc, targv, Nxhosts, xhosts);
   gprint (GP_LOG, "JobID: %d\n", (int) JobID);
   return (TRUE);
@@ -82 +82 @@
  usage:
     gprint (GP_ERR, "USAGE: job [options] (arg0) (arg1) ... (argN)\n");
-    gprint (GP_ERR, "  options: -host, +host, -timeout, -xhost (host)\n");
+    gprint (GP_ERR, "  options: -host, +host, -timeout, -xhost (host) -nice (level)\n");
     gprint (GP_ERR, "  arguments of the form @MAX_THREADS@ will be replaced when the job is launched\n");