Kernel - Removed #include <adt.h> from acess.h, reduce global deps

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

diff --git a/Kernel/threads.c b/Kernel/threads.c
index 40e1729..4ab76ff 100644 (file)
--- a/Kernel/threads.c
+++ b/Kernel/threads.c
@@ -7,6 +7,7 @@
 #include <threads.h>
 #include <threads_int.h>
 #include <errno.h>
+#include <mutex.h>
 #include <semaphore.h>
 
 // Configuration
@@ -20,10 +21,10 @@
 #define SCHED_RR_SIM   2       // Single Queue Round Robin
 #define SCHED_RR_PRI   3       // Multi Queue Round Robin
 // Set scheduler type
-#define SCHEDULER_TYPE SCHED_LOTTERY
+#define SCHEDULER_TYPE SCHED_RR_PRI
 
 // === CONSTANTS ===
-#define        DEFAULT_QUANTUM 10
+#define        DEFAULT_QUANTUM 5
 #define        DEFAULT_PRIORITY        5
 #define MIN_PRIORITY           10
 const enum eConfigTypes        cCONFIG_TYPES[] = {
@@ -755,6 +756,56 @@ int Threads_Wake(tThread *Thread)
                SHORTREL( &glThreadListLock );
                return -EOK;
        
+       case THREAD_STAT_SEMAPHORESLEEP: {
+               tSemaphore      *sem;
+               tThread *th, *prev=NULL;
+               
+               sem = Thread->WaitPointer;
+               
+               SHORTLOCK( &sem->Protector );
+               
+               // Remove from sleeping queue
+               for( th = sem->Waiting; th; prev = th, th = th->Next )
+                       if( th == Thread )      break;
+               if( th )
+               {
+                       if(prev)
+                               prev->Next = Thread->Next;
+                       else
+                               sem->Waiting = Thread->Next;
+                       if(sem->LastWaiting == Thread)
+                               sem->LastWaiting = prev;
+               }
+               else
+               {
+                       prev = NULL;
+                       for( th = sem->Signaling; th; prev = th, th = th->Next )
+                               if( th == Thread )      break;
+                       if( !th ) {
+                               Log_Warning("Threads", "Thread %p(%i %s) is not on semaphore %p(%s:%s)",
+                                       Thread, Thread->TID, Thread->ThreadName,
+                                       sem, sem->ModName, sem->Name);
+                               return -EINTERNAL;
+                       }
+                       
+                       if(prev)
+                               prev->Next = Thread->Next;
+                       else
+                               sem->Signaling = Thread->Next;
+                       if(sem->LastSignaling == 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);
+               #endif
+               SHORTREL( &sem->Protector );
+               } return -EOK;
+       
        case THREAD_STAT_WAITING:
                Warning("Threads_Wake - Waiting threads are not currently supported");
                return -ENOTIMPL;
@@ -811,13 +862,23 @@ void Threads_AddActive(tThread *Thread)
        Thread->Status = THREAD_STAT_ACTIVE;
 //     Thread->CurCPU = -1;
        // Add to active list
-       #if SCHEDULER_TYPE == SCHED_RR_PRI
-       Thread->Next = gaActiveThreads[Thread->Priority];
-       gaActiveThreads[Thread->Priority] = Thread;
-       #else
-       Thread->Next = gActiveThreads;
-       gActiveThreads = Thread;
-       #endif
+       {
+               tThread *tmp, *prev = NULL;
+               #if SCHEDULER_TYPE == SCHED_RR_PRI
+               for( tmp = gaActiveThreads[Thread->Priority]; tmp; prev = tmp, tmp = tmp->Next );
+               if(prev)
+                       prev->Next = Thread;
+               else
+                       gaActiveThreads[Thread->Priority] = Thread;
+               #else
+               for( tmp = gActiveThreads; tmp; prev = tmp, tmp = tmp->Next );
+               if(prev)
+                       prev->Next = Thread;
+               else
+                       gActiveThreads = Thread;
+               #endif
+               Thread->Next = NULL;
+       }
        
        // Update bookkeeping
        giNumActiveThreads ++;
@@ -863,6 +924,9 @@ tThread *Threads_RemActive(void)
        #endif
        {
                SHORTREL( &glThreadListLock );
+               Log_Warning("Threads", "Current thread %p(%i %s) is not on active queue",
+                       ret, ret->TID, ret->ThreadName
+                       );
                return NULL;
        }
        
@@ -900,8 +964,6 @@ void Threads_Fault(int Num)
 {
        tThread *thread = Proc_GetCurThread();
        
-       Log_Log("Threads", "Threads_Fault: thread = %p", thread);
-       
        if(!thread)     return ;
        
        Log_Log("Threads", "Threads_Fault: thread->FaultHandler = %p", thread->FaultHandler);
@@ -1423,7 +1485,6 @@ int Semaphore_Wait(tSemaphore *Sem, int MaxToTake)
                else
                        taken = Sem->Value;
                Sem->Value -= taken;
-               SHORTREL( &Sem->Protector );
        }
        else
        {
@@ -1456,7 +1517,7 @@ int Semaphore_Wait(tSemaphore *Sem, int MaxToTake)
                SHORTREL( &Sem->Protector );    // Release first to make sure it is released
                SHORTREL( &glThreadListLock );  
                while(us->Status == THREAD_STAT_SEMAPHORESLEEP) Threads_Yield();
-               // We're only woken when there's something avaliable
+               // We're only woken when there's something avaliable (or a signal arrives)
                us->WaitPointer = NULL;
                
                taken = us->RetStatus;