Changeset 892

Timestamp:

Dec 11, 2003, 2:30:25 AM (22 years ago)

Author:

bird

Message:

#697: select() & bugfixing.

Location:

trunk/src/emx

Files:

• include/emx/io.h (modified) (1 diff, 1 prop)
• include/emx/syscalls.h (modified) (1 diff, 1 prop)
• src/lib/io/select.c (modified) (1 diff, 1 prop)
• src/lib/socket/socket.imp (modified) (1 diff, 1 prop)
• src/lib/socket/socket.smak (modified) (1 diff, 1 prop)
• src/lib/socket/socket_tcpipv4.imp (modified) (1 diff, 1 prop)
• src/lib/socket/socketops.c (modified) (4 diffs, 1 prop)
• src/lib/sys/__select.c (modified) (1 diff, 1 prop)
• src/lib/sys/filehandles.c (modified) (1 diff, 1 prop)
• src/libsocket/socket.imp (modified) (1 diff, 1 prop)
• src/libsocket/socket.smak (modified) (1 diff, 1 prop)
• src/libsocket/socket_tcpipv4.imp (modified) (1 diff, 1 prop)
• src/libsocket/socketops.c (modified) (4 diffs, 1 prop)

trunk/src/emx/include/emx/io.h

@@ -289 +289 @@
      */
     int (*pfnIOControl)(struct __libc_FileHandle *pFH, int fh, int iIOControl, int iArg, int *prc);
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 } LIBCFHOPS, *PLIBCFHOPS/*, const * PCLIBCFHOPS*/;

trunk/src/emx/include/emx/syscalls.h

@@ -196 +196 @@
 void *__sbrk (int incr);
 void __scrsize (int *dst);
-int __select (struct _select *args);
+int __select(int nfds, struct fd_set *readfds, struct fd_set *writefds,
+             struct fd_set *exceptfds, struct timeval *tv);
 int __send (int handle, __const__ void *buf, int len, unsigned flags);
 int __sendto (__const__ struct _sendto *args);

trunk/src/emx/src/lib/io/select.c

@@ -1 @@
-/* select.c (emx+gcc) -- Copyright (c) 1992-1996 by Eberhard Mattes */
+/* $Id: $ */
+/** @file
+ *
+ * select().
+ *
+ * Copyright (c) 2003 knut st. osmundsen <[email protected]>
+ *
+ *
+ * This file is part of Innotek LIBC.
+ *
+ * Innotek LIBC is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published
+ * by the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Innotek LIBC is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Innotek LIBC; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
 
 #include "libc-alias.h"
-#include <stdlib.h>
-#include <memory.h>
-#include <io.h>
-#include <sys/types.h>
-#include <sys/time.h>
-#include <emx/io.h>
 #include <emx/syscalls.h>
 
-int _STD(select) (int nfds, fd_set *readfds, fd_set *writefds,
-                  fd_set *exceptfds, struct timeval *timeout)
+int _STD(select)(int nfds, fd_set *readfds, fd_set *writefds,
+                 )
 {
-/** @todo rewrite select */
-  struct _select args = {0,0,0,0,0};
-#if 0
-  args.nfds = nfds;
-  args.readfds = readfds;
-  args.writefds = writefds;
-  args.exceptfds = exceptfds;
-  args.timeout = timeout;
-  if (readfds != NULL)
-    {
-      fd_set *tmp;
-      struct timeval tv;
-      int i, j, k, n, nb, nw, rc;
-      struct fdvec *pv;
-
-      nw = (nfds + 31) / 32;
-      if (nw < 256 / 32)
-        nw = 256 / 32;
-      nb = nw * 4;
-      tmp = alloca (nb);
-      memset (tmp, 0, nb);
-      j = 0; n = 0; pv = &_fdvec_head;
-      while (n < nfds && pv != NULL)
-        {
-          k = nfds - n;
-          if (pv->n < k) k = pv->n;
-          for (i = 0; i < k; ++i, ++n)
-            if (pv->lookahead[i] >= 0 && FD_ISSET (n, readfds))
-              {
-                FD_SET (n, tmp); /* handles ready due to look ahead */
-                ++j;
-              }
-          pv = pv->next;
-        }
-      if (j != 0)                /* there are handles with active look ahead */
-        {
-          tv.tv_sec = 0; tv.tv_usec = 0;      /* immediately return */
-          args.timeout = &tv;
-          rc = __select (&args);
-          if (rc == 0)          /* no handles ready -> use look ahead */
-            {
-              memcpy (readfds, tmp, nb);
-              rc = j;
-            }
-          else if (rc > 0)      /* merge */
-            for (i = 0; i < n; ++i)
-              if (FD_ISSET (i, tmp) && !FD_ISSET (i, readfds))
-                {
-                  FD_SET (i, readfds);
-                  if (!((writefds != NULL && FD_ISSET (i, writefds))
-                        || (exceptfds != NULL && FD_ISSET (i, exceptfds))))
-                    ++rc;
-                }
-          return rc;
-        }
-    }
-#endif
-  return __select (&args);
+    return __select(nfds, readfds, writefds, exceptfds, tv);
 }

