Changeset 38572

Timestamp:

Jul 6, 2015, 8:06:50 PM (11 years ago)

Author:

eugene

Message:

clarify some error messages; better testing for running on the right pantasks host

Location:

branches/eam_branches/ipp-20150625/Ohana/src/opihi/lib.shell

Files:

• ConfigInit.c (modified) (1 diff)
• SocketOps.c (modified) (2 diffs)
• gprint.c (modified) (1 diff)

branches/eam_branches/ipp-20150625/Ohana/src/opihi/lib.shell/ConfigInit.c

@@ -38 +38 @@
   }
 
+  // XXX this is a bit dangerous : answer may have an arbitrary
+  // length, but we do not know the available space in 'ptr'
+  // we really should be passing in the buffer size and limiting the copy
+
+
   if (!strcmp (mode, "%s"))  strcpy ((char *) ptr, answer);
   if (!strcmp (mode, "%d"))  *(int *) ptr       = atoi (answer);

branches/eam_branches/ipp-20150625/Ohana/src/opihi/lib.shell/SocketOps.c

@@ -23 +23 @@
   status = gethostname (myHostname, HOST_NAME_MAX);
 
-  fprintf (stderr, "target host: %s, real host: %s\n", hostname, myHostname);
+  if (strcmp (hostname, myHostname)) {
+    fprintf (stderr, "target host: %s, real host: %s\n", hostname, myHostname);
+    fprintf (stderr, "please run on the correct host\n");
+    exit (2);
+  }
 
   GetPortRange (&start, &stop, portinfo);
@@ -197 +201 @@
 
   host = gethostbyname (hostname);
+  if (!host) {
+    gprint (GP_ERR, "cannot connect to pantasks server %s\n", hostname);
+    exit (3);
+  }
+
   bzero (hostip, 80);
   for (i = 0; i < host[0].h_length; i++) {

branches/eam_branches/ipp-20150625/Ohana/src/opihi/lib.shell/gprint.c

@@ -255 +255 @@
   if (file == NULL) {
     // XXX this is a problem: we are leaving open the old file
-    fprintf (stderr, "cannot open file %s\n", stream[0].name);
+    fprintf (stderr, "gprint cannot open file %s\n", stream[0].name);
     free (stream[0].name);
     file = (dest == GP_LOG) ? stdout : stderr;