X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fthreads.c;h=b48383085daf8d2225dfbbca9107c986da48745b;hb=f3d0d7fcf0496a63625c92e5ab95471e202e958e;hp=33b85c6d32a3740ef91128bb0afdfbf22363590f;hpb=b212c4457a23853b8abad73feddc64b483c022e2;p=tpg%2Facess2.git

diff --git a/Kernel/threads.c b/Kernel/threads.c
index 33b85c6d..b4838308 100644
--- a/Kernel/threads.c
+++ b/Kernel/threads.c
@@ -33,6 +33,7 @@ const enum eConfigTypes	cCONFIG_TYPES[] = {
 // === IMPORTS ===
 extern void	ArchThreads_Init(void);
 extern void	Proc_CallFaultHandler(tThread *Thread);
+extern void	Proc_DumpThreadCPUState(tThread *Thread);
 extern int	GetCPUNum(void);
 
 // === PROTOTYPES ===
@@ -81,11 +82,11 @@ void	Mutex_Release(tMutex *Mutex);
 // -- Core Thread --
 // Only used for the core kernel
 tThread	gThreadZero = {
-	Status: THREAD_STAT_ACTIVE,	// Status
-	ThreadName:	(char*)"ThreadZero",	// Name
-	Quantum: DEFAULT_QUANTUM,	// Default Quantum
-	Remaining:	DEFAULT_QUANTUM,	// Current Quantum
-	Priority:	DEFAULT_PRIORITY	// Number of tickets
+	.Status 	= THREAD_STAT_ACTIVE,	// Status
+	.ThreadName	= (char*)"ThreadZero",	// Name
+	.Quantum	= DEFAULT_QUANTUM,	// Default Quantum
+	.Remaining	= DEFAULT_QUANTUM,	// Current Quantum
+	.Priority	= DEFAULT_PRIORITY	// Number of tickets
 	};
 // -- Processes --
 // --- Locks ---
@@ -782,11 +783,12 @@ void Threads_AddActive(tThread *Thread)
 		tThread	*cur = Proc_GetCurThread();
 		Warning("WTF, CPU%i %p (%i %s) is adding %p (%i %s) when it is active",
 			GetCPUNum(), cur, cur->TID, cur->ThreadName, Thread, Thread->TID, Thread->ThreadName);
+		SHORTREL( &glThreadListLock );
+		return ;
 	}
 	
 	// Set state
 	Thread->Status = THREAD_STAT_ACTIVE;
-	Thread->CurCPU = -1;
 	// Add to active list
 	#if SCHEDULER_TYPE == SCHED_RR_PRI
 	Thread->Next = gaActiveThreads[Thread->Priority];
@@ -800,11 +802,22 @@ void Threads_AddActive(tThread *Thread)
 	giNumActiveThreads ++;
 	
 	#if SCHEDULER_TYPE == SCHED_LOTTERY
-	giFreeTickets += caiTICKET_COUNTS[ Thread->Priority ];
-	# if DEBUG_TRACE_TICKETS
-	Log("Threads_AddActive: CPU%i %p %i (%s) added, new giFreeTickets = %i",
-		GetCPUNum(), Thread, Thread->TID, Thread->ThreadName, giFreeTickets);
-	# endif
+	{
+		 int	delta;
+		// Only change the ticket count if the thread is un-scheduled
+		if(Thread->CurCPU != -1)
+			delta = 0;
+		else
+			delta = caiTICKET_COUNTS[ Thread->Priority ];
+		
+		giFreeTickets += delta;
+		# if DEBUG_TRACE_TICKETS
+		Log("CPU%i %p (%i %s) added, new giFreeTickets = %i [+%i]",
+			GetCPUNum(), Thread, Thread->TID, Thread->ThreadName,
+			giFreeTickets, delta
+			);
+		# endif
+	}
 	#endif
 	
 	SHORTREL( &glThreadListLock );
@@ -834,13 +847,12 @@ tThread *Threads_RemActive(void)
 	
 	ret->Next = NULL;
 	ret->Remaining = 0;
-	ret->CurCPU = -1;
 	
 	giNumActiveThreads --;
 	// no need to decrement tickets, scheduler did it for us
 	
 	#if SCHEDULER_TYPE == SCHED_LOTTERY && DEBUG_TRACE_TICKETS
-	Log("Threads_RemActive: CPU%i %p %i (%s) removed, giFreeTickets = %i",
+	Log("CPU%i %p (%i %s) removed, giFreeTickets = %i [nc]",
 		GetCPUNum(), ret, ret->TID, ret->ThreadName, giFreeTickets);
 	#endif
 	
@@ -975,6 +987,7 @@ void Threads_DumpActive(void)
 				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);
+			Proc_DumpThreadCPUState(thread);
 		}
 	
 	#if SCHEDULER_TYPE == SCHED_RR_PRI
@@ -1096,14 +1109,15 @@ tThread *Threads_GetNextToRun(int CPU, tThread *Last)
 			#if SCHEDULER_TYPE == SCHED_LOTTERY
 			giFreeTickets += caiTICKET_COUNTS[ Last->Priority ];
 			# if DEBUG_TRACE_TICKETS
-			LogF(" CPU %i released %p (%i %s) into the pool (%i tickets in pool)\n",
-				CPU, Last, Last->TID, Last->ThreadName, giFreeTickets);
+			LogF("Log: CPU%i released %p (%i %s) into the pool (%i [+%i] tickets in pool)\n",
+				CPU, Last, Last->TID, Last->ThreadName, giFreeTickets,
+				caiTICKET_COUNTS[ Last->Priority ]);
 			# endif
 			#endif
 		}
 		#if SCHEDULER_TYPE == SCHED_LOTTERY && DEBUG_TRACE_TICKETS
 		else
-			LogF(" CPU %i released %p (%i %s)->Status = %i (Released)\n",
+			LogF("Log: CPU%i released %p (%i %s)->Status = %i (Released)\n",
 				CPU, Last, Last->TID, Last->ThreadName, Last->Status);
 		#endif
 		Last->CurCPU = -1;
@@ -1162,12 +1176,13 @@ tThread *Threads_GetNextToRun(int CPU, tThread *Last)
 			Panic("Bookeeping Failed - giFreeTickets(%i) > true count (%i)",
 				giFreeTickets, number);
 		}
-		# if DEBUG_TRACE_TICKETS
-		LogF(" CPU%i giFreeTickets = %i, running %p (%i %s CPU=%i)\n",
-			CPU, giFreeTickets, thread, thread->TID, thread->ThreadName, thread->CurCPU);
-		# endif
 		
 		giFreeTickets -= caiTICKET_COUNTS[ thread->Priority ];
+		# if DEBUG_TRACE_TICKETS
+		LogF("Log: CPU%i allocated %p (%i %s), (%i [-%i] tickets in pool), \n",
+			CPU, thread, thread->TID, thread->ThreadName,
+			giFreeTickets, caiTICKET_COUNTS[ thread->Priority ]);
+		# endif
 	}
 	
 	// ---