Changeset 27838 for branches/tap_branches/Ohana/src/libohana/src/CommOps.c

Timestamp:

May 3, 2010, 8:41:49 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/tap_branches

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/libohana/src/CommOps.c (modified) (6 diffs)

branches/tap_branches/Ohana/src/libohana/src/CommOps.c

@@ -14 +14 @@
     return (status);
   }
-  // fprintf (stderr, "resp: %s\n", command.buffer);
+  // fprintf (stderr, "resp: (%d) %s\n", command.Nbuffer, command.buffer);
 
   /* buffer contains an EOL NULL, we can just sscan it */
@@ -21 +21 @@
   
   status = ExpectCommand (device, length, timeout, message);
+
   return (status);
 }
@@ -45 +46 @@
     
     if (Nread > 0) {
+      // fprintf (stderr, "read %d of %d\n", Nread, length - buffer[0].Nbuffer);
       buffer[0].Nbuffer += Nread;
       continue;
@@ -50 +52 @@
 
     if (Nread == -1) {
+      // fprintf (stderr, "errno: %d\n", errno);
+      // perror ("read error");
       switch (errno) {
         case EAGAIN:
@@ -99 +103 @@
 int SendMessageFixed (int device, int length, char *message) {
 
+  int Nbytes, Nsent;
+  struct timespec request, remain;
+
+  // fprintf (stderr, "send fixed message, length = %d\n", length);
+
   if (!SendCommand (device, 16, "NBYTES: %6d", length)) return FALSE;
-  if (!SendCommand (device, length, message)) return FALSE;
+
+  /* avoid blocking on waitpid, test every 1000 usec, up to timeout msec */
+  request.tv_sec = 0;
+  request.tv_nsec = 1000000;
+
+  Nsent = 0;
+  while (Nsent < length) {
+    Nbytes = write (device, &message[Nsent], length - Nsent);
+    
+    // fprintf (stderr, "sent %d of %d\n", Nbytes, length - Nsent);
+
+    if (Nbytes > 0) {
+      Nsent += Nbytes;
+      continue;
+    }
+
+    if (Nbytes == -1) {
+      // fprintf (stderr, "errno: %d\n", errno);
+      // perror ("send error");
+      switch (errno) {
+        case EAGAIN:
+        case EIO:
+          /** no data available in pipe, wait a bit, check for timeout **/
+          nanosleep (&request, &remain);
+          break;
+        default:
+          /** error reading from pipe **/
+          perror ("SendMessageFixed write error");
+          return FALSE;
+      }
+    }
+    if (Nbytes == 0) return FALSE;
+  }
+  // if (!SendCommand (device, length, message)) return FALSE;
+
   return TRUE;
 }
@@ -124 +167 @@
   memset (string, 0, length + 1);
   vsnprintf (string, length + 1, format, argp);
+
+  // fprintf (stderr, "write command, length = %d\n", length);
 
   status = write (device, string, length);