Changeset 31592

Timestamp:

Jun 1, 2011, 11:58:43 AM (15 years ago)

Author:

eugene

Message:

add some server info to pantasks (N skip exec; clearer job status list)

Location:

branches/eam_branches/ipp-20110505/Ohana/src/opihi

Files:

• include/pantasks.h (modified) (2 diffs)
• pantasks/CheckTasks.c (modified) (1 diff)
• pantasks/JobOps.c (modified) (2 diffs)
• pantasks/TaskOps.c (modified) (1 diff)
• pantasks/status_server.c (modified) (1 diff)

branches/eam_branches/ipp-20110505/Ohana/src/opihi/include/pantasks.h

@@ -108 +108 @@
   int Nfailure;
   int Ntimeout;
+  int Nskipexec;
 
   double dtimeAve_alljobs, dtimeMin_alljobs, dtimeMax_alljobs;
@@ -216 +217 @@
 int DeleteJob (Job *job);
 void FreeJob (Job *job);
+char *JobStateToString (JobStat state);
 
 float CheckJobs (void);

branches/eam_branches/ipp-20110505/Ohana/src/opihi/pantasks/CheckTasks.c

@@ -61 +61 @@
       JobTaskLock();
       if (!status) {
+        task[0].Nskipexec ++;
         continue;
       }

branches/eam_branches/ipp-20110505/Ohana/src/opihi/pantasks/JobOps.c

@@ -82 +82 @@
   gprint (GP_LOG, " Jobs in Pantasks Queue\n");
   for (i = 0; i < Njobs; i++) {
-    gprint (GP_LOG, " %d: %-15s %5d %20s (%lx)\n", Njobs, jobs[i][0].task[0].name, jobs[i][0].JobID, jobs[i][0].argv[0], (long) jobs[i][0].argv);
+    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]);
   }
 
@@ -280 +280 @@
   return (job[0].state);
 }
+
+static char *JobStateNone    = "NONE";
+static char *JobStateBusy    = "BUSY";
+static char *JobStateExit    = "EXIT";
+static char *JobStateHung    = "HUNG";
+static char *JobStateCrash   = "CRASH";
+static char *JobStatePending = "PENDING";
+
+char *JobStateToString (JobStat state) {
+
+  switch (state) {
+    case JOB_NONE:
+      return JobStateNone;
+    case JOB_BUSY:
+      return JobStateBusy;
+    case JOB_EXIT:
+      return JobStateExit;
+    case JOB_HUNG:
+      return JobStateHung;
+    case JOB_CRASH:
+      return JobStateCrash;
+    case JOB_PENDING:
+      return JobStatePending;
+    default:
+      return JobStateNone;
+  }      
+  return JobStateNone;
+}
+

branches/eam_branches/ipp-20110505/Ohana/src/opihi/pantasks/TaskOps.c

@@ -151 +151 @@
         free (stop);
       }
+      gprint (GP_LOG, "     Nskip exec: %d\n", tasks[i][0].Nskipexec);
       if (tasks[i][0].host == NULL) {
         gprint (GP_LOG, "    task runs locally\n");

branches/eam_branches/ipp-20110505/Ohana/src/opihi/pantasks/status_server.c

@@ -1 +1 @@
 # include "pantasks.h"
+// this is the server version of the status_sys function (status.c)
+// the server verion needs to include locks on the jobs.
 
 int status_scheduler(void);