SpiderScript - Bugs, Documentation and a few language features

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

diff --git a/Kernel/threads.c b/Kernel/threads.c
index ee48e3e..d24af08 100644 (file)
--- a/Kernel/threads.c
+++ b/Kernel/threads.c
@@ -81,11 +81,11 @@ void        Mutex_Release(tMutex *Mutex);
 // -- Core Thread --
 // Only used for the core kernel
 tThread        gThreadZero = {
-       Status: THREAD_STAT_ACTIVE,     // Status
-       ThreadName:     (char*)"ThreadZero",    // Name
-       Quantum: DEFAULT_QUANTUM,       // Default Quantum
-       Remaining:      DEFAULT_QUANTUM,        // Current Quantum
-       Priority:       DEFAULT_PRIORITY        // Number of tickets
+       .Status         = THREAD_STAT_ACTIVE,   // Status
+       .ThreadName     = (char*)"ThreadZero",  // Name
+       .Quantum        = DEFAULT_QUANTUM,      // Default Quantum
+       .Remaining      = DEFAULT_QUANTUM,      // Current Quantum
+       .Priority       = DEFAULT_PRIORITY      // Number of tickets
        };
 // -- Processes --
 // --- Locks ---
@@ -782,6 +782,8 @@ void Threads_AddActive(tThread *Thread)
                tThread *cur = Proc_GetCurThread();
                Warning("WTF, CPU%i %p (%i %s) is adding %p (%i %s) when it is active",
                        GetCPUNum(), cur, cur->TID, cur->ThreadName, Thread, Thread->TID, Thread->ThreadName);
+               SHORTREL( &glThreadListLock );
+               return ;
        }
        
        // Set state
@@ -1312,6 +1314,7 @@ int Mutex_Acquire(tMutex *Mutex)
 /**
  * \brief Release a held mutex
  * \param Mutex        Mutex to release
+ * \note Releasing a non-held mutex has no effect
  */
 void Mutex_Release(tMutex *Mutex)
 {
@@ -1359,9 +1362,11 @@ int Mutex_IsLocked(tMutex *Mutex)
 //
 void Semaphore_Init(tSemaphore *Sem, int Value, int MaxValue, const char *Module, const char *Name)
 {
+       memset(Sem, 0, sizeof(tSemaphore));
        Sem->Value = Value;
        Sem->ModName = Module;
        Sem->Name = Name;
+       Sem->MaxValue = MaxValue;
 }
 //
 // Wait for items to be avaliable
@@ -1472,8 +1477,12 @@ int Semaphore_Signal(tSemaphore *Sem, int AmmountToAdd)
        if( Sem->MaxValue && Sem->Value == Sem->MaxValue )
        {
                tThread *us;
-               SHORTLOCK( &glThreadListLock );
+               #if 0
+               Log_Debug("Threads", "Semaphore_Signal: IDLE Sem = %s:%s", Sem->ModName, Sem->Name);
+               Log_Debug("Threads", "Semaphore_Signal: Sem->Value(%i) == Sem->MaxValue(%i)", Sem->Value, Sem->MaxValue);
+               #endif
                
+               SHORTLOCK( &glThreadListLock );
                // - Remove from active list
                us = Threads_RemActive();
                us->Next = NULL;