Changeset 17474

Timestamp:

Apr 21, 2008, 11:56:53 PM (18 years ago)

Author:

eugene

Message:

incomplete message means client is hung

File:

• trunk/Ohana/src/opihi/pcontrol/PclientCommand.c (modified) (4 diffs)

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

@@ -1 +1 @@
 # include "pcontrol.h"
-# define PCLIENT_TIMEOUT 5000
+# define PCLIENT_TIMEOUT 20000
 
 int PclientCommand (Host *host, char *command, char *response, IOBuffer *buffer) {
@@ -14 +14 @@
   ASSERT (response != NULL, "response missing");
 
-  /* avoid blocking on read, test every 100 usec, up to 50 msec */
+  /* avoid blocking on read, test every 100 usec, up to 2.0 sec */
   request.tv_sec = 0;
   request.tv_nsec = 100000;
@@ -36 +36 @@
   line = NULL;
   status = -1;
+
   for (i = 0; (i < PCLIENT_TIMEOUT) && (status != 0) && (line == NULL); i++) {
     status = ReadtoIOBuffer (buffer, host[0].stdout_fd);
@@ -46 +47 @@
   }
   if (status == -1) return (PCLIENT_HUNG);
-  /* gprint (GP_ERR, "buffer.buffer: %s\n", buffer[0].buffer); */
+  if (line == NULL) return (PCLIENT_HUNG);
+
+  // fprintf (stderr, "buffer.buffer: %s\n", buffer[0].buffer);
   return (PCLIENT_GOOD);
 }
 
 /* memstr returns a view, not an allocated string : don't free */
+/* ReadtoIOBuffer returns : 
+    0 - pipe closed
+   -1 - no more data in pipe, data not ready
+   -2 - serious error reading from pipe
+   >0 - data read from pipe
+*/