Changeset 40477 for branches/czw_branch/20170908/Ohana/src/opihi/pantasks/JobOps.c

Timestamp:

Jun 27, 2018, 3:20:35 PM (8 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/czw_branch/20170908/Ohana

Files:

• . (modified) (1 prop)
• src/opihi/pantasks/JobOps.c (modified) (5 diffs)

branches/czw_branch/20170908/Ohana/src/opihi/pantasks/JobOps.c

@@ -41 +41 @@
 
 /* return job with given ID */
-Job *FindJob (int JobID) {
+Job *FindJob (IDtype JobID) {
 
   int i;
@@ -55 +55 @@
 
 /* return job with given controller Job ID */
-Job *FindControllerJob (int JobID) {
+Job *FindControllerJob (IDtype JobID) {
 
   int i;
@@ -82 +82 @@
   gprint (GP_LOG, " Jobs in Pantasks Queue\n");
   for (i = 0; i < Njobs; i++) {
-    gprint (GP_LOG, " %4d  %6d: %-25s %10s %20s\n", Njobs, jobs[i][0].JobID, jobs[i][0].task[0].name, JobStateToString(jobs[i][0].state), jobs[i][0].argv[0]);
+    gprint (GP_LOG, " %4d  %8d: %-25s %10s %20s\n", Njobs, jobs[i][0].JobID, jobs[i][0].task[0].name, JobStateToString(jobs[i][0].state), jobs[i][0].argv[0]);
   }
 
@@ -97 +97 @@
 
   job[0].JobID = NextJobID ();
+
+  // this should not happen; abort?
   if (job[0].JobID < 0) {
     free (job);
@@ -165 +167 @@
   if (job == NULL) return;
   
-  FreeJobID (job[0].JobID);
-
   for (i = 0; i < job[0].argc; i++) {
     free (job[0].argv[i]);