Changeset 31666

Timestamp:

Jun 22, 2011, 12:38:55 AM (15 years ago)

Author:

eugene

Message:

merged from branch: add some more info stats

Location:

trunk/Ohana/src/opihi/pantasks

Files:

• CheckTasks.c (modified) (1 diff)
• JobOps.c (modified) (2 diffs)
• TaskOps.c (modified) (1 diff)
• client_shell.c (modified) (2 diffs)
• notes.txt (modified) (1 diff)
• status_server.c (modified) (1 diff)
• task.c (modified) (2 diffs)
• task_macros.c (modified) (2 diffs)

trunk/Ohana/src/opihi/pantasks/CheckTasks.c

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

trunk/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;
+}
+

trunk/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");

trunk/Ohana/src/opihi/pantasks/client_shell.c

@@ -22 +22 @@
     if (Nbad == 10) exit (3);
 
-    line = readline (prompt);
+    line = opihi_readline (prompt);
 
     if (line == NULL) { 
@@ -37 +37 @@
     }
     Nbad = 0;
-    ohana_memregister (line);
 
     stripwhite (line);

trunk/Ohana/src/opihi/pantasks/notes.txt

@@ +1 @@
+
+2011.06.01
+
+  addressing some details:
+
+  tasks->Njobs:
+    ++ : CheckTasks.c:86 after successful submission
+
+  tasks->Nsuccess:
+    ++ : CheckJobs.c:126 : on exit if exit_status == 0
+  
+  tasks->Nfailure:
+    ++ : CheckJobs.c:102 : on exit if exit_status == 0
+    ++ : CheckJobs.c:123 : on crash
+
+  tasks->Ntimeout:
 
 stdout_cntl:

trunk/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);

trunk/Ohana/src/opihi/pantasks/task.c

@@ -34 +34 @@
     /* get the next line (from correct place) */
     if (ThisList == 0) 
-      input = readline (prompt);
+      input = opihi_readline (prompt);
     else 
       input = get_next_listentry (ThisList);
@@ -46 +46 @@
       input = strcreate ("end");
     }
-    if (ThisList == 0) ohana_memregister (input);
 
     stripwhite (input);

trunk/Ohana/src/opihi/pantasks/task_macros.c

@@ -112 +112 @@
     /* get the next line (from correct place) */
     if (ThisList == 0) 
-      input = readline (prompt);
+      input = opihi_readline (prompt);
     else 
       input = get_next_listentry (ThisList);
@@ -124 +124 @@
       input = strcreate ("end");
     }
-    if (ThisList == 0) ohana_memregister (input);
 
     stripwhite (input);