MakeReleaseSet - Made clean code before building

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

diff --git a/Kernel/threads.c b/Kernel/threads.c
index f84ca7c..76041f5 100644 (file)
--- a/Kernel/threads.c
+++ b/Kernel/threads.c
@@ -124,6 +124,7 @@ void Threads_Init(void)
        
        Log_Debug("Threads", "Offsets of tThread");
        Log_Debug("Threads", ".Priority = %i", offsetof(tThread, Priority));
+       Log_Debug("Threads", ".KernelStack = %i", offsetof(tThread, KernelStack));
        
        // Create Initial Task
        #if SCHEDULER_TYPE == SCHED_RR_PRI
@@ -232,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;
@@ -245,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;
@@ -308,8 +307,7 @@ 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)
 {
@@ -716,8 +714,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);
+       }
 }
 
 
@@ -904,14 +905,17 @@ void Threads_AddActive(tThread *Thread)
 
 /**
  * \brief Removes the current thread from the active queue
- * \warning This should ONLY be called with task switches disabled
+ * \warning This should ONLY be called with the lock held
  * \return Current thread pointer
  */
 tThread *Threads_RemActive(void)
 {
        tThread *ret = Proc_GetCurThread();
-       
-       SHORTLOCK( &glThreadListLock );
+
+       if( !IS_LOCKED(&glThreadListLock) ) {
+               Log_KernelPanic("Threads", "Threads_RemActive called without lock held");
+               return NULL;
+       }
        
        // Delete from active queue
        #if SCHEDULER_TYPE == SCHED_RR_PRI
@@ -938,8 +942,6 @@ tThread *Threads_RemActive(void)
                GetCPUNum(), ret, ret->TID, ret->ThreadName, giFreeTickets);
        #endif
        
-       SHORTREL( &glThreadListLock );
-       
        return ret;
 }
 
@@ -998,7 +1000,7 @@ void Threads_SegFault(tVAddr Addr)
        tThread *cur = Proc_GetCurThread();
        cur->bInstrTrace = 0;
        Log_Warning("Threads", "Thread #%i committed a segfault at address %p", cur->TID, Addr);
-       MM_DumpTables(0, KERNEL_BASE);
+       MM_DumpTables(0, USER_MAX);
        Threads_Fault( 1 );
        //Threads_Exit( 0, -1 );
 }
@@ -1291,7 +1293,7 @@ tThread *Threads_GetNextToRun(int CPU, tThread *Last)
                        }
                        // If we fall onto the same queue again, special handling is
                        // needed
-                       if( Last && i == Last->Priority ) {
+                       if( Last && Last->Status == THREAD_STAT_ACTIVE && i == Last->Priority ) {
                                tThread *savedThread = thread;
                                
                                // Find the next unscheduled thread in the list
@@ -1312,6 +1314,9 @@ tThread *Threads_GetNextToRun(int CPU, tThread *Last)
                        SHORTREL(&glThreadListLock);
                        return NULL;
                }
+               if( thread->Status != THREAD_STAT_ACTIVE ) {
+                       LogF("Oops, Thread %i (%s) is not active\n", thread->TID, thread->ThreadName);
+               }
        }
        #elif SCHEDULER_TYPE == SCHED_RR_SIM
        {