Changeset 37403 for branches/eam_branches/ps2-tc3-20130727/Ohana/src/opihi/pcontrol/PclientCommand.c

Timestamp:

Sep 19, 2014, 4:05:27 PM (12 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ps2-tc3-20130727

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/opihi/pcontrol/PclientCommand.c (modified) (5 diffs)

branches/eam_branches/ps2-tc3-20130727/Ohana/src/opihi/pcontrol/PclientCommand.c

@@ -25 +25 @@
     return (PCLIENT_DOWN);
   }
-  
+
   // prepare host to accept response
   host[0].response_state = response_state;
@@ -35 +35 @@
   return (PCLIENT_GOOD);
 }
-  
+
 // check for response; message must end with specified string.
 // accumulate the response in the buffer
@@ -47 +47 @@
   ASSERT (response != NULL, "response missing");
   ASSERT (buffer != NULL, "buffer missing");
+
+  // INITTIME;
 
   /* avoid blocking very long on read, test every 100 usec, up to 0.1 sec */
@@ -66 +68 @@
     return (PCLIENT_DOWN);
   }
-  if (line == NULL) return (PCLIENT_HUNG);
-  if (status == -1) return (PCLIENT_HUNG);
+  if (line == NULL) {
+      // MARKTIME ("-- client hung (line NULL): %s : %f sec\n", host[0].hostname, dtime);
+      return (PCLIENT_HUNG);
+  }
+  if (status == -1) {
+      // MARKTIME ("-- client hung (status -1): %s : %f sec\n", host[0].hostname, dtime);
+      return (PCLIENT_HUNG);
+  }
 
   // fprintf (stderr, "response: %s\n", buffer[0].buffer);
@@ -75 +83 @@
 
 /* memstr returns a view, not an allocated string : don't free */
-/* ReadtoIOBuffer returns : 
+/* ReadtoIOBuffer returns :
     0 - pipe closed
    -1 - no more data in pipe, data not ready