trunk/src/emx/src/lib/socket/socket.imp

@@ -26 +26 @@
 __libsocket_soabort     tcpip32   19 ?
 os2_sock_errno          tcpip32   20 ?
-_os2_sock_errno         tcpip32   20 ?
+_  tcpip32   20 ?
 __libsocket_recvmsg     tcpip32   21 ?
 __libsocket_sendmsg     tcpip32   22 ?

trunk/src/emx/src/lib/socket/socket.smak

@@ -32 +32 @@
 .TCF    := -I$. -DTCPV40HDRS
 .IMPS   := src/lib/socket/socket_tcpipv4.imp
-.INSDIR := lib/tcpipv4
+.INSDIR := lib/tcpipv4
 .TKEEP  := 1
 include mkimplib.smak

trunk/src/emx/src/lib/socket/socket_tcpipv4.imp

@@ -26 +26 @@
 __libsocket_soabort     so32dll   19 ?
 os2_sock_errno          so32dll   20 ?
-_os2_sock_errno         so32dll   20 ?
+_  so32dll   20 ?
 __libsocket_recvmsg     so32dll   21 ?
 __libsocket_sendmsg     so32dll   22 ?

trunk/src/emx/src/lib/socket/socketops.c

@@ -112 +112 @@
 static int __libsocket_ops_FileControl(PLIBCFH pFH, int fh, int iIOControl, int iArg, int *prc);
 static int __libsocket_ops_IOControl(PLIBCFH pFH, int fh, int iIOControl, int iArg, int *prc);
+
 
 
@@ -126 +127 @@
     __libsocket_ops_Duplicate,
     __libsocket_ops_FileControl,
-    __libsocket_ops_IOControl
+    __libsocket_ops_IOControl,
+    __libsocket_ops_Select
 };
 
@@ -193 +195 @@
     }
 
-    *pcbWritten = 0;
+    *pcbWritten = ;
     return 0;
-
 }
 
@@ -532 +533 @@
     return -ENOSYS;
 }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

trunk/src/emx/src/lib/sys/__select.c

@@ +1 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 #include "libc-alias.h"
+
+
+
 #include <stdlib.h>
+
+
+
+
+
 #include <emx/syscalls.h>
+
 
