Changeset 9340 for trunk/src

Timestamp:

Oct 10, 2002, 6:28:40 PM (23 years ago)

Author:

sandervl

Message:

Overlapped IO bugfixes for synchronization + ip logging fix

Location:

trunk/src/kernel32

Files:

• dbglog.cpp (modified) (4 diffs)
• overlappedio.cpp (modified) (4 diffs)

trunk/src/kernel32/dbglog.cpp

@@ -1 @@
-/* $Id: dbglog.cpp,v 1.3 2002-10-03 13:05:55 sandervl Exp $ */
+/* $Id: dbglog.cpp,v 1.4 2002-10-10 16:28:40 sandervl Exp $ */
 
 /*
@@ -255 +255 @@
 static BOOL fFlushLines = FALSE;
 
+static char *pszLastLogEntry = NULL;
+
 //#define CHECK_ODINHEAP
 #if defined(DEBUG) && defined(CHECK_ODINHEAP)
@@ -287 +289 @@
   va_list argptr;
   TEB *teb = GetThreadTEB();
+
+  pszLastLogEntry = tekst;
 
   ODIN_HEAPCHECK();
@@ -452 +456 @@
         int rc;
 
+        servername.sin_family      = AF_INET;
+        servername.sin_port        = WIN32_IP_LOG_PORT;
+
         rc = sendto(logSocket, logbuffer, strlen(logbuffer)+1, 0, (struct sockaddr *)&servername, sizeof(servername));
-
+        if(rc == -1) {
+            rc = sock_errno();
+        }
         if(teb) teb->o.odin.logfile = 0;
         va_end(argptr);

trunk/src/kernel32/overlappedio.cpp

@@ -1 @@
-/* $Id: overlappedio.cpp,v 1.19 2002-08-04 15:26:52 sandervl Exp $ */
+/* $Id: overlappedio.cpp,v 1.20 2002-10-10 16:28:40 sandervl Exp $ */
 
 /*
@@ -388 +388 @@
     else index = ASYNC_INDEX_WRITE;
 
-    addRequest(index, lpRequest);
-
     lpOverlapped->Internal     = STATUS_PENDING;
     lpOverlapped->InternalHigh = 0;
     //reset overlapped semaphore to non-signalled
     ::ResetEvent(lpOverlapped->hEvent);
+
+    //Add request to queue; must make sure we do this right before waking the async thread
+    addRequest(index, lpRequest);
 
     //wake up async thread
@@ -437 +438 @@
     lpRequest->next                = NULL;
 
-    addRequest(ASYNC_INDEX_READ, lpRequest);
-
     lpOverlapped->Internal     = STATUS_PENDING;
     lpOverlapped->InternalHigh = 0;
     //reset overlapped semaphore to non-signalled
     ::ResetEvent(lpOverlapped->hEvent);
+
+    //Add request to queue; must make sure we do this right before waking the async thread
+    addRequest(ASYNC_INDEX_READ, lpRequest);
 
     //wake up async thread
@@ -514 +516 @@
     }
 
+    //add request to list; must make sure we do this right before waking the async thread
     addRequest(ASYNC_INDEX_POLL, lpRequest);