Changeset 1374 for trunk/src/wsock32/async.cpp

Timestamp:

Oct 20, 1999, 1:04:13 PM (26 years ago)

Author:

phaller

Message:

Fix: some fixes, WSAIsBlocking

File:

• trunk/src/wsock32/async.cpp (modified) (12 diffs)

trunk/src/wsock32/async.cpp

@@ -1 @@
-/* $Id: async.cpp,v 1.3 1999-10-20 10:09:49 phaller Exp $ */
+/* $Id: async.cpp,v 1.4 1999-10-20 11:04:12 phaller Exp $ */
 
 /*
@@ -114 +114 @@
 class WSAAsyncWorker
 {
+  // protected members
+  protected:
+    PASYNCREQUEST pRequestHead;        // chain root
+    PASYNCREQUEST pRequestTail;        // chain root
+    TID           tidWorker;           // worker thread id
+    HEV           hevRequest;          // fired upon new request
+    HMTX          hmtxRequestQueue;    // request queue protection
+    BOOL          fTerminate;          // got to die ?
+    BOOL          fBlocking;           // currently busy ?
+
+    TID           startWorker    (void);                   // start worker thread
+    void          processingLoop (void);                   // "work"
+    int           dispatchRequest(PASYNCREQUEST pRequest); // complete request
+    PASYNCREQUEST popRequest     (void);                   // get one request from queue
+    BOOL          deleteRequest  (PASYNCREQUEST pRequest); // remove particular request
+
+    void          lockQueue      (void);                   // enter mutex
+    void          unlockQueue    (void);                   // leave mutex
+
+    // the real worker methods
+    void          asyncGetHostByAddr   (PASYNCREQUEST pRequest);
+    void          asyncGetHostByName   (PASYNCREQUEST pRequest);
+    void          asyncGetProtoByName  (PASYNCREQUEST pRequest);
+    void          asyncGetProtoByNumber(PASYNCREQUEST pRequest);
+    void          asyncGetServByName   (PASYNCREQUEST pRequest);
+    void          asyncGetServByPort   (PASYNCREQUEST pRequest);
+
   // public members
   public:
@@ -130 +157 @@
     void          pushRequest    (PASYNCREQUEST pRequest); // put request on queue
     BOOL          cancelAsyncRequest   (PASYNCREQUEST pRequest);
+    BOOL          isBlocking     (void) {return fBlocking;}
 
     // the thread procedure
     friend void _Optlink WorkerThreadProc(void* pParam);
-
-
-  // protected members
-  protected:
-    PASYNCREQUEST pRequestHead;        // chain root
-    PASYNCREQUEST pRequestTail;        // chain root
-    TID           tidWorker;           // worker thread id
-    HEV           hevRequest;          // fired upon new request
-    HMTX          hmtxRequestQueue;    // request queue protection
-    BOOL          fTerminate;          // got to die ?
-
-    TID           startWorker    (void);                   // start worker thread
-    void          processingLoop (void);                   // "work"
-    int           dispatchRequest(PASYNCREQUEST pRequest); // complete request
-    PASYNCREQUEST popRequest     (void);                   // get one request from queue
-    BOOL          deleteRequest  (PASYNCREQUEST pRequest); // remove particular request
-
-    void          lockQueue      (void);                   // enter mutex
-    void          unlockQueue    (void);                   // leave mutex
-
-    // the real worker methods
-    void          asyncGetHostByAddr   (PASYNCREQUEST pRequest);
-    void          asyncGetHostByName   (PASYNCREQUEST pRequest);
-    void          asyncGetProtoByName  (PASYNCREQUEST pRequest);
-    void          asyncGetProtoByNumber(PASYNCREQUEST pRequest);
-    void          asyncGetServByName   (PASYNCREQUEST pRequest);
-    void          asyncGetServByPort   (PASYNCREQUEST pRequest);
 };
 
@@ -167 +168 @@
  *****************************************************************************/
 
