unapplied part of Dimitri's patch at his request

[wxWidgets.git] / src / msw / thread.cpp

diff --git a/src/msw/thread.cpp b/src/msw/thread.cpp
index a743d287b0cb27022a5b22c57627ab87546461f9..b654353bfce9748f5248201b11732b31b2737a8e 100644 (file)
--- a/src/msw/thread.cpp
+++ b/src/msw/thread.cpp
@@ -45,21 +45,42 @@
     #define _MT
 #endif
 
     #define _MT
 #endif
 

+#if defined(__BORLANDC__)
+    #if !defined(__MT__)
+        // I can't set -tWM in the IDE (anyone?) so have to do this
+        #define __MT__
+    #endif
+
+    #if !defined(__MFC_COMPAT__)
+        // Needed to know about _beginthreadex etc..
+        #define __MFC_COMPAT__
+    #endif
+#endif // BC++
+
+// define wxUSE_BEGIN_THREAD if the compiler has _beginthreadex() function
+// which should be used instead of Win32 ::CreateThread() if possible

 #if defined(__VISUALC__) || \
     (defined(__BORLANDC__) && (__BORLANDC__ >= 0x500)) || \
 #if defined(__VISUALC__) || \
     (defined(__BORLANDC__) && (__BORLANDC__ >= 0x500)) || \

-    (defined(__GNUG__) && defined(__MSVCRT__))
-
-#if defined(__BORLANDC__) && !defined(__MT__)
-// I can't set -tWM in the IDE (anyone?) so have to do this
-#define __MT__
-#endif
+    (defined(__GNUG__) && defined(__MSVCRT__)) || \
+    defined(__WATCOMC__)

 
 

-#if defined(__BORLANDC__) && !defined(__MFC_COMPAT__)
-// Needed to know about _beginthreadex etc..
-#define __MFC_COMPAT__
+    #undef wxUSE_BEGIN_THREAD
+    #define wxUSE_BEGIN_THREAD

 #endif
 
 #endif
 

+#ifdef wxUSE_BEGIN_THREAD
+    // this is where _beginthreadex() is declared

     #include <process.h>
     #include <process.h>

+
+    // the return type of the thread function entry point
+    typedef unsigned THREAD_RETVAL;
+
+    // the calling convention of the thread function entry point
+    #define THREAD_CALLCONV __stdcall
+#else
+    // the settings for CreateThread()
+    typedef DWORD THREAD_RETVAL;
+    #define THREAD_CALLCONV WINAPI

 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------


@@ -327,8 +348,14 @@ void wxCondition::Broadcast()
 
 wxCriticalSection::wxCriticalSection()
 {
 
 wxCriticalSection::wxCriticalSection()
 {

-    wxASSERT_MSG( sizeof(CRITICAL_SECTION) <= sizeof(m_buffer),
+#ifdef __WXDEBUG__
+    // Done this way to stop warnings during compilation about statement
+    // always being false
+    int csSize = sizeof(CRITICAL_SECTION);
+    int bSize  = sizeof(m_buffer);
+    wxASSERT_MSG( csSize <= bSize,

                   _T("must increase buffer size in wx/thread.h") );
                   _T("must increase buffer size in wx/thread.h") );

+#endif

 
     ::InitializeCriticalSection((CRITICAL_SECTION *)m_buffer);
 }
 
     ::InitializeCriticalSection((CRITICAL_SECTION *)m_buffer);
 }


@@ -384,7 +411,7 @@ public:
     }
 
     // create a new (suspended) thread (for the given thread object)
     }
 
     // create a new (suspended) thread (for the given thread object)

-    bool Create(wxThread *thread);
+    bool Create(wxThread *thread, unsigned int stackSize);

 
     // suspend/resume/terminate
     bool Suspend();
 
     // suspend/resume/terminate
     bool Suspend();


@@ -404,7 +431,7 @@ public:
     DWORD  GetId() const { return m_tid; }
 
     // thread function
     DWORD  GetId() const { return m_tid; }
 
     // thread function

-    static DWORD WinThreadStart(wxThread *thread);
+    static THREAD_RETVAL THREAD_CALLCONV WinThreadStart(void *thread);

 
 private:
     HANDLE        m_hThread;    // handle of the thread
 
 private:
     HANDLE        m_hThread;    // handle of the thread


@@ -413,16 +440,17 @@ private:
     DWORD         m_tid;        // thread id
 };
 
     DWORD         m_tid;        // thread id
 };
 

-DWORD wxThreadInternal::WinThreadStart(wxThread *thread)
+THREAD_RETVAL THREAD_CALLCONV wxThreadInternal::WinThreadStart(void *param)

 {
 {

-    DWORD rc;
+    THREAD_RETVAL rc;

     bool wasCancelled;
 
     // first of all, check whether we hadn't been cancelled already and don't
     // start the user code at all then
     bool wasCancelled;
 
     // first of all, check whether we hadn't been cancelled already and don't
     // start the user code at all then

+    wxThread *thread = (wxThread *)param;

     if ( thread->m_internal->GetState() == STATE_EXITED )
     {
     if ( thread->m_internal->GetState() == STATE_EXITED )
     {

-        rc = (DWORD)-1;
+        rc = (THREAD_RETVAL)-1;

         wasCancelled = TRUE;
     }
     else // do run thread
         wasCancelled = TRUE;
     }
     else // do run thread


@@ -435,7 +463,7 @@ DWORD wxThreadInternal::WinThreadStart(wxThread *thread)
             return (DWORD)-1;
         }
 
             return (DWORD)-1;
         }
 

