X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FKernel%2Fvfs%2Fselect.c;h=b52414f07f3ce8375b5a8d701872187bdf51b675;hb=a1473d9066eb08a25c85784e6839a31abd6393fb;hp=412cb1aeddb70c517a63802bc5eda5f7067a12cb;hpb=a78ee34cfab02fc026412718119ce886ac50b24c;p=tpg%2Facess2.git

diff --git a/KernelLand/Kernel/vfs/select.c b/KernelLand/Kernel/vfs/select.c
index 412cb1ae..b52414f0 100644
--- a/KernelLand/Kernel/vfs/select.c
+++ b/KernelLand/Kernel/vfs/select.c
@@ -113,6 +113,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 +130,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 +141,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 +152,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;
 	}
@@ -306,8 +311,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 +355,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 +367,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 +447,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 +459,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 )
 			{