X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=Kernel%2Fvfs%2Fselect.c;h=a092b07ca60f1e9d1bc606d47ca12b9554caeb8d;hb=abe6c6cf7fac39102e20cd28687b24c67f4952f8;hp=c695bb6c2aa0e7cb2352a09daf6203c8b7a8f699;hpb=e42035c38b65d428672b128f9ae253f81b2ced96;p=tpg%2Facess2.git

diff --git a/Kernel/vfs/select.c b/Kernel/vfs/select.c
index c695bb6c..a092b07c 100644
--- a/Kernel/vfs/select.c
+++ b/Kernel/vfs/select.c
@@ -54,7 +54,7 @@ void	VFS_int_Select_SignalAll(tVFS_SelectList *List);
 // === GLOBALS ===
 
 // === FUNCTIONS ===
-int VFS_SelectNode(tVFS_Node *Node, enum eVFS_SelectTypes Type, tTime *Timeout)
+int VFS_SelectNode(tVFS_Node *Node, enum eVFS_SelectTypes Type, tTime *Timeout, const char *Name)
 {
 	tVFS_SelectThread	*thread_info;
 	tVFS_SelectList	**list;
@@ -68,9 +68,9 @@ int VFS_SelectNode(tVFS_Node *Node, enum eVFS_SelectTypes Type, tTime *Timeout)
 	}
 	
 	thread_info = malloc(sizeof(tVFS_SelectThread));
-	if(!thread_info)	return -1;
+	if(!thread_info)	LEAVE_RET('i', -1);
 	
-	Semaphore_Init(&thread_info->SleepHandle, 0, 0, "VFS_SelectNode()", "");
+	Semaphore_Init(&thread_info->SleepHandle, 0, 0, "VFS_SelectNode()", Name);
 	
 	LOG("list=%p, flag=%p, wanted=%i, maxAllowed=%i", list, flag, wanted, maxAllowed);
 	
@@ -112,9 +112,12 @@ int VFS_Select(int MaxHandle, fd_set *ReadHandles, fd_set *WriteHandles, fd_set
 	thread_info = malloc(sizeof(tVFS_SelectThread));
 	if(!thread_info)	return -1;
 	
-	Semaphore_Init(&thread_info->SleepHandle, 0, -1, "VFS_Select()", "");
+	ENTER("iMaxHandle pReadHandles pWriteHandles pErrHandles pTimeout bIsKernel",
+		MaxHandle, ReadHandles, WriteHandles, ErrHandles, Timeout, IsKernel);
+	
+	Semaphore_Init(&thread_info->SleepHandle, 0, 0, "VFS_Select()", "");
 	
-	// Notes: The idea is to make sure we onlt enter wait (on the semaphore)
+	// Notes: The idea is to make sure we only enter wait (on the semaphore)
 	// if we are going to be woken up (either by an event at a later time,
 	// or by an event that happened while or before we were registering).
 	// Hence, register must happen _before_ we check the state flag
@@ -126,6 +129,8 @@ int VFS_Select(int MaxHandle, fd_set *ReadHandles, fd_set *WriteHandles, fd_set
 	ret += VFS_int_Select_Register(thread_info, MaxHandle, WriteHandles, 1, IsKernel);
 	ret += VFS_int_Select_Register(thread_info, MaxHandle, ErrHandles, 2, IsKernel);
 	
+	LOG("Register ret = %i", ret);
+	
 	// If there were events waiting, de-register and return
 	if( ret )
 	{
@@ -133,6 +138,7 @@ int VFS_Select(int MaxHandle, fd_set *ReadHandles, fd_set *WriteHandles, fd_set
 		ret += VFS_int_Select_Deregister(thread_info, MaxHandle, WriteHandles, 1, IsKernel);
 		ret += VFS_int_Select_Deregister(thread_info, MaxHandle, ErrHandles, 2, IsKernel);
 		free(thread_info);
+		LEAVE('i', ret);
 		return ret;
 	}
 	
@@ -142,6 +148,7 @@ int VFS_Select(int MaxHandle, fd_set *ReadHandles, fd_set *WriteHandles, fd_set
 	if( !Timeout || *Timeout > 0 )
 	{
 		ret = Semaphore_Wait(&thread_info->SleepHandle, 1);
+		// TODO: Do something with ret?
 	}
 	
 	// Fill output (modify *Handles)
@@ -150,6 +157,7 @@ int VFS_Select(int MaxHandle, fd_set *ReadHandles, fd_set *WriteHandles, fd_set
 	ret += VFS_int_Select_Deregister(thread_info, MaxHandle, WriteHandles, 1, IsKernel);
 	ret += VFS_int_Select_Deregister(thread_info, MaxHandle, ErrHandles, 2, IsKernel);
 	free(thread_info);
+	LEAVE('i', ret);
 	return ret;
 }
 
@@ -229,7 +237,7 @@ int VFS_int_Select_Register(tVFS_SelectThread *Thread, int MaxHandle, fd_set *Ha
 	
 	if( !Handles )	return 0;
 	
-	ENTER("pThread iMaxHandle pHandles iType BIsKernel", Thread, MaxHandle, Handles, Type, IsKernel);
+	ENTER("pThread iMaxHandle pHandles iType iIsKernel", Thread, MaxHandle, Handles, Type, IsKernel);
 	
 	for( i = 0; i < MaxHandle; i ++ )
 	{
@@ -237,6 +245,7 @@ int VFS_int_Select_Register(tVFS_SelectThread *Thread, int MaxHandle, fd_set *Ha
 		
 		// Is the descriptor set
 		if( !FD_ISSET(i, Handles) )	continue;
+		LOG("FD #%i", i);
 		
 		handle = VFS_GetHandle( i | (IsKernel?VFS_KERNEL_FLAG:0) );
 		// Is the handle valid?
@@ -289,7 +298,7 @@ int VFS_int_Select_Deregister(tVFS_SelectThread *Thread, int MaxHandle, fd_set *
 	
 	if( !Handles )	return 0;
 	
-	ENTER("pThread iMaxHandle pHandles iType BIsKernel", Thread, MaxHandle, Handles, Type, IsKernel);
+	ENTER("pThread iMaxHandle pHandles iType iIsKernel", Thread, MaxHandle, Handles, Type, IsKernel);
 	
 	for( i = 0; i < MaxHandle; i ++ )
 	{
@@ -297,6 +306,7 @@ int VFS_int_Select_Deregister(tVFS_SelectThread *Thread, int MaxHandle, fd_set *
 		
 		// Is the descriptor set
 		if( !FD_ISSET(i, Handles) )	continue;
+		LOG("FD #%i", i);
 		
 		handle = VFS_GetHandle( i | (IsKernel?VFS_KERNEL_FLAG:0) );
 		// Is the handle valid?
@@ -462,6 +472,8 @@ void VFS_int_Select_SignalAll(tVFS_SelectList *List)
 	 int	i;
 	tVFS_SelectListEnt	*block;
 	
+	if( !List )	return ;
+	
 	ENTER("pList", List);
 	
 	// Lock to avoid concurrency issues
@@ -474,9 +486,9 @@ void VFS_int_Select_SignalAll(tVFS_SelectList *List)
 	{
 		for( i = 0; i < NUM_THREADS_PER_ALLOC; i ++ )
 		{
-			LOG("block->Threads[i] = %p", block->Threads[i]);
 			if( block->Threads[i]  )
 			{
+				LOG("block(%p)->Threads[%i] = %p", block, i, block->Threads[i]);
 				Semaphore_Signal( &block->Threads[i]->SleepHandle, 1 );
 			}
 		}