Changeset 468 for trunk/thune/urlan.c

Timestamp:

09/03/07 02:29:05 (15 months ago)

Author:

krobillard

Message:

Squashed commit of master.

Files:

• trunk/thune/urlan.c (modified) (10 diffs)

trunk/thune/urlan.c

@@ -445 +445 @@
 
 
-int ur_sizeofUrlanEnv()
-{
-    return sizeof(UrlanEnv);
-}
-
-
 UThread* ur_thread( UrlanEnv* env )
 {
@@ -458 +452 @@
 
 /**
-  Initialize UrlanEnv.
+  Create and initialize UrlanEnv.
 
   \param custom       Pointer to array of cutsom datatypes.
@@ -464 +458 @@
   \param customCount  Number of UDatatype in custom array.
 
-  \return  UR_EVAL_ code.
-*/
-int ur_startup( UrlanEnv* env, UDatatype* custom, int customCount )
-{
+  \return pointer to script environment.
+*/
+UrlanEnv* ur_makeEnv( UDatatype* custom, int customCount )
+{
+    UrlanEnv* env;
     UThread* ut;
     int n;
@@ -474 +469 @@
     _validateEnv();
 #endif
+
+    env = memAlloc( sizeof(UrlanEnv) );
+    if( ! env )
+        return 0;
 
     env->threads  = 0;
@@ -505 +504 @@
         perror( "mutexInit" );
 #endif
-        return UR_EVAL_ERROR;
+        return 0;
     }
 
@@ -535 +534 @@
     n = ur_tokenize( ut, _bootScript, _bootScript + sizeof(_bootScript) );
     if( ! n )
-        return UR_EVAL_ERROR;
+    {
+        ur_freeEnv( env );
+        return 0;
+    }
     ur_bind( n, (UCell*) &ur_thrGlobal );
     n = ur_eval( ut, n, 0 );
     if( n != UR_EVAL_OK )
-        return n;
+    {
+        ur_freeEnv( env );
+        return 0;
+    }
 #endif
     n = ur_evalCStr( ut, _envScript, sizeof(_envScript) );
@@ -573 +578 @@
     ur_installExceptionHandlers();
 
-    return n;
+    return env;
 }
 
@@ -630 +635 @@
   before a second thread is created.
 */
-void ur_freezeEnv( UThread* ut, int binCount, int blkCount )
-{
-    UrlanEnv* env = ut->env;
+void ur_freezeEnv( UrlanEnv* env, int binCount, int blkCount )
+{
+    UThread* ut = env->threads;
 
     assert( env->bin.arr.ptr.v == 0 );
@@ -727 +732 @@
   Release all resources used by env.
 */
-void ur_shutdown( UrlanEnv* env )
+void ur_freeEnv( UrlanEnv* env )
 {
     UThread* thr;
     UThread* next;
+
+    if( ! env )
+        return;
+
     if( (thr = env->threads) )
     {
@@ -753 +762 @@
     ur_arrayFree( &env->atoms );
     ur_arrayFree( &env->atomNames );
+
+    memFree( env );
 }