Changeset 11388

Timestamp:

Jan 29, 2007, 12:43:13 PM (19 years ago)

Author:

eugene

Message:

adding realhost

Location:

trunk/Ohana/src/opihi

Files:

• include/pantasks.h (modified) (1 diff)
• include/pcontrol.h (modified) (1 diff)
• pantasks/JobOps.c (modified) (1 diff)
• pcontrol/CheckBusyJob.c (modified) (1 diff)
• pcontrol/JobOps.c (modified) (1 diff)
• pcontrol/StartJob.c (modified) (2 diffs)
• pcontrol/check.c (modified) (1 diff)

trunk/Ohana/src/opihi/include/pantasks.h

@@ -144 +144 @@
   char   *stdout_dump;
   char   *stderr_dump;
+  char   *realhost;
 
   int         stdout_size;              /* size of pending stdout buffer (controller) */

trunk/Ohana/src/opihi/include/pcontrol.h

@@ -67 +67 @@
   char       **argv;
   char        *hostname;
+  char        *realhost;
   int          exit_status;
   int          Reset;

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

@@ -114 +114 @@
 
   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

trunk/Ohana/src/opihi/pcontrol/CheckBusyJob.c

@@ -31 +31 @@
       job[0].host = NULL;
       host[0].job = NULL;
+      if (job[0].realhost) free (job[0].realhost);
+      job[0].realhost = NULL;
       PutHost (host, PCONTROL_HOST_DOWN, STACK_BOTTOM);
       PutJob (job, PCONTROL_JOB_PENDING, STACK_BOTTOM);

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

@@ -145 +145 @@
   job[0].JobID    = NextJobID();
   job[0].Reset    = FALSE;
+  job[0].realhost = NULL;
 
   /* do this step on start? */

trunk/Ohana/src/opihi/pcontrol/StartJob.c

@@ -48 +48 @@
       job[0].host = NULL;
       host[0].job = NULL;
+      if (job[0].realhost) free (job[0].realhost);
+      job[0].realhost = NULL;
       PutHost (host, PCONTROL_HOST_DONE, STACK_BOTTOM);
       PutJob (job, PCONTROL_JOB_PENDING, STACK_BOTTOM);
@@ -78 +80 @@
 
     default:
+      job[0].realhost = strcreate (host[0].hostname);
       job[0].pid = status;
       PutHost (host, PCONTROL_HOST_BUSY, STACK_BOTTOM);

trunk/Ohana/src/opihi/pcontrol/check.c

@@ -28 +28 @@
     gprint (GP_LOG, "STDERR %d\n", job[0].stderr_size);
     gprint (GP_LOG, "DTIME %lf\n", job[0].dtime);
+    if (job[0].realhost) {
+        gprint (GP_LOG, "HOSTNAME %s\n", job[0].realhost);
+    } else {
+        gprint (GP_LOG, "HOSTNAME NONE\n");
+    }
     PutJob (job, StackID, STACK_BOTTOM);
     ClearCheckPoint ();