Changeset 431 for branches/thune/thread_safe/thune.c

Timestamp:

07/16/07 03:30:29 (17 months ago)

Author:

krobillard

Message:

Atoms should now be thread safe. First thread experiment runs.

Files:

• branches/thune/thread_safe/thune.c (modified) (7 diffs)

branches/thune/thread_safe/thune.c

@@ -11 +11 @@
 extern int ur_lessOrEqual( const UCell*, const UCell* );
 
-#ifdef UR_CONFIG_THREADS
-extern void ur_threadUnlink( UThread* );
-extern UThread* ur_threadNextReady( UThread* );
+#ifdef UR_CONFIG_TASKS
+extern void ur_taskUnlink( UThread* );
+extern UThread* ur_taskNextReady( UThread* );
 #endif
 
@@ -164 +164 @@
 
 #ifdef UR_CONFIG_THREADS
-// (block -- )
+#ifdef _WIN32
+static DWORD WINAPI threadRoutine( LPVOID arg )
+#else
+static void* threadRoutine( void* arg )
+#endif
+{
+    UThread* ut = (UThread*) arg;
+    ur_eval( ut, ut->tos[1].series.n, 0 );
+    ur_threadFree( ut );
+    return 0;
+}
+
+/*
+static void ur_threadCloneCell( UThread* ut, UCell* cellA,
+                                UThread* to, UCell* cellB )
+{
+    UIndex newBlkN;
+
+    switch( ur_type(cell) )
+    {
+        case UT_BLOCK:
+        {
+            UBlock* blkA;
+            UBlock* blkB;
+            blkA = ur_blockPtr( blkN );
+            newBlkN = ur_makeBlockT( to, blkA->used, &blkB ); 
+        }
+            break;
+
+        case UT_STRING:
+            break;
+    }
+}
+*/
+
+
+// (code -- )
 UR_CALL( uc_thread )
 {
+    if( ur_is(tos, UT_BLOCK) || ur_is(tos, UT_STRING) )
+    {
+        UThread* thr = ur_threadMake( ut->env, 64, 128 );
+        if( thr )
+        {
+            OSThread pth;
+#ifdef _WIN32
+            DWORD winId;
+#endif
+
+            if( ur_is(tos, UT_STRING) )
+            {
+                char* cpA;
+                char* cpB;
+                ur_seriesMem( ut, tos, &cpA, &cpB );
+                thr->tos[1].series.n = ur_tokenize( thr, cpA, cpB );
+            }
+
+#ifdef _WIN32
+            pth = CreateThread( NULL, 0, threadRoutine, thr, 0, &winId );
+            if( pth == NULL )
+#else
+            if( pthread_create( &pth, 0, threadRoutine, thr ) != 0 )
+#endif
+            {
+                ur_throwErr( UR_ERR_INTERNAL, "Could not create thread" );
+                return;
+            }
+
+#if 1
+            {
+            void* status;
+            pthread_join( pth, &status ); //KR
+            }
+#endif
+        }
+        UR_S_DROP;
+    }
+    else
+    {
+        ur_throwErr( UR_ERR_DATATYPE, "thread expected block!/string!" );
+    }
+}
+#endif
+
+
+#ifdef UR_CONFIG_TASKS
+// (block -- )
+UR_CALL( uc_task )
+{
     if( ur_is(tos, UT_BLOCK) )
     {
         UThread* thr;
         UThread* save;
-        thr = ur_threadMake( ut->env );
+        thr = ur_threadMake( ut->env, 32, 32 );
         if( thr )
         {
@@ -307 +393 @@
     UCell* pc;
     UCell* end;
-#ifdef UR_CONFIG_THREADS
+#ifdef UR_CONFIG_TASKS
     int insCycle = 0;
 #endif
@@ -323 +409 @@
 execute:
 
-#ifdef UR_CONFIG_THREADS
+#ifdef UR_CONFIG_TASKS
     if( ++insCycle == 100 )
     {
-        if( ut->nextThread != ut )
-        {
-            ut->state = UR_THREAD_READY;
+        if( ut->nextTask != ut )
+        {
+            ut->state = UR_TASK_READY;
 switch_thread:
             PUSHC_EVAL( blkN, start, pc );
-            ut = ur_threadNextReady( ut );
+            ut = ur_taskNextReady( ut );
             if( ! ut )
                 goto error;
@@ -363 +449 @@
         case UT_UNSET:
             --pc;
-#ifdef UR_CONFIG_THREADS
-            if( ut->nextThread != ut )
-            {
-                ut->state = UR_THREAD_BLOCKED;
+#ifdef UR_CONFIG_TASKS
+            if( ut->nextTask != ut )
+            {
+                ut->state = UR_TASK_BLOCKED;
                 goto switch_thread;
             }
@@ -956 +1042 @@
             goto execute;
 
-#ifdef UR_CONFIG_THREADS
+#ifdef UR_CONFIG_TASKS
         case CC_TERM:
-            if( ut->nextThread == ut )
+            if( ut->nextTask == ut )
                 goto finish;
-term_thread:
+term_task:
             {
             UThread* thr = ut;
-            ut->state = UR_THREAD_TERM;
-            ut = ur_threadNextReady( ut );
+            ut->state = UR_TASK_TERM;
+            ut = ur_taskNextReady( ut );
             if( ! ut )
                 goto error;
-            ur_threadUnlink( thr );
+            ur_taskUnlink( thr );
             ur_threadFree( thr );
             }
@@ -974 +1060 @@
 
         case CC_END:
-#ifdef UR_CONFIG_THREADS
-            if( ut->nextThread != ut )
-                goto term_thread;
+#ifdef UR_CONFIG_TASKS
+            if( ut->nextTask != ut )
+                goto term_task;
 #endif
             goto finish;