-        rc = (DWORD)thread->Entry();
+        rc = (THREAD_RETVAL)thread->Entry();

 
         // enter m_critsect before changing the thread state
         thread->m_critsect.Enter();
 
         // enter m_critsect before changing the thread state
         thread->m_critsect.Enter();


@@ -486,28 +514,35 @@ void wxThreadInternal::SetPriority(unsigned int priority)
     }
 }
 
     }
 }
 

-bool wxThreadInternal::Create(wxThread *thread)
+bool wxThreadInternal::Create(wxThread *thread, unsigned int stackSize)

 {
     // for compilers which have it, we should use C RTL function for thread
     // creation instead of Win32 API one because otherwise we will have memory
     // leaks if the thread uses C RTL (and most threads do)
 {
     // for compilers which have it, we should use C RTL function for thread
     // creation instead of Win32 API one because otherwise we will have memory
     // leaks if the thread uses C RTL (and most threads do)

-#if defined(__VISUALC__) || \
-    (defined(__BORLANDC__) && (__BORLANDC__ >= 0x500)) || \
-    (defined(__GNUG__) && defined(__MSVCRT__))
-    typedef unsigned (__stdcall *RtlThreadStart)(void *);
-
-    m_hThread = (HANDLE)_beginthreadex(NULL, 0,
-                                       (RtlThreadStart)
-                                       wxThreadInternal::WinThreadStart,
-                                       thread, CREATE_SUSPENDED,
-                                       (unsigned int *)&m_tid);
+#ifdef wxUSE_BEGIN_THREAD
+
+    // Watcom is reported to not like 0 stack size (which means "use default"
+    // for the other compilers and is also the default value for stackSize)
+#ifdef __WATCOMC__
+    if ( !stackSize )
+        stackSize = 10240;
+#endif // __WATCOMC__
+
+    m_hThread = (HANDLE)_beginthreadex
+                        (
+                          NULL,                             // default security
+                          stackSize,
+                          wxThreadInternal::WinThreadStart, // entry point
+                          thread,
+                          CREATE_SUSPENDED,
+                          (unsigned int *)&m_tid
+                        );

 #else // compiler doesn't have _beginthreadex
     m_hThread = ::CreateThread
                   (
                     NULL,                               // default security
 #else // compiler doesn't have _beginthreadex
     m_hThread = ::CreateThread
                   (
                     NULL,                               // default security

-                    0,                                  // default stack size
-                    (LPTHREAD_START_ROUTINE)            // thread entry point
-                    wxThreadInternal::WinThreadStart,   //
+                    stackSize,                          // stack size
+                    wxThreadInternal::WinThreadStart,   // thread entry point

                     (LPVOID)thread,                     // parameter
                     CREATE_SUSPENDED,                   // flags
                     &m_tid                              // [out] thread id
                     (LPVOID)thread,                     // parameter
                     CREATE_SUSPENDED,                   // flags
                     &m_tid                              // [out] thread id


@@ -612,6 +647,11 @@ int wxThread::GetCPUCount()
     return si.dwNumberOfProcessors;
 }
 
     return si.dwNumberOfProcessors;
 }
 

+unsigned long wxThread::GetCurrentId()
+{
+    return (unsigned long)::GetCurrentThreadId();
+}
+

 bool wxThread::SetConcurrency(size_t level)
 {
     wxASSERT_MSG( IsMain(), _T("should only be called from the main thread") );
 bool wxThread::SetConcurrency(size_t level)
 {
     wxASSERT_MSG( IsMain(), _T("should only be called from the main thread") );


@@ -725,11 +765,11 @@ wxThread::~wxThread()
 // create/start thread
 // -------------------
 
 // create/start thread
 // -------------------
 

-wxThreadError wxThread::Create()
+wxThreadError wxThread::Create(unsigned int stackSize)

 {
     wxCriticalSectionLocker lock(m_critsect);
 
 {
     wxCriticalSectionLocker lock(m_critsect);
 

-    if ( !m_internal->Create(this) )
+    if ( !m_internal->Create(this, stackSize) )

         return wxTHREAD_NO_RESOURCE;
 
     return wxTHREAD_NO_ERROR;
         return wxTHREAD_NO_RESOURCE;
 
     return wxTHREAD_NO_ERROR;


@@ -979,9 +1019,7 @@ void wxThread::Exit(ExitCode status)
         delete this;
     }
 
         delete this;
     }
 

-#if defined(__VISUALC__) || \
-    (defined(__BORLANDC__) && (__BORLANDC__ >= 0x500)) || \
-    (defined(__GNUG__) && defined(__MSVCRT__))
+#ifdef wxUSE_BEGIN_THREAD

     _endthreadex((unsigned)status);
 #else // !VC++
     ::ExitThread((DWORD)status);
     _endthreadex((unsigned)status);
 #else // !VC++
     ::ExitThread((DWORD)status);


@@ -1215,3 +1253,5 @@ bool WXDLLEXPORT wxIsWaitingForThread()
 }
 
 #endif // wxUSE_THREADS
 }
 
 #endif // wxUSE_THREADS

+
+// vi:sts=4:sw=4:et