Kernel/VTerm - "Fix" wrapping issue in VTerm (why was old behavior there?)

[tpg/acess2.git] / KernelLand / Kernel / workqueue.c

diff --git a/KernelLand/Kernel/workqueue.c b/KernelLand/Kernel/workqueue.c
index 2cd6a25..f5d78f8 100644 (file)
--- a/KernelLand/Kernel/workqueue.c
+++ b/KernelLand/Kernel/workqueue.c
@@ -16,12 +16,12 @@ void Workqueue_Init(tWorkqueue *Queue, const char *Name, size_t NextOfset)
 {
        Queue->Name = Name;
        Queue->NextOffset = NextOfset;
+       Queue->Sleeper = NULL;
+       Queue->SleepTail = NULL;
 }
 
 void *Workqueue_GetWork(tWorkqueue *Queue)
 {
-       tThread *us;
-
        for( ;; )
        {
                // Check for work
@@ -36,19 +36,9 @@ void *Workqueue_GetWork(tWorkqueue *Queue)
                        return ret;
                }
                
-               // Go to sleep
-               SHORTLOCK(&glThreadListLock);
-               us = Threads_RemActive();
-               us->WaitPointer = Queue;
-               us->Status = THREAD_STAT_QUEUESLEEP;
-               Queue->Sleeper = us;
-               SHORTREL(&Queue->Protector);    
-               SHORTREL(&glThreadListLock);
-               
-               // Yield and sleep
-               Threads_int_WaitForStatusEnd(THREAD_STAT_QUEUESLEEP);
-
-               us->WaitPointer = NULL;
+               Threads_int_Sleep(THREAD_STAT_QUEUESLEEP,
+                       Queue, 0,
+                       &Queue->Sleeper, &Queue->SleepTail, &Queue->Protector);
        }
 }
 
@@ -65,9 +55,12 @@ void Workqueue_AddWork(tWorkqueue *Queue, void *Ptr)
 
        if( Queue->Sleeper )
        {       
-               if( Queue->Sleeper->Status != THREAD_STAT_ACTIVE )
-                       Threads_AddActive(Queue->Sleeper);
-               Queue->Sleeper = NULL;
+               ASSERTC( Queue->Sleeper->Status, !=, THREAD_STAT_ACTIVE );
+               tThread *next_sleeper = Queue->Sleeper->Next;
+               Threads_AddActive(Queue->Sleeper);
+               Queue->Sleeper = next_sleeper;
+               if(!next_sleeper)
+                       Queue->SleepTail = NULL;
        }
        SHORTREL(&Queue->Protector);
 }