Changeset 260

Timestamp:

03/11/10 00:36:00 (2 years ago)

Author:

walter

Message:

Rainer Schuetze's threading dll fix

Files:

• trunk/import/object.di (modified) (1 diff)
• trunk/src/core/dll_helper.d (added)
• trunk/src/core/thread.d (modified) (13 diffs)
• trunk/src/core/thread_helper.d (added)
• trunk/win32.mak (modified) (4 diffs)

trunk/import/object.di

@@ -247 +247 @@
-}
-
+ModuleInfo*[] _moduleinfo_tlsdtors;
+uint          _moduleinfo_tlsdtors_i;
+
+extern (C) void _moduleTlsCtor();
+extern (C) void _moduleTlsDtor();
+
-class Throwable : Object
-{

trunk/src/core/thread.d

@@ -99 +99 @@
-        import core.stdc.stdint : uintptr_t; // for _beginthreadex decl below
-        import core.sys.windows.windows;
+        import core.thread_helper;
-
-        const DWORD TLS_OUT_OF_INDEXES  = 0xFFFFFFFF;
@@ -192 +193 @@
-            return 0;
-        }
-
-
-        //
@@ -1093 +1093 @@
-        version( Windows )
-        {
-
+
+
+
+
+
-        }
-        else version( Posix )
@@ -1125 +1129 @@
-    }
-
+    /**
+     * Search the list of all threads for a thread with the given thread identifier
+     *
+     * Params:
+     *  addr = The thread identifier to search for
+     * Returns:
+     *  the thread object associated with the thread identifier, null if not found
+     */
+    static Thread findThread( ThreadAddr addr )
+    {
+        synchronized( slock )
+        {
+        foreach( Thread t; Thread )
+        if( t.m_addr == addr )
+            return t;
+    }
+    return null;
+    }
-
-    /**
@@ -1479 +1501 @@
-    //
-    static void add( Context* c )
+    {
+        synchronized( slock )
+        {
+        add_nolock( c );
+    }
+    }
+
+    static void add_nolock( Context* c )
-    in
-    {
@@ -1486 +1516 @@
-    body
-    {
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-    }
-
@@ -1538 +1565 @@
-    //
-    static void add( Thread t )
+    {
+        synchronized( slock )
+    {
+        add_nolock( t );
+    }
+    }
+
+    static void add_nolock( Thread t )
-    in
-    {
@@ -1546 +1581 @@
-    body
-    {
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-    }
-
@@ -1567 +1599 @@
-        assert( t );
-        assert( t.next || t.prev );
-Windows
+none
-        {
-            // NOTE: This doesn't work for Posix as m_isRunning must be set to
-            //       false after the thread is removed during normal execution.
+            // NOTE: This doesn't work for Windows either because remove is called
+        //       from the thread itself
-            assert( !t.isRunning );
-        }
@@ -1694 +1728 @@
-extern (C) void thread_attachThis()
-{
+    synchronized( Thread.slock )
+    {
+    version( Windows )
+    {
+        Thread thisThread = thread_attach_nolock( GetCurrentThreadId(), getStackBottom() );
+    }
+    else version( Posix )
+    {
+        Thread thisThread = thread_attach_nolock( pthread_self(), getStackBottom() );
+    }
+    Thread.setThis( thisThread );
+    }
+}
+
+/**
+ * Registers the thread with the given identifier for use with the D Runtime.  If this routine
+ * is called for a thread which is already registered, the result is undefined.
+ */
+extern (C) Thread thread_attach( Thread.ThreadAddr addr )
+{
+    synchronized( Thread.slock )
+    {
+    version( Windows )
+    {
+        void* bstack = getThreadStackBottom( addr );
+    }
+    else version( Posix )
+    {
+        void* bstack = null;
+        assert( false ); // not implemented
+    }
+    return thread_attach_nolock( addr, bstack );
+    // setThis cannot be called, because it sets the value in the current thread, 
+    //  not in the thread ew just attached to
+    }
+}
+
+extern (C) Thread thread_attach_nolock( Thread.ThreadAddr addr, void* bstack )
+{
+    // the gc should not be touched before attaching to the thread, because
+    //  it might interfere with threads that use the GC, but won't suspend
+    //  this thread. So we use a Thread object created by an attached thread.
+    // This is not necessary for the main (first) thread, because there is no
+    // concurrent thread.
+    static __gshared Thread nextThread;
+    Thread thisThread = nextThread ? nextThread : new Thread();
+
-    version( Windows )
-    {
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-    else version( Posix )
-    {
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-    }
-    version( OSX )
-    {
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -1744 +1836 @@
-}
-
+/**
+ * Deregisters the thread with the given thread identifier from use with the runtime.
+ * If this routine is called for a thread which is not registered, it does nothing.
+ */
+extern (C) void thread_detach( Thread.ThreadAddr addr )
+{
+    Thread t = Thread.findThread( addr );
+    if( t )
+    Thread.remove( t );
+}
+
-
-/**
@@ -1791 +1894 @@
-// Used for needLock below.
-private __gshared bool multiThreadedFlag = false;
-
-
-/**
@@ -1807 +1909 @@
-}
-
+// a DLL needs to set multiThreadedFlag, because threads might be
+//  created from other parts of the program that are not under our control
+extern (C) void thread_setNeedLock(bool need) nothrow
+{
+    multiThreadedFlag = need;
+}
-
-// Used for suspendAll/resumeAll below.

trunk/win32.mak

@@ -97 +97 @@
-    src/core/sync/semaphore.d \
-    src/core/thread.d \
+    src/core/thread_helper.d \
+    src/core/dll_helper.d \
-    src/core/threadasm.S \
-    src/core/vararg.d \
@@ -193 +195 @@
-    src\core\runtime.d \
-    src\core\thread.d \
+    src\core\thread_helper.d \
+    src\core\dll_helper.d \
-    src\core\vararg.d \
-    \
@@ -328 +332 @@
-    $(IMPDIR)\core\runtime.di \
-    $(IMPDIR)\core\thread.di \
+    $(IMPDIR)\core\thread_helper.di \
+    $(IMPDIR)\core\dll_helper.di \
-    $(IMPDIR)\core\vararg.di \
-    \
@@ -406 +412 @@
-    $(DMD) -c -d -o- -Iimport -Isrc -Hf$@ $**
-
+$(IMPDIR)\core\thread_helper.di : src\core\thread_helper.d
+    $(DMD) -c -d -o- -Iimport -Isrc -Hf$@ $**
+
+$(IMPDIR)\core\dll_helper.di : src\core\dll_helper.d
+    $(DMD) -c -d -o- -Iimport -Isrc -Hf$@ $**
+
-$(IMPDIR)\core\vararg.di : src\core\vararg.d
-    $(DMD) -c -d -o- -Iimport -Isrc -Hf$@ $**