Changeset 431 for branches/thune/thread_safe/urlan.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/urlan.c (modified) (5 diffs)

branches/thune/thread_safe/urlan.c

@@ -411 +411 @@
     int i;
 
+    //printf( "KR sizeof(pthread_t) = %lu\n", sizeof(pthread_t) );
+    //assert( sizeof(UCellThread) == 16 );
+
     assert( sizeof(UCell) == 16 );
     //assert( sizeof(LocalFrame) == 16 );
@@ -451 +454 @@
   \param customCount  Number of UDatatype in custom array.
 
-  \returns UR_EVAL_ code.
+  \return  UR_EVAL_ code.
 */
 int ur_startup( UrlanEnv* env, UDatatype* custom, int customCount )
@@ -467 +470 @@
     env->dtCount  = UT_BI_COUNT + customCount;
 
-    ur_arrayInit( &env->atoms,     sizeof(AtomRec),      4096 );
-    ur_arrayInit( &env->atomNames, sizeof(char),         2048 );
+    ur_arrayInit( &env->atoms,     sizeof(AtomRec),      2048 );
+    ur_arrayInit( &env->atomNames, sizeof(char),         2048 * 6 );
     ur_arrayInit( &env->devices,   sizeof(UPortDevice*),    8 );
     ur_rebuildAtomHash( &env->atoms );
@@ -485 +488 @@
     // Init main thread.
 
-    if( mutexInit( env->mutex ) == -1 )
-    {
-#ifndef _WIN32
+    if( mutexInitF( env->mutex ) )
+    {
+#ifdef _WIN32
+        //GetLastError();
+#else
         perror( "mutexInit" );
 #endif
@@ -495 +500 @@
     ut = ur_threadMake( env, 512, 1024 );
 
-    // Make hold & global context blocks.
-    ur_makeBlock( 8 );        // 0 - BLK_THREAD_HOLD
-    ur_makeBlock( 1024 );     // 1 - BLK_GLOBAL_WORD
-    ur_makeBlock( 1024 );     // 2 - BLK_GLOBAL_VAL
-    ur_makeBlock( 1 );        // 3 - BLK_CTX_STACK
-    //ur_makeBlock( 0 );        // 4 - BLK_DSTACK
-
-    ur_pushContext( ut, (UCell*) &ur_thrGlobal );
-
-    {
-    //UBlock* blk = ur_tblockPtr( BLK_DSTACK );
-    }
 
     // Add datatypes first so UT_ defines match the index & atom.