Modules/PRO100 - Implimenting, still untested

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

diff --git a/KernelLand/Kernel/workqueue.c b/KernelLand/Kernel/workqueue.c
index b1a6385..2cd6a25 100644 (file)
--- a/KernelLand/Kernel/workqueue.c
+++ b/KernelLand/Kernel/workqueue.c
@@ -9,6 +9,8 @@
 #include <workqueue.h>
 #include <threads_int.h>
 
+#define QUEUENEXT(ptr) (*( (void**)(ptr) + Queue->NextOffset/sizeof(void*) ))
+
 // === CODE ===
 void Workqueue_Init(tWorkqueue *Queue, const char *Name, size_t NextOfset)
 {
@@ -27,7 +29,7 @@ void *Workqueue_GetWork(tWorkqueue *Queue)
                if(Queue->Head)
                {
                        void *ret = Queue->Head;
-                       Queue->Head = *( (void**)ret + Queue->NextOffset/sizeof(void*) );
+                       Queue->Head = QUEUENEXT( ret );
                        if(Queue->Tail == ret)
                                Queue->Tail = NULL;
                        SHORTREL(&Queue->Protector);    
@@ -44,10 +46,7 @@ void *Workqueue_GetWork(tWorkqueue *Queue)
                SHORTREL(&glThreadListLock);
                
                // Yield and sleep
-               Threads_Yield();
-               if(us->Status == THREAD_STAT_QUEUESLEEP) {
-                       // Why are we awake?!
-               }
+               Threads_int_WaitForStatusEnd(THREAD_STAT_QUEUESLEEP);
 
                us->WaitPointer = NULL;
        }
@@ -58,11 +57,12 @@ void Workqueue_AddWork(tWorkqueue *Queue, void *Ptr)
        SHORTLOCK(&Queue->Protector);
 
        if( Queue->Tail )
-               *( (void**)Queue->Tail + Queue->NextOffset/sizeof(void*) ) = Ptr;
+               QUEUENEXT(Queue->Tail) = Ptr;
        else
                Queue->Head = Ptr;
        Queue->Tail = Ptr;
-       
+       QUEUENEXT(Ptr) = NULL;
+
        if( Queue->Sleeper )
        {       
                if( Queue->Sleeper->Status != THREAD_STAT_ACTIVE )