Kernel - Implimenting POSIX/C Signals

[tpg/acess2.git] / KernelLand / Kernel / vfs / select.c

diff --git a/KernelLand/Kernel/vfs/select.c b/KernelLand/Kernel/vfs/select.c
index 412cb1a..d4c5cd8 100644 (file)
--- a/KernelLand/Kernel/vfs/select.c
+++ b/KernelLand/Kernel/vfs/select.c
@@ -5,7 +5,6 @@
  * select.c
  * - Implements the select() system call (and supporting code)
  *
- * TODO: Implment timeouts (via an alarm event?)
  * TODO: Remove malloc for read/write queues
  */
 #define DEBUG  0
@@ -89,7 +88,7 @@ int VFS_SelectNode(tVFS_Node *Node, int TypeFlags, tTime *Timeout, const char *N
        {
                LOG("Semaphore_Wait()");
                // TODO: Actual timeout
-               Threads_WaitEvents( THREAD_EVENT_VFS );
+               Threads_WaitEvents( THREAD_EVENT_VFS|THREAD_EVENT_SIGNAL );
        }
        else if( *Timeout > 0 )
        {
@@ -100,7 +99,7 @@ int VFS_SelectNode(tVFS_Node *Node, int TypeFlags, tTime *Timeout, const char *N
                LOG("Timeout %lli ms", *Timeout);
                Time_ScheduleTimer( t, *Timeout );
                // Wait for the timer or a VFS event
-               Threads_WaitEvents( THREAD_EVENT_VFS|THREAD_EVENT_TIMER );
+               Threads_WaitEvents( THREAD_EVENT_VFS|THREAD_EVENT_TIMER|THREAD_EVENT_SIGNAL );
                Time_FreeTimer(t);
        }
        
@@ -113,6 +112,7 @@ int VFS_SelectNode(tVFS_Node *Node, int TypeFlags, tTime *Timeout, const char *N
                if( !(TypeFlags & (1 << type)) )        continue;
                VFS_int_Select_GetType(type, Node, &list, &flag, &wanted, &maxAllowed);
                LOG("VFS_int_Select_RemThread()");
+               ASSERT(*list);
                VFS_int_Select_RemThread(*list, thisthread);
                ret = ret || *flag == wanted;
        }
@@ -129,8 +129,8 @@ int VFS_Select(int MaxHandle, fd_set *ReadHandles, fd_set *WriteHandles, fd_set
        tThread *thisthread = Proc_GetCurThread();
         int    ret;
        
-       ENTER("iMaxHandle pReadHandles pWriteHandles pErrHandles pTimeout bIsKernel",
-               MaxHandle, ReadHandles, WriteHandles, ErrHandles, Timeout, IsKernel);
+       ENTER("iMaxHandle pReadHandles pWriteHandles pErrHandles pTimeout xExtraEvents bIsKernel",
+               MaxHandle, ReadHandles, WriteHandles, ErrHandles, Timeout, ExtraEvents, IsKernel);
        
        // Notes: The idea is to make sure we only enter wait (Threads_WaitEvents)
        // if we are going to be woken up (either by an event at a later time,
@@ -140,6 +140,8 @@ int VFS_Select(int MaxHandle, fd_set *ReadHandles, fd_set *WriteHandles, fd_set
        // or the semaphore is incremeneted (or both, but never none)
        
        // Register with nodes
+       if( ReadHandles )
+               LOG(" - ReadHandles[0] = %x", ReadHandles->flags[0]);
        ret  = VFS_int_Select_Register(thisthread, MaxHandle, ReadHandles, 0, IsKernel);
        ret += VFS_int_Select_Register(thisthread, MaxHandle, WriteHandles, 1, IsKernel);
        ret += VFS_int_Select_Register(thisthread, MaxHandle, ErrHandles, 2, IsKernel);
@@ -149,9 +151,11 @@ int VFS_Select(int MaxHandle, fd_set *ReadHandles, fd_set *WriteHandles, fd_set
        // If there were events waiting, de-register and return
        if( ret > 0 )
        {
+               LOG(" - ReadHandles[0] = %x", ReadHandles->flags[0]);
                ret  = VFS_int_Select_Deregister(thisthread, MaxHandle, ReadHandles, 0, IsKernel);
                ret += VFS_int_Select_Deregister(thisthread, MaxHandle, WriteHandles, 1, IsKernel);
                ret += VFS_int_Select_Deregister(thisthread, MaxHandle, ErrHandles, 2, IsKernel);
+               LOG(" - ReadHandles[0] = %x", ReadHandles->flags[0]);
                LEAVE('i', ret);
                return ret;
        }
@@ -161,7 +165,7 @@ int VFS_Select(int MaxHandle, fd_set *ReadHandles, fd_set *WriteHandles, fd_set
        {
                LOG("Semaphore_Wait()");
                // TODO: Actual timeout
-               Threads_WaitEvents( THREAD_EVENT_VFS|ExtraEvents );
+               Threads_WaitEvents( THREAD_EVENT_VFS|THREAD_EVENT_SIGNAL|ExtraEvents );
        }
        else if( *Timeout > 0 )
        {
@@ -306,8 +310,10 @@ int VFS_int_Select_Register(tThread *Thread, int MaxHandle, fd_set *Handles, int
                }
                
                // Check for the flag
-               if( !!*flag == !!wantedFlagValue )
+               if( !!*flag == !!wantedFlagValue ) {
+                       LOG(" %i == want %i", !!*flag, !!wantedFlagValue);
                        numFlagged ++;
+               }
        }
        
        LEAVE('i', numFlagged);
@@ -348,8 +354,6 @@ int VFS_int_Select_Deregister(tThread *Thread, int MaxHandle, fd_set *Handles, i
                        continue;
                }
        
-               // Get the type of the listen
-       
                // Get the type of the listen
                if( VFS_int_Select_GetType(Type, handle->Node, &list, &flag, &wantedFlagValue, NULL) ) {
                        LEAVE('i', 0);
@@ -362,6 +366,8 @@ int VFS_int_Select_Deregister(tThread *Thread, int MaxHandle, fd_set *Handles, i
                // Check for the flag
                if( !!*flag == !!wantedFlagValue ) {
                        numFlagged ++;
+                       LOG(" %i == want %i", !!*flag, !!wantedFlagValue);
+                       FD_SET(i, Handles);
                }
                else {
                        FD_CLR(i, Handles);
@@ -440,7 +446,6 @@ int VFS_int_Select_AddThread(tVFS_SelectList *List, tThread *Thread, int MaxAllo
 
 void VFS_int_Select_RemThread(tVFS_SelectList *List, tThread *Thread)
 {
-        int    i;
        tVFS_SelectListEnt      *block, *prev = NULL;
        
        ENTER("pList pThread", List, Thread);
@@ -453,7 +458,7 @@ void VFS_int_Select_RemThread(tVFS_SelectList *List, tThread *Thread)
        // Look for the thread
        do
        {
-               for( i = 0; i < NUM_THREADS_PER_ALLOC; i ++ )
+               for( int i = 0; i < NUM_THREADS_PER_ALLOC; i ++ )
                {
                        if( block->Threads[i] == Thread )
                        {