Changeset 16472

Timestamp:

Feb 13, 2008, 5:53:35 PM (18 years ago)

Author:

eugene

Message:

unique exit codes

Location:

trunk/Ohana/src/opihi

Files:

• lib.data/precess.c (modified) (1 diff)
• lib.shell/SocketOps.c (modified) (13 diffs)
• lib.shell/multicommand.c (modified) (6 diffs)
• lib.shell/opihi.c (modified) (2 diffs)
• lib.shell/startup.c (modified) (1 diff)
• pcontrol/GetJobOutput.c (modified) (1 diff)
• pcontrol/HostOps.c (modified) (2 diffs)
• pcontrol/JobOps.c (modified) (2 diffs)
• pcontrol/ResetJob.c (modified) (1 diff)
• pcontrol/StopHosts.c (modified) (3 diffs)
• pcontrol/rconnect.c (modified) (3 diffs)

trunk/Ohana/src/opihi/lib.data/precess.c

@@ -30 +30 @@
   if (!done) {
     gprint (GP_ERR, "error finding epoch %s\n", in_epoch);
-    exit (0);
+    return FALSE;
   }
   

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

@@ -36 +36 @@
   if (!status) {
     gprint (GP_ERR, "invalid address\n");
-    exit (2);
+    exit (4);
   }
 # endif
@@ -45 +45 @@
   if (InitSocket == -1) {
     perror ("socket: ");
-    exit (2);
+    exit (5);
   }
 
@@ -72 +72 @@
     if (errno == EADDRINUSE) {
         Address[0].sin_port ++;
-        if (Address[0].sin_port > MY_PORT + 10) exit (2);
+        if (Address[0].sin_port > MY_PORT + 10) {
+          fprintf (stderr, "failed to find a usable port\n");
+          exit (6);
+        }
         goto retry_server;
     }
     perror ("bind: ");
-    exit (2);
+    exit (7);
   }
   /* repeated starts of the server are limited by xinetd or something:
@@ -85 +88 @@
   if (status == -1) {
     perror ("listen: ");
-    exit (2);
+    exit (8);
   }
   return (InitSocket);
@@ -109 +112 @@
   if (BindSocket == -1) {
     perror ("accept: ");
-    exit (2);
+    exit (9);
   }
 
@@ -175 +178 @@
   if (!status) {
     gprint (GP_ERR, "invalid address\n");
-    exit (2);
+    exit (10);
   }
 
@@ -183 +186 @@
   if (InitSocket == -1) {
     perror ("socket: ");
-    exit (2);
+    exit (11);
   }
 
@@ -190 +193 @@
     if (errno == ECONNREFUSED) {
       Address.sin_port ++;
-      if (Address.sin_port > MY_PORT + 10) exit (2);
+      if (Address.sin_port > MY_PORT + 10) exit (12);
       goto retry_client;
     }
     perror ("connect: ");
-    exit (2);
+    exit (13);
   }
 
@@ -222 +225 @@
   if (!status) {
     gprint (GP_ERR, "invalid address\n");
-    exit (2);
+    exit (14);
   }
 
@@ -230 +233 @@
   if (InitSocket == -1) {
     perror ("socket: ");
-    exit (2);
+    exit (15);
   }
 
@@ -237 +240 @@
   if (status == -1) {
     perror ("bind: ");
-    exit (2);
+    exit (16);
   }
 
@@ -243 +246 @@
   if (status == -1) {
     perror ("listen: ");
-    exit (2);
+    exit (17);
   }
 
@@ -269 +272 @@
     if (!test) {
       gprint (GP_ERR, "invalid IP address %s\n", string);
-      exit (2);
+      exit (18);
     }
     VALID[Nvalid] = ip1 | (ip2 << 8) | (ip3 << 16) | (ip4 << 24);

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

@@ -12 +12 @@
     /* check if down? */
     fprintf (stderr, "error: server fd already defined\n");
-    exit (1);
+    exit (30);
   }
 
@@ -18 +18 @@
   if (VarConfig ("PANTASKS_SERVER", "%s", hostname) == NULL) {
     gprint (GP_ERR, "pantasks server host undefined\n");
-    exit (2);
+    exit (31);
   }
 
@@ -71 +71 @@
               case EPIPE:
                 gprint (GP_ERR, "server connection has died\n");
-                exit (1);
+                exit (32);
               default:
                 gprint (GP_ERR, "server is busy...\n");
@@ -84 +84 @@
               case EPIPE:
                 gprint (GP_ERR, "server connection has died\n");
-                exit (1);
+                exit (33);
               default:
                 gprint (GP_ERR, "server is busy...\n");
