Changeset 1172

Timestamp:

Feb 4, 2004, 11:36:47 PM (22 years ago)

Author:

bird

Message:

Fixed bug.

File:

• trunk/src/emx/src/libsocket/bsdselect.c (modified) (8 diffs, 1 prop)

trunk/src/emx/src/libsocket/bsdselect.c

@@ -71 +71 @@
 #ifdef TCPV40HDRS
     /* here we need to figure out the max real socket handle */
-    int iMax = *pcFDs - 1;
-    for (iMax = 0, i = 0; i < c; i++)
+    int iMax;
+    for (iMax = *pcFDs - 1, i = 0; i < c; i++)
         if (FD_ISSET(i, pFrom))
         {
@@ -101 +101 @@
  * @param   pTo     The structure we present to OS/2 TCPIP.
  *                  This will be initialized.
- */
-static inline int convert(int c, int cb, const struct fd_set *pFrom, struct my_fd_set *pTo)
+ * @param   pszType Typestring to use in the log.
+ */
+static inline int convert(int c, int cb, const struct fd_set *pFrom, struct my_fd_set *pTo, const char *pszType)
 {
     int i;
@@ -112 +113 @@
             PLIBCSOCKETFH   pFHSocket = __libsocket_FH(i);
             if (!pFHSocket)
+            {
+                LIBCLOG_MSG2("Invalid handle %d specified (%s).\n", i, pszType);
                 return -1;
+            }
             MY_FD_SET(pFHSocket->iSocket, pTo);
-        }
-    }
+            LIBCLOG_MSG2("%s: %02d -> %03d\n", pszType, i, pFHSocket->iSocket);
+        }
+    }
+    pszType = pszType;
     return 0;
 }
@@ -126 +132 @@
  * @param   pTo     The structure passed in to select which have to
  *                  be updated for the return.
- */
-static inline void update(int c, const struct my_fd_set *pFrom, struct fd_set *pTo)
+ * @param   pszType Typestring to use in the log.
+ */
+static inline void update(int c, const struct my_fd_set *pFrom, struct fd_set *pTo, const char *pszType)
 {
     int i;
@@ -138 +145 @@
             {
                 if (!MY_FD_ISSET(pFHSocket->iSocket, pFrom))
+                {
                     FD_CLR(i, pTo);
+                    LIBCLOG_MSG2("%s: %02d -> %03d set\n", pszType, i, pFHSocket->iSocket);
+                }
+                else
+                    LIBCLOG_MSG2("%s: %02d -> %03d clear\n", pszType, i, pFHSocket->iSocket);
             }
         }
     }
+    pszType = pszType;
 }
 
@@ -222 +235 @@
     if (readfds)
     {
-        if (convert(nfds, cb, readfds, pRead))
-            LIBCLOG_RETURN_INT(-1);
-    }
-
-    if (writefds)
-    {
-        if (convert(nfds, cb, writefds, pWrite))
-            LIBCLOG_RETURN_INT(-1);
-    }
-
-    if (exceptfds)
-    {
-        if (convert(nfds, cb, exceptfds, pExcept))
+        if (convert(nfds, cb, readfds, pRead, "read "))
+            LIBCLOG_RETURN_INT(-1);
+    }
+
+    if (writefds)
+    {
+        if (convert(nfds, cb, writefds, pWrite, "write"))
+            LIBCLOG_RETURN_INT(-1);
+    }
+
+    if (exceptfds)
+    {
+        if (convert(nfds, cb, exceptfds, pExcept, "excpt"))
             LIBCLOG_RETURN_INT(-1);
     }
@@ -241 +254 @@
      * Do the call.
      */
+    LIBCLOG_MSG("calling native: cFDs=%d pRead=%p pWrite=%p, pExcept=%p tv=%p\n",
+                cFDs, pRead, pWrite, pExcept, tv);
     rc = __libsocket_bsdselect(cFDs, pRead, pWrite, pExcept, tv);
     if (rc < 0)
@@ -268 +283 @@
      */
     if (readfds)
-        update(nfds, pRead, readfds);
-    if (writefds)
-        update(nfds, pWrite, writefds);
-    if (exceptfds)
-        update(nfds, pExcept, exceptfds);
+        update(nfds, pRead, readfds, "read ");
+    if (writefds)
+        update(nfds, pWrite, writefds, "write");
+    if (exceptfds)
+        update(nfds, pExcept, exceptfds, "excpt");
 
     LIBCLOG_RETURN_INT(rc);