X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FKernel%2Fthreads.c;h=17cccca1e24ed752f65e992f62255016cae0ccbf;hb=e4342ad9de52043cb8f820643794dc44076f9bd9;hp=e22994bfc2c4c8dd02dadecb93afb137c742c67c;hpb=a3464cb30ecb189019b8bceb70aebdc74f5edded;p=tpg%2Facess2.git

diff --git a/KernelLand/Kernel/threads.c b/KernelLand/Kernel/threads.c
index e22994bf..17cccca1 100644
--- a/KernelLand/Kernel/threads.c
+++ b/KernelLand/Kernel/threads.c
@@ -73,6 +73,7 @@ tGID	Threads_GetGID(void);
  int	Threads_SetUID(Uint *Errno, tUID ID);
  int	Threads_SetGID(Uint *Errno, tUID ID);
 #endif
+void	Threads_int_DumpThread(tThread *thread);
 void	Threads_Dump(void);
 void	Threads_DumpActive(void);
 
@@ -210,7 +211,7 @@ int Threads_SetName(const char *NewName)
 	if( IsHeap(oldname) )	free( oldname );	
 	cur->ThreadName = strdup(NewName);
 
-	Log_Debug("Threads", "Thread renamed to '%s'", NewName);	
+//	Log_Debug("Threads", "Thread renamed to '%s'", NewName);	
 
 	return 0;
 }
@@ -343,9 +344,16 @@ tThread *Threads_CloneTCB(Uint Flags)
 		newproc->nThreads = 1;
 		// Reference all handles in the VFS
 		VFS_ReferenceUserHandles();
+
+		newproc->FirstThread = new;
+		new->ProcessNext = NULL;
 	}
 	else {
 		new->Process->nThreads ++;
+		new->Process = cur->Process;
+		// TODO: Locking
+		new->ProcessNext = new->Process->FirstThread;
+		new->Process->FirstThread = new;
 	}
 	
 	// Messages are not inherited
@@ -496,15 +504,13 @@ tThread *Threads_GetThread(Uint TID)
 	tThread *thread;
 	
 	// Search global list
-	for(thread = gAllThreads;
-		thread;
-		thread = thread->GlobalNext)
+	for( thread = gAllThreads; thread; thread = thread->GlobalNext )
 	{
 		if(thread->TID == TID)
 			return thread;
 	}
 
-	Log("Unable to find TID %i on main list\n", TID);
+	Log_Notice("Threads", "Unable to find TID %i on main list\n", TID);
 	
 	return NULL;
 }
@@ -1049,6 +1055,36 @@ char **Threads_GetCWD(void)
 }
 // ---
 
+void Threads_int_DumpThread(tThread *thread)
+{
+	Log(" %p %i (%i) - %s (CPU %i) - %i (%s)",
+		thread, thread->TID, thread->Process->PID, thread->ThreadName, thread->CurCPU,
+		thread->Status, casTHREAD_STAT[thread->Status]
+		);
+	switch(thread->Status)
+	{
+	case THREAD_STAT_MUTEXSLEEP:
+		Log("  Mutex Pointer: %p", thread->WaitPointer);
+		break;
+	case THREAD_STAT_SEMAPHORESLEEP:
+		Log("  Semaphore Pointer: %p", thread->WaitPointer);
+		Log("  Semaphore Name: %s:%s", 
+			((tSemaphore*)thread->WaitPointer)->ModName,
+			((tSemaphore*)thread->WaitPointer)->Name
+			);
+		break;
+	case THREAD_STAT_ZOMBIE:
+		Log("  Return Status: %i", thread->RetStatus);
+		break;
+	default:	break;
+	}
+	Log("  Priority %i, Quantum %i", thread->Priority, thread->Quantum);
+	Log("  KStack 0x%x", thread->KernelStack);
+	if( thread->bInstrTrace )
+		Log("  Tracing Enabled");
+	Proc_DumpThreadCPUState(thread);
+}
+
 /**
  * \fn void Threads_Dump(void)
  */
@@ -1071,16 +1107,10 @@ void Threads_DumpActive(void)
 	#endif
 		for(thread=list->Head;thread;thread=thread->Next)
 		{
-			Log(" %p %i (%i) - %s (CPU %i)",
-				thread, thread->TID, thread->Process->PID, thread->ThreadName, thread->CurCPU);
+			Threads_int_DumpThread(thread);
 			if(thread->Status != THREAD_STAT_ACTIVE)
 				Log("  ERROR State (%i) != THREAD_STAT_ACTIVE (%i)",
 					thread->Status, THREAD_STAT_ACTIVE);
-			Log("  Priority %i, Quantum %i", thread->Priority, thread->Quantum);
-			Log("  KStack 0x%x", thread->KernelStack);
-			if( thread->bInstrTrace )
-				Log("  Tracing Enabled");
-			Proc_DumpThreadCPUState(thread);
 		}
 	
 	#if SCHEDULER_TYPE == SCHED_RR_PRI
@@ -1102,31 +1132,7 @@ void Threads_Dump(void)
 	Log("All Threads:");
 	for(thread=gAllThreads;thread;thread=thread->GlobalNext)
 	{
-		Log(" %p %i (%i) - %s (CPU %i)",
-			thread, thread->TID, thread->Process->PID, thread->ThreadName, thread->CurCPU);
-		Log("  State %i (%s)", thread->Status, casTHREAD_STAT[thread->Status]);
-		switch(thread->Status)
-		{
-		case THREAD_STAT_MUTEXSLEEP:
-			Log("  Mutex Pointer: %p", thread->WaitPointer);
-			break;
-		case THREAD_STAT_SEMAPHORESLEEP:
-			Log("  Semaphore Pointer: %p", thread->WaitPointer);
-			Log("  Semaphore Name: %s:%s", 
-				((tSemaphore*)thread->WaitPointer)->ModName,
-				((tSemaphore*)thread->WaitPointer)->Name
-				);
-			break;
-		case THREAD_STAT_ZOMBIE:
-			Log("  Return Status: %i", thread->RetStatus);
-			break;
-		default:	break;
-		}
-		Log("  Priority %i, Quantum %i", thread->Priority, thread->Quantum);
-		Log("  KStack 0x%x", thread->KernelStack);
-		if( thread->bInstrTrace )
-			Log("  Tracing Enabled");
-		Proc_DumpThreadCPUState(thread);
+		Threads_int_DumpThread(thread);
 	}
 }