-int __select (struct _select *args)
+int __select(int nfds, struct fd_set *readfds, struct fd_set *writefds,
+             struct fd_set *exceptfds, struct timeval *tv)
 {
-  (void)args;
-  perror ("select() not implemented");
-  return 0;
+    struct fd_set  *pLookAhead = NULL;
+    int             cLookAhead = 0;
+    int   (*pfnSelect)(int cFHs, struct fd_set *pRead, struct fd_set *pWrite, struct fd_set *pExcept, struct timeval *tv, int *prc)
+        = NULL;
+    int rc;
+    int rc2 = -1;
+    int i;
+
+    /*
+     * Iterate thru the bitmaps checking the handles.
+     */
+    for (i = 0; i < nfds; i++)
+    {
+        if (    (readfds   && FD_ISSET(i, readfds))
+            ||  (writefds  && FD_ISSET(i, writefds))
+            ||  (exceptfds && FD_ISSET(i, exceptfds)))
+        {
+            PLIBCFH pFH = __libc_FH(i);
+            if (!pFH)
+            {
+                errno = EBADF;
+                return -1;
+            }
+
+            /*
+             * We don't like OS/2 handles, nor handles with differnet select routines.
+             */
+            if (    !pFH->pOps
+                ||  (pfnSelect && pFH->pOps->pfnSelect != pfnSelect))
+            {
+                errno = EINVAL;
+                return -1;
+            }
+            if (!pfnSelect)
+                pfnSelect = pFH->pOps->pfnSelect;
+
+            /*
+             * Check lookahead.
+             */
+            if (pFH->iLookAhead >= 0 && readfds)
+            {
+                if (!pLookAhead)
+                {
+                    /* allocate set. */
+                    int cb = (nfds + 31) / 8;
+                    pLookAhead = alloca(cb);
+                    if (!pLookAhead)
+                    {
+                        errno = ENOMEM;
+                        return -1;
+                    }
+                    memset(pLookAhead, 0, cb);
+                }
+                FD_SET(i, pLookAhead);
+                cLookAhead++;
+            }
+        }
+    }
+
+    if (pLookAhead)
+    {
+        /*
+         * Do a select an merge the ready lookahead stuff with
+         * the result.
+         */
+        struct timeval  tvzero = {0,0};
+        rc = pfnSelect(nfds, readfds, writefds, exceptfds, &tvzero, &rc2);
+        if (!rc)
+        {
+            if (rc2 > 0)
+            {   /* merge */
+                for (i = 0; i < nfds; i++)
+                {
+                    if (    FD_ISSET(i, pLookAhead)
+                        && !FD_ISSET(i, readfds))
+                    {
+                        if (    (!writefds  || !FD_ISSET(i, writefds))
+                            &&  (!exceptfds || !FD_ISSET(i, exceptfds)))
+                            rc++;
+                        FD_SET(i, readfds);
+                    }
+                }
+            }
+            else if (rc2 == 0)
+            {   /* copy */
+                memcpy(readfds, pLookAhead, (nfds + 7) / 8);
+                rc = cLookAhead;
+            }
+        }
+    }
+    else if (pfnSelect)
+    {
+        /*
+         * Do a straight select.
+         */
+        rc = pfnSelect(nfds, readfds, writefds, exceptfds, tv, &rc2);
+    }
+    else if (tv)
+    {
+        FS_VAR();
+        /* wait for the given amount of time. */
+        rc2 = rc = 0;
+        FS_SAVE_LOAD();
+        DosSleep(tv->tv_sec * 1000 + tv->tv_usec / 1000);
+        FS_RESTORE();
+    }
+    else
+    {
+        /* @todo check specs!!! */
+        errno = EINVAL;
+        return -1;
+    }
+
+
+    /* set errno */
+    if (rc)
+    {
+        if (rc > 0)
+            _sys_set_errno(rc);
+        else
+            errno = -rc;
+    }
+
+    return rc2;
 }

trunk/src/emx/src/lib/sys/filehandles.c

@@ -438 +438 @@
     {
         pFH = _hmalloc(cb);
-        if (pFH)
+        if (pFH)
             return ERROR_NOT_ENOUGH_MEMORY;
     }

trunk/src/emx/src/libsocket/socket.imp

@@ -26 +26 @@
 __libsocket_soabort     tcpip32   19 ?
 os2_sock_errno          tcpip32   20 ?
-_os2_sock_errno         tcpip32   20 ?
+_  tcpip32   20 ?
 __libsocket_recvmsg     tcpip32   21 ?
 __libsocket_sendmsg     tcpip32   22 ?

trunk/src/emx/src/libsocket/socket.smak

@@ -32 +32 @@
 .TCF    := -I$. -DTCPV40HDRS
 .IMPS   := src/lib/socket/socket_tcpipv4.imp
-.INSDIR := lib/tcpipv4
+.INSDIR := lib/tcpipv4
 .TKEEP  := 1
 include mkimplib.smak

trunk/src/emx/src/libsocket/socket_tcpipv4.imp

@@ -26 +26 @@
 __libsocket_soabort     so32dll   19 ?
 os2_sock_errno          so32dll   20 ?
-_os2_sock_errno         so32dll   20 ?
+_  so32dll   20 ?
 __libsocket_recvmsg     so32dll   21 ?
 __libsocket_sendmsg     so32dll   22 ?

trunk/src/emx/src/libsocket/socketops.c

@@ -112 +112 @@
 static int __libsocket_ops_FileControl(PLIBCFH pFH, int fh, int iIOControl, int iArg, int *prc);
 static int __libsocket_ops_IOControl(PLIBCFH pFH, int fh, int iIOControl, int iArg, int *prc);
+
 
 
@@ -126 +127 @@
     __libsocket_ops_Duplicate,
     __libsocket_ops_FileControl,
-    __libsocket_ops_IOControl
+    __libsocket_ops_IOControl,
+    __libsocket_ops_Select
 };
 
@@ -193 +195 @@
     }
 
-    *pcbWritten = 0;
+    *pcbWritten = ;
     return 0;
-
 }
 
@@ -532 +533 @@
     return -ENOSYS;
 }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+