Changeset 3204

Timestamp:

Feb 12, 2005, 5:00:47 PM (21 years ago)

Author:

eugene

Message:

pcontrol dev work

Location:

trunk/Ohana/src/opihi/pcontrol

Files:

• HostOps.c (modified) (4 diffs)
• IOBufferOps.c (modified) (2 diffs)
• JobOps.c (modified) (4 diffs)
• StartHost.c (modified) (1 diff)
• host.c (modified) (1 diff)
• rconnect.c (modified) (1 diff)

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

@@ -3 +3 @@
 Stack *HostPool_Idle;
 Stack *HostPool_Busy;
+Stack *HostPool_Done;
 Stack *HostPool_Down;
 Stack *HostPool_Off;
@@ -9 +10 @@
   HostPool_Idle = InitStack ();
   HostPool_Busy = InitStack ();
+  HostPool_Done = InitStack ();
   HostPool_Down = InitStack ();
   HostPool_Off = InitStack ();
@@ -19 +21 @@
     case PCONTROL_HOST_DOWN:
       return (HostPool_Down);
+    case PCONTROL_HOST_DONE:
+      return (HostPool_Done);
     case PCONTROL_HOST_BUSY:
       return (HostPool_Busy);
@@ -24 +28 @@
       return (HostPool_Off);
     default:
-      fprintf (stderr, "error: unknown host stack\n");
-      return (NULL);
+      fprintf (stderr, "error: unknown host stack : programming error\n");
+      exit (1);
   }
-  return (NULL);
+  fprintf (stderr, "error: unknown host stack : programming error\n");
+  exit (1);
 }
 

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

@@ -9 +9 @@
 
   ALLOCATE (buffer[0].buffer, char, buffer[0].Nalloc);
+  bzero (buffer[0].buffer, buffer[0].Nalloc);
 
   return (TRUE);
@@ -27 +28 @@
 
   if (fd == 0) {
+    fprintf (stderr, "pipe is closed (ReadIOBuffer)\n");
+    return (0);
     /* pipe is closed */
-    return (0);
   }
 

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

@@ -3 +3 @@
 Stack *JobPool_Pending;
 Stack *JobPool_Busy;
+Stack *JobPool_Done;
 Stack *JobPool_Exit;
 Stack *JobPool_Crash;
@@ -9 +10 @@
   JobPool_Pending = InitStack ();
   JobPool_Busy = InitStack ();
+  JobPool_Done = InitStack ();
   JobPool_Exit = InitStack ();
   JobPool_Crash = InitStack ();
@@ -19 +21 @@
     case PCONTROL_JOB_BUSY:
       return (JobPool_Busy);
+    case PCONTROL_JOB_DONE:
+      return (JobPool_Done);
     case PCONTROL_JOB_EXIT:
       return (JobPool_Exit);
@@ -24 +28 @@
       return (JobPool_Crash);
     default:
-      fprintf (stderr, "error: unknown job stack\n");
-      return (NULL);
+      fprintf (stderr, "error: unknown job stack : programming error\n");
+      exit (1);
   }
-  return (NULL);
+  fprintf (stderr, "error: unknown job stack : programming error\n");
+  exit (1);
 }
 

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

@@ -5 +5 @@
   int pid;
   int stdio[3];
+  char command[64], shell[64];
 
   /* pid = rconnect (CONNECT, host[0].hostname, PCLIENT, stdio); */
 
-  pid = rconnect ("ssh", host[0].hostname, "pclient", stdio);
+  strcpy (command, "ssh");
+  strcpy (shell, "pclient");
+
+  pid = rconnect (command, host[0].hostname, shell, stdio);
   if (!pid) {     /** failure to start **/
     fprintf (stderr, "failure to start %s\n", host[0].hostname);

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

@@ -22 +22 @@
     remove_argument (N, &argc, argv);
     Off = TRUE;
+  }
+ 
+  /* this section needs some help: find the specified host in the stacks */
+  On = FALSE;
+  if ((N = get_argument (argc, argv, "-off"))) {
+    if (Delete || Off) {
+      fprintf (stderr, "only one of -delete, -off, -on\n");
+      return (FALSE);
+    }
+    remove_argument (N, &argc, argv);
+    On = TRUE;
   }
  

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

@@ -78 +78 @@
     status = ReadtoIOBuffer (&buffer, stdout_fd[0]);
     p = memstr (buffer.buffer, "CONNECTED", buffer.Nbuffer);
+    fprintf (stderr, "%d  %d  %s\n", i, buffer.Nbuffer, buffer.buffer);
+    usleep (20000);
   }
   if (status == 0) goto pipe_error;