Changeset 3211

Timestamp:

Feb 13, 2005, 6:49:20 PM (21 years ago)

Author:

eugene

Message:

pcontrol dev

Location:

trunk/Ohana/src/opihi

Files:

• Makefile (modified) (2 diffs)
• include/pclient.h (modified) (1 diff)
• lib.shell/opihi.c (modified) (2 diffs)
• pclient/ChildOps.c (modified) (2 diffs)
• pclient/pclient.c (modified) (2 diffs)
• pcontrol/CheckHost.c (modified) (1 diff)
• pcontrol/CheckIdleHost.c (modified) (3 diffs)
• pcontrol/StartHost.c (modified) (1 diff)
• pcontrol/pclient.c (modified) (2 diffs)
• pcontrol/rconnect.c (modified) (1 diff)

trunk/Ohana/src/opihi/Makefile

@@ -12 +12 @@
 sched: lib.data lib.shell cmd.basic cmd.data cmd.astro
 pclient: lib.data lib.shell cmd.basic
+pcontrol: lib.data lib.shell cmd.basic
 
 LIBS = cmd.basic cmd.data cmd.astro lib.data lib.shell
@@ -17 +18 @@
 PROGRAM = mana dvo
 
-EXTRAS = dvo2 sched dimm pclient
+EXTRAS = dvo2 sched dimm pclient pcontrol
 
 all:

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

@@ -74 +74 @@
 int CheckChild ();
 void CheckChildStatus ();
+
+# define DTIME(A,B) ((A.tv_sec - B.tv_sec) + 1e-6*(A.tv_usec - B.tv_usec))

trunk/Ohana/src/opihi/lib.shell/opihi.c

@@ -6 +6 @@
   int i, Nbad, Nlist, status;
   char **list, *line, *outline, *prompt, *history;
+  pid_t ppid;
 
   initialize (argc, argv);
@@ -19 +20 @@
     line = readline (prompt);
     if (line == NULL) { 
+      
+      ppid = getppid();
+      if (ppid == 1) {
+        fprintf (stderr, "caught parent shutdown\n");
+        exit (2);
+      }
       if (!isatty (STDIN_FILENO)) exit (2);
       fprintf (stdout, "Use \"quit\" to exit\n");

trunk/Ohana/src/opihi/pclient/ChildOps.c

@@ -1 +1 @@
 # include "pclient.h"
+
+static int Nbad = 0;
+static struct timeval last = {0, 0};
 
 int InitChild () {
@@ -22 +25 @@
 
   int Nread;
+  pid_t ppid;
+  double dtime;
+  struct timeval now;
+
+  /* this is really lame : check if we are calling too quickly */
+  gettimeofday (&now, NULL);
+  dtime = DTIME (now, last);
+  last = now;
+  if (dtime < 0.0001) Nbad ++;
+  if (dtime > 0.01) Nbad = 0;
+  if (Nbad > 10) {
+    fprintf (stderr, "parent shutdown\n");
+    exit (2);
+  }  
+
+  /* this is a bit lame : we must exit if calling process exits */
+  ppid = getppid();
+  if (ppid == 1) {
+    fprintf (stderr, "parent shutdown\n");
+    exit (2);
+  }  
 
   CheckChildStatus ();

trunk/Ohana/src/opihi/pclient/pclient.c

@@ -13 +13 @@
   fprintf (stderr, "\n");
   fprintf (stderr, "Welcome to %s - %s\n\n", opihi_name, opihi_description);
+}
+
+void gotsignal (int signum) {
+  fprintf (stderr, "got signal : %d\n", signum);
+  return;
 }
 
@@ -53 +58 @@
   /* ignore the history file.  to change this, see, eg, mana.c */
   signal (SIGINT, SIG_IGN);
+  signal (SIGPIPE, gotsignal);
+  signal (SIGTSTP, gotsignal);
+  signal (SIGTTIN, gotsignal);
   return;
 }

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

@@ -39 +39 @@
 
     default:
-      fprintf (stderr, "host %s is alive\n", host[0].hostname);
+      /* fprintf (stderr, "host %s is alive\n", host[0].hostname); */
       PutHost (host, host[0].stack, STACK_BOTTOM);
       FreeIOBuffer (&buffer);

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

@@ -13 +13 @@
     job = (Job *) stack[0].object[i];
     if (job[0].mode != PCONTROL_JOB_NEEDHOST) continue;
+    if (job[0].hostname == NULL) continue;
     if (strcasecmp (job[0].hostname, host[0].hostname)) continue;
     LinkJobAndHost (job, host);
@@ -23 +24 @@
     job = (Job *) stack[0].object[i];
     if (job[0].mode != PCONTROL_JOB_WANTHOST) continue;
+    if (job[0].hostname == NULL) continue;
     if (strcasecmp (job[0].hostname, host[0].hostname)) continue;
     LinkJobAndHost (job, host);
@@ -33 +35 @@
     job = (Job *) stack[0].object[i];
     if (job[0].mode != PCONTROL_JOB_ANYHOST) continue;
-    if (strcasecmp (job[0].hostname, host[0].hostname)) continue;
     LinkJobAndHost (job, host);
     StartJob (job);

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

@@ -9 +9 @@
   /* pid = rconnect (CONNECT, host[0].hostname, PCLIENT, stdio); */
 
-  strcpy (command, "ssh");
-  strcpy (shell, "pclient");
+  if (VarConfig ("COMMAND", "%s", command) == NULL) strcpy (command, "ssh");
+  if (VarConfig ("SHELL", "%s", shell)     == NULL) strcpy (shell, "pclient");
 
   pid = rconnect (command, host[0].hostname, shell, stdio);

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

@@ -9 +9 @@
   int status;
   char *line;
-  
+
   /* send command to client (adding on \n) */
+  fprintf (stderr, "send: %s (%d)\n", command, buffer[0].Nbuffer);
   ALLOCATE (line, char, MAX (1, strlen(command)));
   sprintf (line, "%s\n", command);
@@ -28 +29 @@
   if (status ==  0) return (PCLIENT_DOWN);
   if (status == -1) return (PCLIENT_HUNG);
+  fprintf (stderr, "buffer.buffer: %s\n", buffer[0].buffer);
   return (PCLIENT_GOOD);
 }

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

@@ -27 +27 @@
   argv[2] = shell;
   argv[3] = 0;
+  fprintf (stderr, "%s %s %s\n", argv[0], argv[1], argv[2]);
 
   pid = fork ();