Changeset 1294 for trunk/src/kernel32/thread.cpp

Timestamp:

Oct 14, 1999, 7:18:58 PM (26 years ago)

Author:

phaller

Message:

Fix: threads might need more memory in debug mode

File:

• trunk/src/kernel32/thread.cpp (modified) (4 diffs)

trunk/src/kernel32/thread.cpp

@@ -1 @@
-/* $Id: thread.cpp,v 1.14 1999-09-15 23:38:02 sandervl Exp $ */
+/* $Id: thread.cpp,v 1.15 1999-10-14 17:18:58 phaller Exp $ */
 
 /*
@@ -10 +10 @@
  *
  */
+
+/*****************************************************************************
+ * Includes                                                                  *
+ *****************************************************************************/
+
+#include <odin.h>
+#include <odinwrap.h>
+#include <os2sel.h>
+
 #include <os2win.h>
 #include <stdarg.h>
@@ -21 +30 @@
 #include <except.h>
 
+ODINDEBUGCHANNEL(KERNEL32-THREAD)
+
+
 static DWORD OPEN32API Win32ThreadProc(LPVOID lpData);
 
@@ -26 +38 @@
 //******************************************************************************
 //******************************************************************************
-HANDLE WIN32API CreateThread(LPSECURITY_ATTRIBUTES lpsa, DWORD cbStack,
-                             LPTHREAD_START_ROUTINE lpStartAddr,
-                             LPVOID lpvThreadParm, DWORD fdwCreate,
-                             LPDWORD lpIDThread)
-{
- Win32Thread *winthread;
-
- winthread = new Win32Thread(lpStartAddr, lpvThreadParm, fdwCreate);
+ODINFUNCTION6(HANDLE,CreateThread,LPSECURITY_ATTRIBUTES,  lpsa,
+                                  DWORD,                  cbStack,
+                                  LPTHREAD_START_ROUTINE, lpStartAddr,
+                                  LPVOID,                 lpvThreadParm,
+                                  DWORD,                  fdwCreate,
+                                  LPDWORD,                lpIDThread)
+{
+  Win32Thread *winthread;
+
+  winthread = new Win32Thread(lpStartAddr, lpvThreadParm, fdwCreate);
 
   if(winthread == 0)
     return(0);
 
-  dprintf(("CreateThread (%08xh,%08xh,%08xh,%08xh,%08xh,%08xh)\n",
-           lpsa,
-           cbStack,
-           lpStartAddr,
-           lpvThreadParm,
-           fdwCreate,
-           lpIDThread));
-
-  return(O32_CreateThread(lpsa, cbStack, winthread->GetOS2Callback(), (LPVOID)winthread, fdwCreate, lpIDThread));
+#ifdef DEBUG
+  // @@@PH Note: with debug code enabled, ODIN might request more stack space!
+  if (cbStack > 0)
+     cbStack <<= 1;
+#endif
+
+  return(O32_CreateThread(lpsa,
+                          cbStack,
+                          winthread->GetOS2Callback(),
+                          (LPVOID)winthread,
+                          fdwCreate,
+                          lpIDThread));
 }
 //******************************************************************************