X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=KernelLand%2FKernel%2Fvfs%2Fselect.c;h=412cb1aeddb70c517a63802bc5eda5f7067a12cb;hb=f19a9d7e00271ffbba6e827da3b553b900acc33c;hp=439afc022fbcae21b1fc5390873ff6ae09a06129;hpb=51ab5f489bc356940c95cc936fd0508e8f07ea97;p=tpg%2Facess2.git

diff --git a/KernelLand/Kernel/vfs/select.c b/KernelLand/Kernel/vfs/select.c
index 439afc02..412cb1ae 100644
--- a/KernelLand/Kernel/vfs/select.c
+++ b/KernelLand/Kernel/vfs/select.c
@@ -16,13 +16,11 @@
 #include <semaphore.h>
 #include <threads.h>
 #include <events.h>
+#include <timers.h>
 
 // === CONSTANTS ===
 #define	NUM_THREADS_PER_ALLOC	4
 
-// === IMPORTS ===
-extern tThread	*Proc_GetCurThread(void);
-
 // === TYPES ===
 typedef struct sVFS_SelectListEnt	tVFS_SelectListEnt;
 
@@ -86,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;
@@ -109,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;
@@ -145,23 +155,35 @@ int VFS_Select(int MaxHandle, fd_set *ReadHandles, fd_set *WriteHandles, fd_set
 		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;
 }
@@ -380,6 +402,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;
 			}