Changeset 499 for trunk/thune/thread.c

Timestamp:

12/05/07 03:12:00 (12 months ago)

Author:

krobillard

Message:

Added ur_threadDestroy(). Removed ur_threadFree() from public API.
c_string.t should now handle all quotes properly.
Minor fix in GL boot
Documented stack.level.
Increased OpenAL music buffer size and now handle alutInit() failure.

Files:

• trunk/thune/thread.c (modified) (3 diffs)

trunk/thune/thread.c

@@ -55 +55 @@
         if( env->threads )
         {
-#if 0
             UThread* link = env->threads;
             ut->nextThread = link->nextThread;
             link->nextThread = ut;
-#endif
         }
         else
@@ -91 +89 @@
 
 /*
-void ur_threadUnlink( UThread* th )
+   Free memory used by UThread.
+
+   This does NOT remove the thread from the environemnt thread list.
+   ur_threadDestroy() must be used for that.
+*/
+void ur_threadFree( UThread* ut )
+{
+    _freeResources( ut->env, &ut->resources.arr );
+
+    _freeArrayOfArray( &ut->blocks.arr );
+    _freeArrayOfArray( &ut->bin.arr );
+
+    memFree( ut );
+}
+
+
+/**
+  Remove UThread from environment thread list and free memory.
+*/
+void ur_threadDestroy( UThread* ut )
 {
     UThread* it;
-    it = ((UrlanEnv*) th->env)->threads;
-    if( it == th )
-        ((UrlanEnv*) th->env)->threads = (UThread*) th->nextTask;
-    while( it->nextTask != th )
-        it = it->nextTask;
-    it->nextTask = th->nextTask;
-}
-*/
+    UrlanEnv* env = ut->env;
+
+    LOCK_GLOBAL
+
+    it = env->threads;
+    if( it == ut )
+    {
+        if( ut == ut->nextThread )
+        {
+            env->threads = 0;
+            goto done;
+        }
+        env->threads = (UThread*) ut->nextThread;
+    }
+    while( it->nextThread != ut )
+        it = it->nextThread;
+    it->nextThread = ut->nextThread;
+
+done:
+    UNLOCK_GLOBAL
+
+    ur_threadFree( ut );
+}
+
+
+/*
+   Return UThread to initial state with empty stacks.
+*/
+void ur_threadReset( UThread* th )
+{
+    /*
+      Data Stack     [BOS --> TOS      eos [2 reserved]]
+      Control Stack  [BOC --> TOC    [<-- Local Frames]]
+    */
+
+    th->state  = UR_TASK_READY;
+    th->callOp = 0;
+    th->tos = th->dstack;
+    // Eos reserves 2 cells for temporary call use & select! evaluation.
+    th->eos = th->dstack + UR_DSTACK_SIZE - 2;
+    th->toc = th->cstack;
+    th->localFT = (LocalFrame*) th->cstack + UR_CSTACK_SIZE;
+    ur_initType( th->tos, UT_UNSET );
+
+    //th->localWordBlk = 0;
+    //th->localPos = 0;
+}
 
 
@@ -155 +211 @@
 
 
-void ur_threadFree( UThread* ut )
-{
-    _freeResources( ut->env, &ut->resources.arr );
-
-    _freeArrayOfArray( &ut->blocks.arr );
-    _freeArrayOfArray( &ut->bin.arr );
-
-    memFree( ut );
-}
-
-
-void ur_threadReset( UThread* th )
-{
-    /*
-      Data Stack     [BOS --> TOS      eos [2 reserved]]
-      Control Stack  [BOC --> TOC    [<-- Local Frames]]
-    */
-
-    th->state  = UR_TASK_READY;
-    th->callOp = 0;
-    th->tos = th->dstack;
-    // Eos reserves 2 cells for temporary call use & select! evaluation.
-    th->eos = th->dstack + UR_DSTACK_SIZE - 2;
-    th->toc = th->cstack;
-    th->localFT = (LocalFrame*) th->cstack + UR_CSTACK_SIZE;
-    ur_initType( th->tos, UT_UNSET );
-
-    //th->localWordBlk = 0;
-    //th->localPos = 0;
-}
-
-
 void ur_pushContext( UThread* ut, UContext* ctx )
 {