Changeset 40 for trunk/infrastructure/st

Timestamp:

10/24/06 01:24:13 (2 years ago)

Author:

KirkMcDonald

Message:

Meta-programming library replaced; large re-write. StackThreads? updated to 0.3.2. Iteration updates.

Files:

• trunk/infrastructure/st/stackcontext.d (modified) (33 diffs)
• trunk/infrastructure/st/stackthread.d (modified) (1 diff)
• trunk/infrastructure/st/tls.d (added)

trunk/infrastructure/st/stackcontext.d

@@ -19 +19 @@
- * implementations.
- *
-0
-June 30
+2
+October 17
- * Authors: Mikola Lysenko, mclysenk@mtu.edu
- * License: Use/copy/modify freely, just give credit.
@@ -31 +31 @@
- *  since overflows are now trapped.
- *
- *  Implementation is not thread safe.
- *
- *  DMD has a bug on linux with multiple delegates in a
- *  scope.  Be aware that the linux version may have
@@ -48 +46 @@
- *  removeRange I have set it as optional.
- *
+ *  GDC version does not support assembler optimizations, since
+ *  it uses a different calling convention. 
+ *
- * History:
+ *  v0.12 - Workaround for DMD bug.
+ *
+ *  v0.11 - Implementation is now thread safe.
+ *
- *  v0.10 - Added the LEAK_FIX flag to work around the
- *          slowness of std.gc.removeRange
@@ -81 +86 @@
-    std.stdio,
-    std.string,
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-/// The default size of a StackContext's stack
@@ -136 +155 @@
-    }
-}
+
+
-
-
@@ -255 +276 @@
- * 
- ******************************************************/
-
+final 
-{
-    /**
@@ -335 +356 @@
-    {
-        assert(state != CONTEXT_STATE.RUNNING);
-
+.val
-    }
-    body
@@ -357 +378 @@
-     *  bubbled up through this method.
-     */
-
+final 
-    {
-        debug (StackContext) writefln("Running %s", this.toString);
-        
-        //We must be ready to run
-
-
-
-
-
+
+
-        
-        //Save the old context
-
+.val
-        
-        version(LEAK_FIX)
@@ -379 +397 @@
-        
-        //Set new context
-
+.val
-        ctx.switchIn();
-
+.val
-        
-        assert(state != CONTEXT_STATE.RUNNING);
@@ -428 +446 @@
-     *  running context.
-     */
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-        
-        //Leave the current context
-rent_context
-rent_context
+_ctx
+_ctx
-        
-        version(LEAK_FIX)
-        {
-            //Save the GC range
-rent_context
+_ctx
-            debug (LogGC) writefln("Adding range: %8x-%8x",
-rent_context.gc_start, current_context
-rent_context.gc_start, current_context
+_ctx.gc_start, cur_ctx
+_ctx.gc_start, cur_ctx
-        }
-        
-        //Swap
-rent_context
+_ctx
-        
-        version(LEAK_FIX)
-        {
+            StackContext t_ctx = current_context.val;
+            
-            //Remove the GC range
-            debug (LogGC) writefln("Removing range: %8x",
-current_context
-current_context
-current_context
-current_context
+t_ctx
+t_ctx
+t_ctx
+t_ctx
-        }
-        
-        //Return
-
-current_context
-
-current_context
+.val
+tmp
+
+tmp
-    }
-    
@@ -484 +503 @@
-     *  t = The exception object we will propagate.
-     */
-
-
-
+final 
+
+current_context.val.
-        yield();
-    }
@@ -496 +515 @@
-     *  A ContextException if the context is running.
-     */
-
+final 
-    {
-        debug (StackContext) writefln("Restarting %s", this.toString);
-        
-
-
-
-
-
+
+
-        
-        //Reset the context
+        restartStack();
+    }
+    
+    /**
+     * Recycles the context by restarting it with a new delegate. This
+     * can save resources by allowing a program to reuse previously
+     * allocated contexts.
+     *
+     * Params:
+     *  dg = The delegate which we will be running.
+     */
+    public final void recycle(void delegate() dg)
+    {
+        debug (StackContext) writefln("Recycling %s", this.toString);
+        
+        assert(state != CONTEXT_STATE.RUNNING,
+            "Cannot recycle a context while it is running");
+        
+        //Set the delegate and restart
+        proc = dg;
-        restartStack();
-    }
@@ -519 +555 @@
-     *  A ContextException if the context is not READY.
-     */
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-        
-        version(LEAK_FIX)
-        {
+            if(state == CONTEXT_STATE.DEAD)
+            {
+                return;
+            }
+            
-            //Clear the GC ranges if necessary
-            if(gc_start !is null)
@@ -550 +586 @@
-     * Returns: A string describing the context.
-     */
-
+final 
-    {
-        static char[][] state_names = 
@@ -622 +658 @@
-    public static StackContext getRunning()
-    {
-
+.val
-    }
-    
@@ -633 +669 @@
-                //Make sure context is running
-                //assert(ctx.old_stack_pointer !is null);
-
+.val
-            
-            case CONTEXT_STATE.READY:
@@ -655 +691 @@
-        }
-    }
-
-
+
-    version(LEAK_FIX)
-    {
@@ -669 +704 @@
-    private CONTEXT_STATE state;
-    
-//FIXME: All static objects should be in thread local 
-//storage.  Not sure how to do this effectively yet.
-
-/*BEGIN TLS {*/
-    
-    // The last exception generated
-    private static Object last_exception = null;
-
+
+
+
-    // The currently running stack context
-StackContext
-
+ThreadLocal!(StackContext)
+
-/*} END TLS*/
-    
@@ -767 +799 @@
-    in
-    {
-
+.val
-        version(LEAK_FIX)
-
+val.
-    }
-    body
-    {
+        StackContext cur_ctx = current_context.val;
+        
-        try
-        {
-            //Set state to running, enter the context
-rent_context
-rent_context
-rent_context
-rent_context
+_ctx
+_ctx
+_ctx
+_ctx
-        }
-        catch(Object o)
-        {
-            //Save exceptions so we can throw them later
-rent_context
-
+_ctx
+cur_ctx.
-        }
-        finally
@@ -791 +825 @@
-            //Leave the object.  Don't need to worry about
-            //GC, since it should already be released.
-rent_context
-rent_context
-rent_context
+_ctx
+_ctx
+_ctx
-        }
-        
@@ -807 +841 @@
-        version(Win32)
-        {
-
+
+
+
-                return os_query_stackBottom();
-            
-rent_context
+
-        }
-        else
@@ -819 +855 @@
-    }
-}
+
+static this()
+{
+    StackContext.current_context = new ThreadLocal!(StackContext);
+
+    version(SC_WIN_ASM)
+    {
+        //Get the system's page size
+        SYSTEM_INFO sys_info;
+        GetSystemInfo(&sys_info);
+        page_size = sys_info.dwPageSize;
+    }
+}
+
-
-/********************************************************
@@ -828 +878 @@
- ********************************************************/
-
-Win32
+SC_WIN_ASM
-{
-
@@ -904 +954 @@
-size_t page_size;
-
-static this()
-{
-    //Get the system's page size
-    SYSTEM_INFO sys_info;
-    GetSystemInfo(&sys_info);
-    page_size = sys_info.dwPageSize;
-}
-
-private struct SysContext
@@ -1035 +1078 @@
-    void killStack()
-    {
+        //Work around for bug in DMD 0.170
+        if(stack_bottom is null)
+        {
+            debug(StackContext)
+                writefln("WARNING!!!! Accidentally deleted a context twice");
+            return;
+        }
+        
-        debug (LogStack)
-        {
@@ -1141 +1192 @@
-}
-}
-linux
+SC_LIN_ASM
-{
-
@@ -1225 +1276 @@
-        //Initialize stack pointer
-        stack_pointer = stack_top;
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-    }
-    
@@ -1245 +1287 @@
-    void killStack()
-    {
+        //Make sure the GC didn't accidentally double collect us...
+        if(stack_bottom is null)
+        {
+            debug(StackContext) writefln("WARNING!!! Accidentally killed stack twice");
+            return;
+        }
+        
-        //Deallocate the stack
-        if(munmap(stack_bottom, (stack_top - stack_bottom)))
@@ -1343 +1392 @@
-else
-{
-
-
+
-}
-
@@ -1393 +1441 @@
-    assert(s1 == 0);
-    assert(a.getState == CONTEXT_STATE.DEAD);
-
-
-
-
-
-
-
-
-
-
-
-
+
-    
-    assert(b.getState == CONTEXT_STATE.READY);
@@ -1681 +1718 @@
-    }
-    
+    writefln("blah2");
+    
-    assert(a);
-    assert(b);
@@ -1900 +1939 @@
-    delete a;
-    
-    StackContext b;
-    
-    b = new StackContext(
-    delegate void()
-    {
-        b.restart();
-        assert(false);
-    });
-    
-    try
-    {
-        b.run();
-        assert(false);
-    }
-    catch(ContextException e)
-    {
-        e.print;
-    }
-    
-    try
-    {
-        StackContext.yield();
-        assert(false);
-    }
-    catch(ContextException e)
-    {
-        e.print;
-    }
-    
-    writefln("Standard exceptions passed");
@@ -2215 +2226 @@
-}
-
+unittest
+{
+    writefln("Testing thread safety");
+    
+    int x = 0, y = 0;
+    
+    StackContext sc0 = new StackContext(
+    {
+        while(true)
+        {
+            x++;
+            StackContext.yield;
+        }
+    });
+    
+    StackContext sc1 = new StackContext(
+    {
+        while(true)
+        {
+            y++;
+            StackContext.yield;
+        }
+    });
+    
+    Thread t0 = new Thread(
+    {
+        for(int i=0; i<10000; i++)
+            sc0.run();
+        
+        return 0;
+    });
+    
+    Thread t1 = new Thread(
+    {
+        for(int i=0; i<10000; i++)
+            sc1.run();
+        
+        return 0;
+    });
+    
+    assert(sc0);
+    assert(sc1);
+    assert(t0);
+    assert(t1);
+    
+    t0.start;
+    t1.start;
+    t0.wait;
+    t1.wait;
+    
+    assert(x == 10000);
+    assert(y == 10000);
+    
+    writefln("Thread safety passed!");
+}
+

trunk/infrastructure/st/stackthread.d

@@ -21 +21 @@
- *
- * Bugs:
-
+
+
- *
- * History: