Kernel/x86_64 - Unbroke user stack creation

[tpg/acess2.git] / Kernel / threads.c

diff --git a/Kernel/threads.c b/Kernel/threads.c
index f586f68..949f6d2 100644 (file)
--- a/Kernel/threads.c
+++ b/Kernel/threads.c
@@ -233,12 +233,10 @@ void Threads_SetPriority(tThread *Thread, int Pri)
 }
 
 /**
- * \fn tThread *Threads_CloneTCB(Uint *Err, Uint Flags)
  * \brief Clone the TCB of the current thread
- * \param Err  Error pointer
  * \param Flags        Flags for something... (What is this for?)
  */
-tThread *Threads_CloneTCB(Uint *Err, Uint Flags)
+tThread *Threads_CloneTCB(Uint Flags)
 {
        tThread *cur, *new;
         int    i;
@@ -246,7 +244,7 @@ tThread *Threads_CloneTCB(Uint *Err, Uint Flags)
        
        // Allocate and duplicate
        new = malloc(sizeof(tThread));
-       if(new == NULL) { *Err = -ENOMEM; return NULL; }
+       if(new == NULL) { errno = -ENOMEM; return NULL; }
        memcpy(new, cur, sizeof(tThread));
        
        new->CurCPU = -1;
@@ -309,14 +307,12 @@ tThread *Threads_CloneTCB(Uint *Err, Uint Flags)
 }
 
 /**
- * \fn tThread *Threads_CloneTCB(Uint *Err, Uint Flags)
- * \brief Clone the TCB of the current thread
+ * \brief Clone the TCB of the kernel thread
  */
 tThread *Threads_CloneThreadZero(void)
 {
-       tThread *cur, *new;
+       tThread *new;
         int    i;
-       cur = Proc_GetCurThread();
        
        // Allocate and duplicate
        new = malloc(sizeof(tThread));
@@ -343,28 +339,17 @@ tThread *Threads_CloneThreadZero(void)
        new->LastMessage = NULL;
        
        // Set State
-       new->Remaining = new->Quantum = cur->Quantum;
-       new->Priority = cur->Priority;
+       new->Remaining = new->Quantum = DEFAULT_QUANTUM;
+       new->Priority = DEFAULT_PRIORITY;
        new->bInstrTrace = 0;
        
        // Set Signal Handlers
        new->CurFaultNum = 0;
-       new->FaultHandler = cur->FaultHandler;
+       new->FaultHandler = 0;
        
        for( i = 0; i < NUM_CFG_ENTRIES; i ++ )
        {
-               switch(cCONFIG_TYPES[i])
-               {
-               default:
-                       new->Config[i] = cur->Config[i];
-                       break;
-               case CFGT_HEAPSTR:
-                       if(cur->Config[i])
-                               new->Config[i] = (Uint) strdup( (void*)cur->Config[i] );
-                       else
-                               new->Config[i] = 0;
-                       break;
-               }
+               new->Config[i] = 0;
        }
        
        // Maintain a global list of threads
@@ -649,14 +634,16 @@ void Threads_Kill(tThread *Thread, int Status)
        
        // Save exit status
        Thread->RetStatus = Status;
-       
+
        // Don't Zombie if we are being killed because our parent is
        if(Status == -1)
        {
                Thread->Status = THREAD_STAT_DEAD;
                Threads_AddToDelete( Thread );
+               SHORTREL( &glThreadListLock );
        } else {
                Thread->Status = THREAD_STAT_ZOMBIE;
+               SHORTREL( &glThreadListLock );
                // Wake parent
                Threads_Wake( Thread->Parent );
        }
@@ -664,7 +651,6 @@ void Threads_Kill(tThread *Thread, int Status)
        Log("Thread %i went *hurk* (%i)", Thread->TID, Status);
        
        // Release spinlocks
-       SHORTREL( &glThreadListLock );
        SHORTREL( &Thread->IsLocked );  // TODO: We may not actually be released...
        
        // And, reschedule
@@ -680,6 +666,7 @@ void Threads_Kill(tThread *Thread, int Status)
  */
 void Threads_Yield(void)
 {
+//     Log("Threads_Yield: by %p", __builtin_return_address(0));
        Proc_Reschedule();
 }
 
@@ -717,8 +704,11 @@ void Threads_Sleep(void)
        // Release Spinlock
        SHORTREL( &glThreadListLock );
 
-       while(cur->Status != THREAD_STAT_ACTIVE)
+       while(cur->Status != THREAD_STAT_ACTIVE) {
                Proc_Reschedule();
+               if( cur->Status != THREAD_STAT_ACTIVE )
+                       Log("%i - Huh? why am I up? zzzz...", cur->TID);
+       }
 }
 
 
@@ -745,12 +735,12 @@ int Threads_Wake(tThread *Thread)
                // Remove from sleeping queue
                Threads_int_DelFromQueue(&gSleepingThreads, Thread);
                
+               SHORTREL( &glThreadListLock );
                Threads_AddActive( Thread );
                
                #if DEBUG_TRACE_STATE
                Log("Threads_Sleep: %p (%i %s) woken", Thread, Thread->TID, Thread->ThreadName);
                #endif
-               SHORTREL( &glThreadListLock );
                return -EOK;
        
        case THREAD_STAT_SEMAPHORESLEEP: {
@@ -793,9 +783,7 @@ int Threads_Wake(tThread *Thread)
                                sem->LastSignaling = prev;
                }
                
-               SHORTLOCK( &glThreadListLock );
                Threads_AddActive( Thread );
-               SHORTREL( &glThreadListLock );
                
                #if DEBUG_TRACE_STATE
                Log("Threads_Sleep: %p(%i %s) woken from semaphore", Thread, Thread->TID, Thread->ThreadName);