@@ -99 +99 @@
               case EPIPE:
                 gprint (GP_ERR, "server connection has died\n");
-                exit (1);
+                exit (34);
               default:
                 gprint (GP_ERR, "server is busy...\n");
@@ -114 +114 @@
               case EPIPE:
                 gprint (GP_ERR, "server connection has died\n");
-                exit (1);
+                exit (35);
               default:
                 gprint (GP_ERR, "server is busy...\n");

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

@@ -17 +17 @@
   Nbad = 0;
   while (1) {  /** must exit with command "exit" or "quit" */
-    if (Nbad == 10) exit (3);
+    if (Nbad == 10) exit (20);
 
     line = readline (prompt);
@@ -26 +26 @@
       if (ppid == 1) {
         gprint (GP_ERR, "caught parent shutdown\n");
-        exit (2);
+        exit (21);
       }
-      if (!isatty (STDIN_FILENO)) exit (2);
+      if (!isatty (STDIN_FILENO)) exit (21);
       gprint (GP_LOG, "Use \"quit\" to exit\n");
       Nbad ++;

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

@@ -155 +155 @@
 
     /* if this is not an interactive session, exit here */
-    if (ONLY_INPUT) exit (2);
-    if (is_script) exit (2);
+    if (ONLY_INPUT) exit (40);
+    if (is_script) exit (41);
     return;
 }

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

@@ -62 +62 @@
 
   gprint (GP_ERR, "programming error: should not reach here (GetJobOutput)\n");
-  pcontrol_exit (1);
+  pcontrol_exit (50);
 }

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

@@ -40 +40 @@
   }
   gprint (GP_ERR, "error: unknown host stack : programming error\n");
-  pcontrol_exit (1);
+  pcontrol_exit (51);
   return (NULL);
 }
@@ -53 +53 @@
   }
   gprint (GP_ERR, "error: unknown host stack : programming error\n");
-  pcontrol_exit (1);
+  pcontrol_exit (52);
   return (NULL);
 }

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

@@ -44 +44 @@
   }
   gprint (GP_ERR, "error: unknown host stack : programming error\n");
-  pcontrol_exit (1);
+  pcontrol_exit (53);
   return (NULL);
 }
@@ -58 +58 @@
   }
   gprint (GP_ERR, "error: unknown job stack : programming error\n");
-  pcontrol_exit (1);
+  pcontrol_exit (54);
   return (NULL);
 }

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

@@ -43 +43 @@
     default:
       gprint (GP_ERR, "unknown status for pclient command: programming error\n");  
-      pcontrol_exit (1);
+      pcontrol_exit (55);
   }
 
   gprint (GP_ERR, "programming error in ResetJob (should not reach here)\n");
   FreeIOBuffer (&buffer);
-  pcontrol_exit (1);
+  pcontrol_exit (56);
   return (FALSE);
 }

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

@@ -92 +92 @@
     default:
       gprint (GP_ERR, "unknown status for pclient command: programming error\n");  
-      pcontrol_exit (1);
+      pcontrol_exit (57);
   }
   HarvestHost (host[0].pid);
@@ -140 +140 @@
       if (result != pid) {
         gprint (GP_ERR, "waitpid error: mis-matched PID (%d vs %d).  programming error\n", result, pid);
-        pcontrol_exit (1);
+        pcontrol_exit (58);
       }
       
@@ -151 +151 @@
       if (WIFSTOPPED(waitstatus)) {
         gprint (GP_ERR, "waitpid returns 'stopped': programming error\n");
-        pcontrol_exit (1);
+        pcontrol_exit (59);
       }
   }

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

@@ -58 +58 @@
     status = execvp (argv[0], argv); 
     gprint (GP_ERR, "error starting remote shell process\n");
-    pcontrol_exit (1);
+    pcontrol_exit (60);
   }
   free (argv);
@@ -122 +122 @@
   if ((result == -1) && (errno != ECHILD)) {
     gprint (GP_ERR, "unexpected error from waitpid (%d): programming error\n", errno);
-    pcontrol_exit (1);
+    pcontrol_exit (61);
   }
   if (result == 0) {
@@ -130 +130 @@
     if (result != pid) {
       gprint (GP_ERR, "waitpid error: mis-matched PID (%d vs %d).  programming error\n", result, pid);
-      pcontrol_exit (1);
+      pcontrol_exit (62);
     }
     if (WIFSTOPPED(waitstatus)) {
       gprint (GP_ERR, "waitpid returns 'stopped': programming error\n");
-      pcontrol_exit (1);
+      pcontrol_exit (63);
     }
   }