Changeset 499

Timestamp:

12/05/07 03:12:00 (10 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.

Location:

trunk/thune

Files:

• doc/UserManual (modified) (1 diff)
• eval.c (modified) (1 diff)
• gl/audio.c (modified) (6 diffs)
• gl/boot.c (modified) (1 diff)
• gl/gx.t (modified) (1 diff)
• scripts/c_string.t (modified) (2 diffs)
• thread.c (modified) (3 diffs)
• thune.c (modified) (4 diffs)
• urlan.c (modified) (4 diffs)
• urlan.h (modified) (1 diff)

trunk/thune/doc/UserManual

@@ -333 +333 @@
 ----------
 
-=======  =================  =================
-Word     Stack Usage        Function
-=======  =================  =================
-.        (val -- )          Remove value on top of stack and print it.
-.s       ()                 Show values on stack.
-dup      (a -- a a)         Duplicate value on top of stack.
-dup2     (a b -- a b a b)   Duplicate top 2 values.
-drop     (a -- )            Remove value on top of stack.
-swap     (a b -- b a)       Switch the two values on the top of stack.
-over     (a b -- a b a)     Copy second item on stack to the top of the stack.
-nip      (a b -- b)         Remove second value on stack.
-tuck     (a b -- b a b)     Copy top value under second value.
-rot      (a b c -- b c a)   Rotate third value to top.
-rot.r    (a b c -- c a b)   Rotate top of stack to third position.
-=======  =================  =================
+===========  =================  ============================
+Word         Stack Usage        Function
+===========  =================  ============================
+.            (val -- )          Remove value on top of stack and print it.
+.s           ()                 Show values on stack.
+dup          (a -- a a)         Duplicate value on top of stack.
+dup2         (a b -- a b a b)   Duplicate top 2 values.
+drop         (a -- )            Remove value on top of stack.
+swap         (a b -- b a)       Switch the two values on the top of stack.
+over         (a b -- a b a)     Copy second item on stack to the top.
+nip          (a b -- b)         Remove second value on stack.
+tuck         (a b -- b a b)     Copy top value under second value.
+rot          (a b c -- b c a)   Rotate third value to top.
+rot.r        (a b c -- c a b)   Rotate top of stack to third position.
+stack.level  ( -- level)        Returns depth of data stack.
+===========  =================  ============================
 
 

trunk/thune/eval.c

@@ -936 +936 @@
 
 
+// ( -- n)
 UR_CALL( uc_stack_level )
 {

trunk/thune/gl/audio.c

@@ -55 +55 @@
 
 static int _audioUp = 0;
-#if 0
+//#define OPEN_DEVICE     1
+#ifdef OPEN_DEVICE
 static ALCdevice*  _adevice  = 0;
 static ALCcontext* _acontext = 0;
@@ -62 +63 @@
 
 
-#define MUSIC_BUFFERS       2
+#define MUSIC_BUFFERS       3
 static ALuint  _musicSource = 0;
 static ALfloat _musicGain = 1.0f;
@@ -76 +77 @@
 #define OGG_BIG_ENDIAN  1
 #endif
-#define OGG_BUFFER_SIZE  (4096 * 4)
+
+/* 
+   OGG_BUFFER_SIZE is set to hold one second of data in each music buffer.
+   If aud_update() is not called before all buffers are played then OpenAL
+   will stop the sound source.
+*/
+#define OGG_BUFFER_SIZE  (44100 * 2)
 static char _oggPCM[ OGG_BUFFER_SIZE ];
 
@@ -141 +148 @@
 int aud_startup()
 {
-#if 0
+#ifdef OPEN_DEVICE
     _adevice = alcOpenDevice( 0 );
     if( ! _adevice )
@@ -150 +157 @@
     alutInitWithoutContext( 0, 0 );
 #else
-    alutInit( 0, 0 );
+    if( alutInit( 0, 0 ) == AL_FALSE )
+        return 0;
 #endif
 
@@ -175 +183 @@
         alDeleteBuffers( MUSIC_BUFFERS, _musicBuffers );
 
-#if 0
+#ifdef OPEN_DEVICE
         // Could not use alutExit() on my box (FC3/Shuttle XPC) since
         // alcMakeContextCurrent(0) -> _alLockMixerPause() will hangup.
         alcDestroyContext( _acontext );
         alcCloseDevice( _adevice );
-#endif
+#else
         alutExit();
+#endif
     }
 }

trunk/thune/gl/boot.c

@@ -156 +156 @@
   "    [display.area :wid/area]\n"
   "    either\n"
-  "    wid/resize ift (wid/area wid/resize do)\n"
+  "    wid/resize ift (wid/area wid/resize do drop)\n"
   "    wid\n"
   "]\n"

trunk/thune/gl/gx.t

@@ -233 +233 @@
     either
 
-    wid/resize ift (wid/area wid/resize do)
+    wid/resize ift (wid/area wid/resize do drop)
 
     wid

trunk/thune/scripts/c_string.t

@@ -3 +3 @@
 [str | a b]
 [
+    str copy dup . {"} {\"} replace.all head
+    /*
     str copy
     [some [
@@ -8 +10 @@
     ]]
     parse head
+    */
 ]
 func :replace-quotes  ; (str -- str)

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 )
 {

trunk/thune/thune.c

@@ -172 +172 @@
     UThread* ut = (UThread*) arg;
     ur_eval( ut, ut->tos[1].series.n, 0 );
-    ur_threadFree( ut );
+    ur_threadDestroy( ut );
     return 0;
 }
@@ -203 +203 @@
 UR_CALL( uc_thread )
 {
-    if( ur_is(tos, UT_BLOCK) || ur_is(tos, UT_STRING) )
+    if( /*ur_is(tos, UT_BLOCK) ||*/ ur_is(tos, UT_STRING) )
     {
         UThread* thr = ur_threadMake( ut->env, 64, 128 );
@@ -217 +217 @@
                 char* cpA;
                 char* cpB;
-                ur_seriesMem( ut, tos, &cpA, &cpB );
-                thr->tos[1].series.n = ur_tokenize( thr, cpA, cpB );
+                UIndex blkN;
+
+                ur_binaryMem( ut, tos, &cpA, &cpB );
+                blkN = ur_tokenize( thr, cpA, cpB );
+                if( ! blkN )
+                    return;
+                ur_infuseOpcodes( thr, blkN );
+                thr->tos[1].series.n = blkN;
             }
 
@@ -232 +238 @@
             }
 
-#if 1
+#if 0
             {
             void* status;

trunk/thune/urlan.c

@@ -696 +696 @@
 
 
-void _freeResources( UrlanEnv* env, UArray* arr )
+void _freeResources( const UrlanEnv* env, UArray* arr )
 {
     if( arr->used )
@@ -738 +738 @@
 
 
+extern void ur_threadFree( UThread* );
+
 /**
   Release all resources used by env.
@@ -749 +751 @@
         return;
 
-    if( (thr = env->threads) )
-    {
+    if( env->threads )
+    {
+        mutexLock( env->mutex );        // LOCK_GLOBAL
+
+        thr = env->threads;
         do
         {
@@ -759 +764 @@
         while( thr != env->threads );
 
+        mutexUnlock( env->mutex );      // UNLOCK_GLOBAL
         mutexFree( env->mutex );
     }

trunk/thune/urlan.h

@@ -520 +520 @@
 UThread* ur_thread( UrlanEnv* );
 UThread* ur_threadMake( UrlanEnv*, int binCount, int blkCount );
-void     ur_threadFree( UThread* );
+void     ur_threadDestroy( UThread* );
 void     ur_threadReset( UThread* );
 UBinary* ur_threadTmp( UThread* );