Changeset 13486

Timestamp:

May 23, 2007, 10:47:53 AM (19 years ago)

Author:

eugene

Message:

adding JOB_HOSTNAME

Location:

trunk/Ohana/src/opihi/pantasks

Files:

• CheckJobs.c (modified) (1 diff)
• ControllerOps.c (modified) (2 diffs)
• JobOps.c (modified) (1 diff)

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

@@ -87 +87 @@
         set_variable ("JOB_DTIME", job[0].dtime);
 
+        if (job[0].realhost == NULL) {
+          set_str_variable ("JOB_HOSTNAME", job[0].realhost);
+        } else {
+          set_str_variable ("JOB_HOSTNAME", job[0].realhost);
+        }           
+
         if (status == JOB_CRASH) {
           /* XXX add an Ncrash element? */

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

@@ -66 +66 @@
 
   int outstate, status;
-  char cmd[128], status_string[64];
+  char cmd[128], status_string[64], string[128];
   char *p;
   IOBuffer buffer;
@@ -87 +87 @@
 
   /** parse status message **/
-  p = memstr (buffer.buffer, "STATUS", buffer.Nbuffer);
+  p = memstr (buffer.buffer, "STATUS",   buffer.Nbuffer);
   sscanf (p, "%*s %s", status_string);
-  p = memstr (buffer.buffer, "EXITST", buffer.Nbuffer);
+  p = memstr (buffer.buffer, "EXITST",   buffer.Nbuffer);
   sscanf (p, "%*s %d", &job[0].exit_status);
-  p = memstr (buffer.buffer, "STDOUT", buffer.Nbuffer);
+  p = memstr (buffer.buffer, "STDOUT",   buffer.Nbuffer);
   sscanf (p, "%*s %d", &job[0].stdout_size);
-  p = memstr (buffer.buffer, "STDERR", buffer.Nbuffer);
+  p = memstr (buffer.buffer, "STDERR",   buffer.Nbuffer);
   sscanf (p, "%*s %d", &job[0].stderr_size);
-  p = memstr (buffer.buffer, "DTIME",  buffer.Nbuffer);
+  p = memstr (buffer.buffer, "DTIME",    buffer.Nbuffer);
   sscanf (p, "%*s %lf", &job[0].dtime);
+  p = memstr (buffer.buffer, "HOSTNAME", buffer.Nbuffer);
+  sscanf (p, "%*s %s", string);
+  job[0].realhost = strcreate (string);
   FreeIOBuffer (&buffer);
 

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

@@ -180 +180 @@
   if (job[0].stdout_dump != NULL) free (job[0].stdout_dump);
   if (job[0].stderr_dump != NULL) free (job[0].stderr_dump);
+  if (job[0].realhost != NULL) free (job[0].realhost);
 
   FreeIOBuffer (&job[0].stdout_buff);