X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FKernel%2Fvfs%2Fselect.c;h=8bd0deba4dfe81a855a56c1b62e5d5c50e2889c7;hb=c34752b7ccc945a70a2d9b1e505aa4a4de43163b;hp=d2ef80824a1f3c7473d80537796cc382fc44cc8b;hpb=cfe6a9f2a126cc26ac74d5454e8378bd1193fcf8;p=tpg%2Facess2.git

diff --git a/KernelLand/Kernel/vfs/select.c b/KernelLand/Kernel/vfs/select.c
index d2ef8082..8bd0deba 100644
--- a/KernelLand/Kernel/vfs/select.c
+++ b/KernelLand/Kernel/vfs/select.c
@@ -16,6 +16,7 @@
 #include <semaphore.h>
 #include <threads.h>
 #include <events.h>
+#include <timers.h>
 
 // === CONSTANTS ===
 #define	NUM_THREADS_PER_ALLOC	4
@@ -83,16 +84,25 @@ int VFS_SelectNode(tVFS_Node *Node, int TypeFlags, tTime *Timeout, const char *N
 		}
 	}
 
-	// - Fast return for polling
-	if( Timeout && *Timeout == 0 )	return 0;
-
 	// Wait for things	
-	if( !Timeout || *Timeout > 0 )
+	if( !Timeout )
 	{
 		LOG("Semaphore_Wait()");
 		// TODO: Actual timeout
 		Threads_WaitEvents( THREAD_EVENT_VFS );
 	}
+	else if( *Timeout > 0 )
+	{
+		tTimer *t = Time_AllocateTimer(NULL, NULL);
+		// Clear timer event
+		Threads_ClearEvent( THREAD_EVENT_TIMER );
+		// TODO: Convert *Timeout?
+		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 );
+		Time_FreeTimer(t);
+	}
 	
 	// Get return value
 	ret = 0;
@@ -106,6 +116,9 @@ int VFS_SelectNode(tVFS_Node *Node, int TypeFlags, tTime *Timeout, const char *N
 		VFS_int_Select_RemThread(*list, thisthread);
 		ret = ret || *flag == wanted;
 	}
+
+	Threads_ClearEvent( THREAD_EVENT_VFS );
+	Threads_ClearEvent( THREAD_EVENT_TIMER );
 	
 	LEAVE('i', ret);
 	return ret;
@@ -116,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,
@@ -127,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);
@@ -136,29 +151,43 @@ 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;
 	}
-	
-	// TODO: Implement timeout
-	LOG("Timeout = %p", Timeout);
-	
-	// Wait (only if there is no timeout, or it is greater than zero
-	if( !Timeout || *Timeout > 0 )
+
+	// Wait for things	
+	if( !Timeout )
 	{
-		// TODO: Timeout
-		// TODO: Allow extra events to be waited upon
+		LOG("Semaphore_Wait()");
+		// TODO: Actual timeout
 		Threads_WaitEvents( THREAD_EVENT_VFS|ExtraEvents );
 	}
-	
+	else if( *Timeout > 0 )
+	{
+		tTimer *t = Time_AllocateTimer(NULL, NULL);
+		// Clear timer event
+		Threads_ClearEvent( THREAD_EVENT_TIMER );
+		// TODO: Convert *Timeout?
+		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|ExtraEvents );
+		Time_FreeTimer(t);
+	}
 	// Fill output (modify *Handles)
 	// - Also, de-register
 	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);
+	
+	Threads_ClearEvent( THREAD_EVENT_VFS );
+	Threads_ClearEvent( THREAD_EVENT_TIMER );
+	
 	LEAVE('i', ret);
 	return ret;
 }
@@ -281,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);
@@ -323,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);
@@ -337,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);
@@ -377,6 +408,7 @@ int VFS_int_Select_AddThread(tVFS_SelectList *List, tThread *Thread, int MaxAllo
 			}
 			count ++;
 			if( MaxAllowed && count >= MaxAllowed ) {
+				Mutex_Release(&List->Lock);
 				LEAVE('i', 1);
 				return 1;
 			}