Changeset 34783 for branches/sc_branches/pantasks_condor/pantasks/JobOps.c

Timestamp:

Dec 10, 2012, 12:07:22 PM (14 years ago)

Author:

Serge CHASTEL

Message:

Pantasks/Condor branch

Location:

branches/sc_branches/pantasks_condor

Files:

• . (copied) (copied from trunk/Ohana/src/opihi ) (1 prop)
• pantasks/JobOps.c (modified) (9 diffs)

branches/sc_branches/pantasks_condor/pantasks/JobOps.c

@@ -27 +27 @@
 /* provide a mechanism to loop over the list of jobs */
 Job *NextJob () {
-  
+
   Job *job;
 
@@ -52 +52 @@
   }
   return (NULL);
-}  
+}
 
 /* return job with given controller Job ID */
@@ -67 +67 @@
   }
   return (NULL);
-}  
+}
 
 /* list known jobs */
@@ -90 +90 @@
 /* make a new job from a task */
 Job *CreateJob (Task *task) {
-  
+
   int i;
   Job *job;
-  
+
   ALLOCATE (job, Job, 1);
 
@@ -131 +131 @@
   job[0].task = task;
   job[0].realhost = NULL;
-  
+
   /* if we decide we need to be able to dynamically set task qualities (like host, timeouts, etc), the we will
      need to have matched entries to these quantites in the job structure */
@@ -160 +160 @@
 
 void FreeJob (Job *job) {
-  
+
   int i;
 
   if (job == NULL) return;
-  
+
   FreeJobID (job[0].JobID);
 
@@ -230 +230 @@
     if (jobs[i][0].mode == JOB_LOCAL) {
       if (!KillLocalJob (jobs[i])) {
-        jobs[i][0].state = JOB_HUNG;
-        if (VerboseMode()) gprint (GP_LOG, "child process %d is hung, cannot kill\n", jobs[i][0].pid);
+        jobs[i][0].state = JOB_HUNG;
+        if (VerboseMode()) gprint (GP_LOG, "child process %d is hung, cannot kill\n", jobs[i][0].pid);
       }
     } else {
       if (!KillControllerJob (jobs[i])) {
-        jobs[i][0].state = JOB_HUNG;
-        if (VerboseMode()) gprint (GP_LOG, "child process %d is hung, cannot kill\n", jobs[i][0].pid);
+        jobs[i][0].state = JOB_HUNG;
+        if (VerboseMode()) gprint (GP_LOG, "child process %d is hung, cannot kill\n", jobs[i][0].pid);
       }
-    }    
+    }
     jobs[i][0].task[0].Npending = 0;
     FreeJob (jobs[i]);
   }
-    
+
   Njobs = 0;
   NJOBS = 20;
@@ -255 +255 @@
 
   if (job[0].mode == JOB_LOCAL) {
-    if (DEBUG) fprintf (stderr, "submit job: (%zx) %d of %d\n", (size_t) job[0].stdout_buff.buffer, job[0].stdout_buff.Nbuffer, job[0].stdout_buff.Nalloc); 
-    status = SubmitLocalJob (job);
+      if (DEBUG) { fprintf (stderr, "submit job: (%zx) %d of %d\n", (size_t) job[0].stdout_buff.buffer, job[0].stdout_buff.Nbuffer, job[0].stdout_buff.Nalloc); }
+      fprintf (stdout, "submit job (local)\n");
+      status = SubmitLocalJob (job);
   } else {
-    status = SubmitControllerJob (job);
+      fprintf (stdout, "submit job (non local)\n");
+      status = SubmitControllerJob (job);
   }
   if (!status) {
@@ -306 +308 @@
     default:
       return JobStateNone;
-  }      
+  }
   return JobStateNone;
 }