Changeset 10428 for trunk/src/wsock32

Timestamp:

Jan 30, 2004, 11:02:12 PM (22 years ago)

Author:

bird

Message:

#682: Test for DEBUG_LOGGING not DEBUG. dprintf may be used in release.

Location:

trunk/src/wsock32

Files:

• asyncapi.cpp (modified) (6 diffs)
• asyncthread.cpp (modified) (6 diffs)

trunk/src/wsock32/asyncapi.cpp

@@ -1 @@
-/* $Id: asyncapi.cpp,v 1.20 2002-02-23 16:39:09 sandervl Exp $ */
+/* $Id: asyncapi.cpp,v 1.21 2004-01-30 22:02:11 bird Exp $ */
 
 /*
@@ -407 +407 @@
     ULONG eventReply = WSAMAKESELECTREPLY(event, socket_error);
 
-#ifdef DEBUG
+#ifdef DEBUG_LOGGING
     char *pszEvent = NULL;
 
@@ -576 +576 @@
 
                 //Don't send FD_CONNECT is socket was already connected (accept returns connected socket)
-                if(!pThreadParm->fConnected && (lEventsPending & FD_CONNECT)) 
+                if(!pThreadParm->fConnected && (lEventsPending & FD_CONNECT))
                 {
                         if(state & SS_ISCONNECTED) {
@@ -636 +636 @@
                 }
                 else
-                if((lEventsPending & FD_CLOSE) && (state == 0 && bytesread == 0)) 
+                if((lEventsPending & FD_CLOSE) && (state == 0 && bytesread == 0))
                 {
                         state = ioctl(s, FIOBSTATUS, (char *)&tmp, sizeof(tmp));
 
-                        //Have to make sure this doesn't generates FD_CLOSE 
-                        //messages when the connection is just fine (recv 
+                        //Have to make sure this doesn't generates FD_CLOSE
+                        //messages when the connection is just fine (recv
                         //executed in another thread when select returns)
                         if(state & (SS_CANTRCVMORE|SS_CANTSENDMORE|SS_ISDISCONNECTING|SS_ISDISCONNECTED)) {
@@ -694 +694 @@
         strcat(tmpbuf, " FD_WRITE");
     if (lEventMask & FD_OOB)
-        strcat(tmpbuf, " FD_OOB");    
+        strcat(tmpbuf, " FD_OOB");
     if (lEventMask & FD_ACCEPT)
         strcat(tmpbuf, " FD_ACCEPT");
@@ -809 +809 @@
         // return our internal event bit representation
         lpEvent->lNetworkEvents = InterlockedExchange((LPLONG)&pThreadInfo->u.asyncselect.lLastEvent, 0);
-   } 
+   }
    else
    {

trunk/src/wsock32/asyncthread.cpp

@@ -1 @@
-/* $Id: asyncthread.cpp,v 1.16 2003-01-06 13:05:40 sandervl Exp $ */
+/* $Id: asyncthread.cpp,v 1.17 2004-01-30 22:02:12 bird Exp $ */
 
 /*
@@ -33 +33 @@
 {
  PASYNCTHREADPARM pThreadParm = (PASYNCTHREADPARM)arg;
-#ifdef DEBUG
+#ifdef DEBUG_LOGGING
  ULONG ulSocket    = pThreadParm->u.asyncselect.s;
  ULONG hTaskHandle = pThreadParm->hAsyncTaskHandle;
@@ -113 +113 @@
                 DebugInt3();
         }
-   }   
+   }
    memset(pThreadParm, 0, sizeof(*pThreadParm));
    asyncThreadMutex.leave();
@@ -220 +220 @@
 
    while(pThreadInfo) {
-        dprintf(( "SOCKET %08xh thread#%d events %xh pending %xh, select %d", 
+        dprintf(( "SOCKET %08xh thread#%d events %xh pending %xh, select %d",
                 pThreadInfo->u.asyncselect.s,
                 pThreadInfo->hAsyncTaskHandle,
@@ -255 +255 @@
    asyncThreadMutex.enter();
    pThreadInfo = FindAsyncEvent(s);
-   if(pThreadInfo) 
+   if(pThreadInfo)
    {
         int size, state, tmp;
@@ -309 +309 @@
 //******************************************************************************
 //******************************************************************************
-BOOL QueryAsyncEvent(SOCKET s, int *pMode, ULONG *pNofityHandle, ULONG *pNofityData, 
+BOOL QueryAsyncEvent(SOCKET s, int *pMode, ULONG *pNofityHandle, ULONG *pNofityData,
                      ULONG *plEvent)
 {