Changeset 7917 for trunk/Ohana/src/opihi/pantasks/ControllerOps.c

Timestamp:

Jul 16, 2006, 10:58:49 PM (20 years ago)

Author:

eugene

Message:

major updates to use gprint for buffered / threaded printing

File:

• trunk/Ohana/src/opihi/pantasks/ControllerOps.c (modified) (17 diffs)

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

@@ -25 +25 @@
   gettimeofday (&stop, (void *) NULL);
   dtime = DTIME (stop, start);
-  /* if (VerboseMode()) fprintf (stderr, "check job status %f\n", dtime); */
+  /* if (VerboseMode()) gprint (GP_ERR, "check job status %f\n", dtime); */
 
   if ((job[0].state == JOB_EXIT) || (job[0].state == JOB_CRASH)) {
@@ -32 +32 @@
     gettimeofday (&stop, (void *) NULL);
     dtime = DTIME (stop, start);
-    /* if (VerboseMode()) fprintf (stderr, "get stdout %f\n", dtime); */
+    /* if (VerboseMode()) gprint (GP_ERR, "get stdout %f\n", dtime); */
 
     gettimeofday (&start, (void *) NULL);
@@ -38 +38 @@
     gettimeofday (&stop, (void *) NULL);
     dtime = DTIME (stop, start);
-    /* if (VerboseMode()) fprintf (stderr, "get stderr %f\n", dtime); */
+    /* if (VerboseMode()) gprint (GP_ERR, "get stderr %f\n", dtime); */
 
     gettimeofday (&start, (void *) NULL);
@@ -44 +44 @@
     gettimeofday (&stop, (void *) NULL);
     dtime = DTIME (stop, start);
-    /* if (VerboseMode()) fprintf (stderr, "delete job %f\n", dtime); */
+    /* if (VerboseMode()) gprint (GP_ERR, "delete job %f\n", dtime); */
   }  
   return (TRUE);
@@ -81 +81 @@
   p = memstr (buffer.buffer, "job not found", buffer.Nbuffer);
   if (p != NULL) {
-    fprintf (stderr, "unknown job %d\n", job[0].pid);
+    gprint (GP_ERR, "unknown job %d\n", job[0].pid);
     FreeIOBuffer (&buffer);
     return (FALSE);
@@ -105 +105 @@
   if (!strcmp(status_string, "CRASH"))   outstate = JOB_CRASH;
   if (outstate == -1) {
-    fprintf (stderr, "programming error?\n");
+    gprint (GP_ERR, "programming error?\n");
     exit (1);
   }
@@ -147 +147 @@
   if (status == -1) return (CONTROLLER_HUNG);
 
-  /* if (VerboseMode()) fprintf (stderr, "message received (GetJobOutput : %s)\n", cmd);   */
+  /* if (VerboseMode()) gprint (GP_ERR, "message received (GetJobOutput : %s)\n", cmd);   */
   /* drop extra bytes from pcontrol (not pclient:job) */
   buffer[0].Nbuffer = Nstart + Nbytes;
@@ -205 +205 @@
   p = memstr (buffer.buffer, "JobID", buffer.Nbuffer);
   if (p == NULL) {
-    fprintf (stderr, "missing PID in pcontrol message : programming error\n");
+    gprint (GP_ERR, "missing PID in pcontrol message : programming error\n");
     exit (1);
   }
@@ -240 +240 @@
   pid = fork ();
   if (!pid) { /* must be child process */
-    fprintf (stderr, "starting controller connection\n");
+    gprint (GP_LOG, "starting controller connection\n");
 
     /* close the other ends of the pipes */
@@ -303 +303 @@
   ControllerPID = pid;
   ControllerStatus = TRUE;
-  fprintf (stderr, "Connected\n");
+  gprint (GP_LOG, "Connected\n");
   return (TRUE);
 
@@ -311 +311 @@
 
 io_error:
-  fprintf (stderr, "timeout while connecting\n");
+  gprint (GP_ERR, "timeout while connecting\n");
   goto close_pipes;
 
@@ -341 +341 @@
   if ((status == -1) && (errno == EPIPE)) {
     StopController ();
-    if (VerboseMode()) fprintf (stderr, "controller is down\n");
+    if (VerboseMode()) gprint (GP_ERR, "controller is down\n");
     return (FALSE);
   }
@@ -355 +355 @@
   if (status ==  0) {
     StopController ();
-    if (VerboseMode()) fprintf (stderr, "controller is down\n");
+    if (VerboseMode()) gprint (GP_ERR, "controller is down\n");
     return (FALSE);
   }
   if (status == -1) {
-    if (VerboseMode()) fprintf (stderr, "controller is not responding\n");
+    if (VerboseMode()) gprint (GP_ERR, "controller is not responding\n");
     return (FALSE);
   }
@@ -369 +369 @@
     bzero (buffer[0].buffer + buffer[0].Nbuffer, buffer[0].Nalloc - buffer[0].Nbuffer);
   }
-  /* if (VerboseMode()) fprintf (stderr, "message received, %d cycles\n", i); */
+  /* if (VerboseMode()) gprint (GP_ERR, "message received, %d cycles\n", i); */
   return (TRUE);
 }
@@ -383 +383 @@
   switch (Nread) {
     case -2:  /* error in read (programming error?  system level error?) */
-      fprintf (stderr, "serious IO error\n");
+      gprint (GP_ERR, "serious IO error\n");
       exit (2);
     case -1:  /* no data in pipe */
@@ -395 +395 @@
   switch (Nread) {
     case -2:  /* error in read (programming error?  system level error?) */
-      fprintf (stderr, "serious IO error\n");
+      gprint (GP_ERR, "serious IO error\n");
       exit (2);
     case -1:  /* no data in pipe */
@@ -407 +407 @@
 int PrintControllerOutput () {
 
-  fprintf (stderr, "--- stdout ---\n");
-  fwrite (stdout_buffer.buffer, 1, stdout_buffer.Nbuffer, stderr);
-  fprintf (stderr, "--- stdout ---\n");
-  fwrite (stderr_buffer.buffer, 1, stderr_buffer.Nbuffer, stderr);
-  fprintf (stderr, "---  done  ---\n");
+  gprint (GP_LOG, "--- stdout ---\n");
+  gwrite (stdout_buffer.buffer, 1, stdout_buffer.Nbuffer, GP_LOG);
+  gprint (GP_LOG, "--- stderr ---\n");
+  gwrite (stderr_buffer.buffer, 1, stderr_buffer.Nbuffer, GP_LOG);
+  gprint (GP_LOG, "---  done  ---\n");
   return (TRUE);
 }