-static WSAAsyncWorker* wsaWorker = NULL;
+//static WSAAsyncWorker* wsaWorker = NULL;
+static WSAAsyncWorker* wsaWorker = new WSAAsyncWorker();
 
 
@@ -278 +280 @@
 #if defined(__IBMCPP__)
     tidWorker = _beginthread(WorkerThreadProc,
-                             (PVOID)this,
-                             4096,
-                             NULL);
+                             NULL,
+                             16384,
+                             (PVOID)this);
 #else
     tidWorker = _beginthread(WorkerThreadProc,
-                             (PVOID)this,
-                             4096);
+                             16384,
+                             (PVOID)this);
 #endif
     if (tidWorker == -1)
@@ -357 +359 @@
 
   if (pRequestTail != NULL)
+  {
     if (pRequestTail->pPrev)
     {
@@ -362 +365 @@
       pRequestTail = pRequestTail->pPrev; // unlink previous element
     }
+    else
+    {
+      // this is the last request on the queue
+      pRequestTail = NULL;
+      pRequestHead = NULL;
+    }
+  }
 
   unlockQueue();  // unlock queue
@@ -905 +915 @@
 int WSAAsyncWorker::dispatchRequest(PASYNCREQUEST pRequest)
 {
+  int rc;
+
   dprintf(("WSOCK32-ASYNC: WSAAsyncWorker::dispatchRequest (%08xh, %08xh)\n",
            this,
@@ -927 +939 @@
   // OK, servicing request
   pRequest->ulState = RS_BUSY;
+  fBlocking         = TRUE;
 
   switch(pRequest->ulType)
@@ -934 +947 @@
       return 1;
 
-    case WSAASYNC_GETHOSTBYADDR:    asyncGetHostByAddr   (pRequest); return 1;
-    case WSAASYNC_GETHOSTBYNAME:    asyncGetHostByName   (pRequest); return 1;
-    case WSAASYNC_GETPROTOBYNAME:   asyncGetProtoByName  (pRequest); return 1;
-    case WSAASYNC_GETPROTOBYNUMBER: asyncGetProtoByNumber(pRequest); return 1;
-    case WSAASYNC_GETSERVBYNAME:    asyncGetServByName   (pRequest); return 1;
-    case WSAASYNC_GETSERVBYPORT:    asyncGetServByPort   (pRequest); return 1;
+    case WSAASYNC_GETHOSTBYADDR:    asyncGetHostByAddr   (pRequest); rc = 1; break;
+    case WSAASYNC_GETHOSTBYNAME:    asyncGetHostByName   (pRequest); rc = 1; break;
+    case WSAASYNC_GETPROTOBYNAME:   asyncGetProtoByName  (pRequest); rc = 1; break;
+    case WSAASYNC_GETPROTOBYNUMBER: asyncGetProtoByNumber(pRequest); rc = 1; break;
+    case WSAASYNC_GETSERVBYNAME:    asyncGetServByName   (pRequest); rc = 1; break;
+    case WSAASYNC_GETSERVBYPORT:    asyncGetServByPort   (pRequest); rc = 1; break;
 
 //    case WSAASYNC_SELECT:
@@ -947 +960 @@
       dprintf(("WSOCK32: WSAAsyncWorker::dispatchRequest - invalid request type %d\n",
                 pRequest->ulType));
-      return 1;
+      rc = 1; break;
   }
 
   pRequest->ulState = RS_DONE;
-  return 0;
+  fBlocking         = FALSE;
+  return rc;
 }
 
@@ -1230 +1244 @@
   }
 }
+
+
+/*****************************************************************************
+ * Name      : WSAIsBlocking
+ * Purpose   :
+ * Parameters:
+ * Variables :
+ * Result    :
+ * Remark    :
+ * Status    : UNTESTED STUB
+ *
+ * Author    : Patrick Haller [Tue, 1998/06/16 23:00]
+ *****************************************************************************/
+
+ODINFUNCTION0(BOOL, WSAIsBlocking)
+{
+  return(wsaWorker->isBlocking());
+}