Testing

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

diff --git a/Kernel/threads.c b/Kernel/threads.c
index 2735661..824cb16 100644 (file)
--- a/Kernel/threads.c
+++ b/Kernel/threads.c
@@ -13,6 +13,7 @@
 
 // === IMPORTS ===
 extern void    ArchThreads_Init();
+extern void    Proc_Start();
 extern tThread *Proc_GetCurThread();
 extern int     Proc_Clone(Uint *Err, Uint Flags);
 
@@ -22,12 +23,14 @@ void        Threads_SetName(char *NewName);
 void   Threads_SetTickets(int Num);
  int   Threads_WaitTID(int TID, int *status);
 tThread        *Threads_GetThread(Uint TID);
+void   Threads_AddToDelete(tThread *Thread);
 tThread        *Threads_int_GetPrev(tThread **List, tThread *Thread);
 void   Threads_Exit(int TID, int Status);
 void   Threads_Kill(tThread *Thread, int Status);
 void   Threads_Yield();
 void   Threads_Sleep();
 void   Threads_Wake(tThread *Thread);
+void   Threads_AddActive(tThread *Thread);
  int   Threads_GetPID();
  int   Threads_GetTID();
  int   Threads_GetUID();
@@ -91,9 +94,14 @@ void Threads_Init()
                cur->ThreadName = "Idle Thread";
                Threads_SetTickets(0);  // Never called randomly
                cur->Quantum = 1;       // 1 slice quantum
-               for(;;) __asm__ __volatile__ ("hlt");   // Just yeilds
+               HALT();
+               for(;;) {
+                       HALT(); // Just yeilds
+               }
        }
        #endif
+       
+       Proc_Start();
 }
 
 /**
@@ -132,7 +140,7 @@ void Threads_SetTickets(int Num)
  * \brief Wait for a task to change state
  */
 int Threads_WaitTID(int TID, int *status)
-{
+{      
        // Any Child
        if(TID == -1) {
                
@@ -161,10 +169,11 @@ int Threads_WaitTID(int TID, int *status)
                {
                case THREAD_STAT_ZOMBIE:
                        t->Status = THREAD_STAT_DEAD;
-                       *status = 0;
+                       if(status)      *status = 0;
+                       Threads_AddToDelete( t );
                        break;
                default:
-                       *status = -1;
+                       if(status)      *status = -1;
                        break;
                }
                return ret;
@@ -202,6 +211,22 @@ tThread *Threads_GetThread(Uint TID)
        return NULL;
 }
 
+/**
+ * \fn void Threads_AddToDelete(tThread *Thread)
+ * \brief Adds a thread to the delete queue
+ */
+void Threads_AddToDelete(tThread *Thread)
+{
+       // Add to delete queue
+       if(gDeleteThreads) {
+               Thread->Next = gDeleteThreads;
+               gDeleteThreads = Thread;
+       } else {
+               Thread->Next = NULL;
+               gDeleteThreads = Thread;
+       }
+}
+
 /**
  * \fn tThread *Threads_int_GetPrev(tThread *List, tThread *Thread)
  * \brief Gets the previous entry in a thead linked list
@@ -295,14 +320,7 @@ void Threads_Kill(tThread *Thread, int Status)
        if(Status == -1)
        {
                Thread->Status = THREAD_STAT_DEAD;
-               // Add to delete queue
-               if(gDeleteThreads) {
-                       Thread->Next = gDeleteThreads;
-                       gDeleteThreads = Thread;
-               } else {
-                       Thread->Next = NULL;
-                       gDeleteThreads = Thread;
-               }
+               Threads_AddToDelete( Thread );
        } else {
                Thread->Status = THREAD_STAT_ZOMBIE;
        }
@@ -319,7 +337,7 @@ void Threads_Kill(tThread *Thread, int Status)
  */
 void Threads_Yield()
 {
-       Proc_GetCurThread()->Quantum = 0;
+       Proc_GetCurThread()->Remaining = 0;
        HALT();
 }
 
@@ -332,7 +350,7 @@ void Threads_Sleep()
        tThread *cur = Proc_GetCurThread();
        tThread *thread;
        
-       //Log("Proc_Sleep: %i going to sleep", gCurrentThread->TID);
+       Log("Proc_Sleep: %i going to sleep", cur->TID);
        
        // Acquire Spinlock
        LOCK( &giThreadListLock );
@@ -405,6 +423,22 @@ void Threads_Wake(tThread *Thread)
        }
 }
 
+/**
+ * \fn void Threads_AddActive(tThread *Thread)
+ * \brief Adds a thread to the active queue
+ */
+void Threads_AddActive(tThread *Thread)
+{
+       LOCK( &giThreadListLock );
+       Thread->Next = gActiveThreads;
+       gActiveThreads = Thread;
+       giNumActiveThreads ++;
+       giTotalTickets += Thread->NumTickets;
+       //Log("Threads_AddActive: giNumActiveThreads = %i, giTotalTickets = %i",
+       //      giNumActiveThreads, giTotalTickets);
+       RELEASE( &giThreadListLock );
+}
+
 #if 0
 /**
  * \fn void Threads_SetSignalHandler(int Num, void *Handler)
@@ -514,9 +548,13 @@ tThread *Threads_GetNextToRun(int CPU)
                return gActiveThreads;
        }
        
+       //Log(" Threads_GetNextToRun: giNumActiveThreads=%i,giTotalTickets=%i",
+       //      giNumActiveThreads, giTotalTickets);
        // Get the ticket number
        ticket = number = rand() % giTotalTickets;
        
+       //Log(" Threads_GetNextToRun: ticket = %i", ticket);
+       
        // Find the next thread
        for(thread=gActiveThreads;thread;thread=thread->Next)
        {