git.ucc.asn.au
/
tpg
/
acess2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Division bug hidden, now only shows when 64-bit division is needed
[tpg/acess2.git]
/
Kernel
/
threads.c
diff --git
a/Kernel/threads.c
b/Kernel/threads.c
index
96a38da
..
ba0f430
100644
(file)
--- a/
Kernel/threads.c
+++ b/
Kernel/threads.c
@@
-18,13
+18,14
@@
const enum eConfigTypes cCONFIG_TYPES[] = {
};
// === IMPORTS ===
};
// === IMPORTS ===
-extern void ArchThreads_Init();
-extern void Proc_Start();
-extern tThread *Proc_GetCurThread();
+extern void ArchThreads_Init(
void
);
+extern void Proc_Start(
void
);
+extern tThread *Proc_GetCurThread(
void
);
extern int Proc_Clone(Uint *Err, Uint Flags);
extern int Proc_Clone(Uint *Err, Uint Flags);
+extern void Proc_CallFaultHandler(tThread *Thread);
// === PROTOTYPES ===
// === PROTOTYPES ===
-void Threads_Init();
+void Threads_Init(
void
);
int Threads_SetName(char *NewName);
char *Threads_GetName(int ID);
void Threads_SetTickets(int Num);
int Threads_SetName(char *NewName);
char *Threads_GetName(int ID);
void Threads_SetTickets(int Num);
@@
-35,17
+36,17
@@
void Threads_AddToDelete(tThread *Thread);
tThread *Threads_int_GetPrev(tThread **List, tThread *Thread);
void Threads_Exit(int TID, int Status);
void Threads_Kill(tThread *Thread, int Status);
tThread *Threads_int_GetPrev(tThread **List, tThread *Thread);
void Threads_Exit(int TID, int Status);
void Threads_Kill(tThread *Thread, int Status);
-void Threads_Yield();
-void Threads_Sleep();
+void Threads_Yield(
void
);
+void Threads_Sleep(
void
);
void Threads_Wake(tThread *Thread);
void Threads_AddActive(tThread *Thread);
void Threads_Wake(tThread *Thread);
void Threads_AddActive(tThread *Thread);
- int Threads_GetPID();
- int Threads_GetTID();
-tUID Threads_GetUID();
+ int Threads_GetPID(
void
);
+ int Threads_GetTID(
void
);
+tUID Threads_GetUID(
void
);
int Threads_SetUID(Uint *Errno, tUID ID);
int Threads_SetUID(Uint *Errno, tUID ID);
-tGID Threads_GetGID();
+tGID Threads_GetGID(
void
);
int Threads_SetGID(Uint *Errno, tUID ID);
int Threads_SetGID(Uint *Errno, tUID ID);
-void Threads_Dump();
+void Threads_Dump(
void
);
// === GLOBALS ===
// -- Core Thread --
// === GLOBALS ===
// -- Core Thread --
@@
-62,7
+63,7
@@
tThread gThreadZero = {
{0}, // Saved State
{0}, // VM State
{0}, // Saved State
{0}, // VM State
- 0,
{0}, {0}, // Signal State
+ 0,
0, // Current Fault, Fault Handler
NULL, NULL, // Messages, Last Message
DEFAULT_QUANTUM, DEFAULT_QUANTUM, // Quantum, Remaining
NULL, NULL, // Messages, Last Message
DEFAULT_QUANTUM, DEFAULT_QUANTUM, // Quantum, Remaining
@@
-71,7
+72,7
@@
tThread gThreadZero = {
};
// -- Processes --
// --- Locks ---
};
// -- Processes --
// --- Locks ---
-
volatile int gi
ThreadListLock = 0; ///\note NEVER use a heap function while locked
+
tSpinlock gl
ThreadListLock = 0; ///\note NEVER use a heap function while locked
// --- Current State ---
volatile int giNumActiveThreads = 0;
volatile int giTotalTickets = 0;
// --- Current State ---
volatile int giNumActiveThreads = 0;
volatile int giTotalTickets = 0;
@@
-84,10
+85,10
@@
tThread *gDeleteThreads = NULL; // Threads to delete
// === CODE ===
/**
// === CODE ===
/**
- * \fn void Threads_Init()
+ * \fn void Threads_Init(
void
)
* \brief Initialse the thread list
*/
* \brief Initialse the thread list
*/
-void Threads_Init()
+void Threads_Init(
void
)
{
ArchThreads_Init();
{
ArchThreads_Init();
@@
-150,12
+151,12
@@
void Threads_SetTickets(int Num)
if(Num < 0) return;
if(Num > MAX_TICKETS) Num = MAX_TICKETS;
if(Num < 0) return;
if(Num > MAX_TICKETS) Num = MAX_TICKETS;
- LOCK( &g
i
ThreadListLock );
+ LOCK( &g
l
ThreadListLock );
giTotalTickets -= cur->NumTickets;
cur->NumTickets = Num;
giTotalTickets += Num;
//LOG("giTotalTickets = %i", giTotalTickets);
giTotalTickets -= cur->NumTickets;
cur->NumTickets = Num;
giTotalTickets += Num;
//LOG("giTotalTickets = %i", giTotalTickets);
- RELEASE( &g
i
ThreadListLock );
+ RELEASE( &g
l
ThreadListLock );
}
/**
}
/**
@@
-172,6
+173,7
@@
tThread *Threads_CloneTCB(Uint *Err, Uint Flags)
*Err = -ENOMEM;
return NULL;
}
*Err = -ENOMEM;
return NULL;
}
+ memcpy(new, cur, sizeof(tThread));
new->Next = NULL;
new->IsLocked = 0;
new->Next = NULL;
new->IsLocked = 0;
@@
-183,8
+185,7
@@
tThread *Threads_CloneTCB(Uint *Err, Uint Flags)
new->PTID = cur->TID;
// Clone Name
new->PTID = cur->TID;
// Clone Name
- new->ThreadName = malloc(strlen(cur->ThreadName)+1);
- strcpy(new->ThreadName, cur->ThreadName);
+ new->ThreadName = strdup(cur->ThreadName);
// Set Thread Group ID (PID)
if(Flags & CLONE_VM)
// Set Thread Group ID (PID)
if(Flags & CLONE_VM)
@@
-201,12
+202,8
@@
tThread *Threads_CloneTCB(Uint *Err, Uint Flags)
new->NumTickets = cur->NumTickets;
// Set Signal Handlers
new->NumTickets = cur->NumTickets;
// Set Signal Handlers
- new->CurSignal = 0;
- if(Flags & CLONE_VM)
- memset(new->SignalHandlers, 0, sizeof(new->SignalHandlers));
- else
- memcpy(new->SignalHandlers, cur->SignalHandlers, sizeof(new->SignalHandlers));
- memset(&new->SignalState, 0, sizeof(tTaskState));
+ new->CurFaultNum = 0;
+ new->FaultHandler = cur->FaultHandler;
for( i = 0; i < NUM_CFG_ENTRIES; i ++ )
{
for( i = 0; i < NUM_CFG_ENTRIES; i ++ )
{
@@
-269,10
+266,11
@@
int Threads_WaitTID(int TID, int *status)
int initStatus = t->Status;
int ret;
int initStatus = t->Status;
int ret;
- if(initStatus != THREAD_STAT_ZOMBIE)
+ if(initStatus != THREAD_STAT_ZOMBIE)
{
while(t->Status == initStatus) {
Threads_Yield();
}
while(t->Status == initStatus) {
Threads_Yield();
}
+ }
ret = t->RetStatus;
switch(t->Status)
ret = t->RetStatus;
switch(t->Status)
@@
-404,7
+402,7
@@
void Threads_Kill(tThread *Thread, int Status)
LOCK( &Thread->IsLocked );
// Lock thread list
LOCK( &Thread->IsLocked );
// Lock thread list
- LOCK( &g
i
ThreadListLock );
+ LOCK( &g
l
ThreadListLock );
// Get previous thread on list
prev = Threads_int_GetPrev( &gActiveThreads, Thread );
// Get previous thread on list
prev = Threads_int_GetPrev( &gActiveThreads, Thread );
@@
-442,7
+440,7
@@
void Threads_Kill(tThread *Thread, int Status)
// Release spinlocks
RELEASE( &Thread->IsLocked ); // Released first so that it IS released
// Release spinlocks
RELEASE( &Thread->IsLocked ); // Released first so that it IS released
- RELEASE( &g
i
ThreadListLock );
+ RELEASE( &g
l
ThreadListLock );
//Log("Thread %i went *hurk*", Thread->TID);
//Log("Thread %i went *hurk*", Thread->TID);
@@
-450,20
+448,20
@@
void Threads_Kill(tThread *Thread, int Status)
}
/**
}
/**
- * \fn void Threads_Yield()
+ * \fn void Threads_Yield(
void
)
* \brief Yield remainder of timeslice
*/
* \brief Yield remainder of timeslice
*/
-void Threads_Yield()
+void Threads_Yield(
void
)
{
Proc_GetCurThread()->Remaining = 0;
HALT();
}
/**
{
Proc_GetCurThread()->Remaining = 0;
HALT();
}
/**
- * \fn void Threads_Sleep()
+ * \fn void Threads_Sleep(
void
)
* \brief Take the current process off the run queue
*/
* \brief Take the current process off the run queue
*/
-void Threads_Sleep()
+void Threads_Sleep(
void
)
{
tThread *cur = Proc_GetCurThread();
tThread *thread;
{
tThread *cur = Proc_GetCurThread();
tThread *thread;
@@
-471,7
+469,7
@@
void Threads_Sleep()
//Log_Log("Threads", "%i going to sleep", cur->TID);
// Acquire Spinlock
//Log_Log("Threads", "%i going to sleep", cur->TID);
// Acquire Spinlock
- LOCK( &g
i
ThreadListLock );
+ LOCK( &g
l
ThreadListLock );
// Get thread before current thread
thread = Threads_int_GetPrev( &gActiveThreads, cur );
// Get thread before current thread
thread = Threads_int_GetPrev( &gActiveThreads, cur );
@@
-483,7
+481,7
@@
void Threads_Sleep()
// Don't sleep if there is a message waiting
if( cur->Messages ) {
// Don't sleep if there is a message waiting
if( cur->Messages ) {
- RELEASE( &g
i
ThreadListLock );
+ RELEASE( &g
l
ThreadListLock );
return;
}
return;
}
@@
-505,7
+503,7
@@
void Threads_Sleep()
cur->Status = THREAD_STAT_SLEEPING;
// Release Spinlock
cur->Status = THREAD_STAT_SLEEPING;
// Release Spinlock
- RELEASE( &g
i
ThreadListLock );
+ RELEASE( &g
l
ThreadListLock );
while(cur->Status != THREAD_STAT_ACTIVE) HALT();
}
while(cur->Status != THREAD_STAT_ACTIVE) HALT();
}
@@
-523,7
+521,7
@@
void Threads_Wake(tThread *Thread)
case THREAD_STAT_ACTIVE: break;
case THREAD_STAT_SLEEPING:
//Log_Log("Threads", "Waking %i (%p) from sleeping", Thread->TID, Thread);
case THREAD_STAT_ACTIVE: break;
case THREAD_STAT_SLEEPING:
//Log_Log("Threads", "Waking %i (%p) from sleeping", Thread->TID, Thread);
- LOCK( &g
i
ThreadListLock );
+ LOCK( &g
l
ThreadListLock );
prev = Threads_int_GetPrev(&gSleepingThreads, Thread);
prev->Next = Thread->Next; // Remove from sleeping queue
Thread->Next = gActiveThreads; // Add to active queue
prev = Threads_int_GetPrev(&gSleepingThreads, Thread);
prev->Next = Thread->Next; // Remove from sleeping queue
Thread->Next = gActiveThreads; // Add to active queue
@@
-531,7
+529,7
@@
void Threads_Wake(tThread *Thread)
giNumActiveThreads ++;
giTotalTickets += Thread->NumTickets;
Thread->Status = THREAD_STAT_ACTIVE;
giNumActiveThreads ++;
giTotalTickets += Thread->NumTickets;
Thread->Status = THREAD_STAT_ACTIVE;
- RELEASE( &g
i
ThreadListLock );
+ RELEASE( &g
l
ThreadListLock );
break;
case THREAD_STAT_WAITING:
Warning("Thread_Wake - Waiting threads are not currently supported");
break;
case THREAD_STAT_WAITING:
Warning("Thread_Wake - Waiting threads are not currently supported");
@@
-556,82
+554,77
@@
void Threads_WakeTID(tTID Thread)
*/
void Threads_AddActive(tThread *Thread)
{
*/
void Threads_AddActive(tThread *Thread)
{
- LOCK( &g
i
ThreadListLock );
+ LOCK( &g
l
ThreadListLock );
Thread->Next = gActiveThreads;
gActiveThreads = Thread;
giNumActiveThreads ++;
giTotalTickets += Thread->NumTickets;
//Log("Threads_AddActive: giNumActiveThreads = %i, giTotalTickets = %i",
// giNumActiveThreads, giTotalTickets);
Thread->Next = gActiveThreads;
gActiveThreads = Thread;
giNumActiveThreads ++;
giTotalTickets += Thread->NumTickets;
//Log("Threads_AddActive: giNumActiveThreads = %i, giTotalTickets = %i",
// giNumActiveThreads, giTotalTickets);
- RELEASE( &g
i
ThreadListLock );
+ RELEASE( &g
l
ThreadListLock );
}
}
-#if 0
/**
/**
- * \fn void Threads_Set
SignalHandler(int Num, void *
Handler)
+ * \fn void Threads_Set
FaultHandler(Uint
Handler)
* \brief Sets the signal handler for a signal
*/
* \brief Sets the signal handler for a signal
*/
-void Threads_SetSignalHandler(int Num, void *Handler)
-{
- if(Num < 0 || Num >= NSIG) return;
-
- gCurrentThread->SignalHandlers[Num] = Handler;
+void Threads_SetFaultHandler(Uint Handler)
+{
+ Log_Log("Threads", "Threads_SetFaultHandler: Handler = %p", Handler);
+ Proc_GetCurThread()->FaultHandler = Handler;
}
/**
}
/**
- * \fn void Threads_
SendSignal(int TID,
int Num)
- * \brief
Send a signal to a thread
+ * \fn void Threads_
Fault(
int Num)
+ * \brief
Calls a fault handler
*/
*/
-void Threads_
SendSignal(int TID,
int Num)
+void Threads_
Fault(
int Num)
{
{
- tThread *thread = Proc_GetThread(TID);
- void *handler;
+ tThread *thread = Proc_GetCurThread();
+
+ Log_Log("Threads", "Threads_Fault: thread = %p", thread);
if(!thread) return ;
if(!thread) return ;
-
handler = thread->SignalHandlers[Num]
;
+
Log_Log("Threads", "Threads_Fault: thread->FaultHandler = %p", thread->FaultHandler)
;
- // Panic?
- if(handler == SIG_ERR) {
- Proc_Kill(TID);
+ switch(thread->FaultHandler)
+ {
+ case 0: // Panic?
+ Threads_Kill(thread, -1);
+ HALT();
return ;
return ;
- }
- // Dump Core?
- if(handler == -2) {
- Proc_Kill(TID);
+ case 1: // Dump Core?
+ Threads_Kill(thread, -1);
+ HALT();
return ;
}
return ;
}
- // Ignore?
- if(handler == -2) return;
-
- // Check the type and handle if the thread is already in a signal
- if(thread->CurSignal != 0) {
- if(Num < _SIGTYPE_FATAL)
- Proc_Kill(TID);
- } else {
- while(thread->CurSignal != 0)
- Proc_Yield();
- }
+
+ // Double Fault? Oh, F**k
+ if(thread->CurFaultNum != 0) {
+ Threads_Kill(thread, -1); // For now, just kill
+ HALT();
}
}
- //TODO:
+ thread->CurFaultNum = Num;
+
+ Proc_CallFaultHandler(thread);
}
}
-#endif
// --- Process Structure Access Functions ---
// --- Process Structure Access Functions ---
-tPID Threads_GetPID()
+tPID Threads_GetPID(
void
)
{
return Proc_GetCurThread()->TGID;
}
{
return Proc_GetCurThread()->TGID;
}
-tTID Threads_GetTID()
+tTID Threads_GetTID(
void
)
{
return Proc_GetCurThread()->TID;
}
{
return Proc_GetCurThread()->TID;
}
-tUID Threads_GetUID()
+tUID Threads_GetUID(
void
)
{
return Proc_GetCurThread()->UID;
}
{
return Proc_GetCurThread()->UID;
}
-tGID Threads_GetGID()
+tGID Threads_GetGID(
void
)
{
return Proc_GetCurThread()->GID;
}
{
return Proc_GetCurThread()->GID;
}
@@
-661,10
+654,10
@@
int Threads_SetGID(Uint *Errno, tGID ID)
}
/**
}
/**
- * \fn void Threads_Dump()
+ * \fn void Threads_Dump(
void
)
* \brief Dums a list of currently running threads
*/
* \brief Dums a list of currently running threads
*/
-void Threads_Dump()
+void Threads_Dump(
void
)
{
tThread *thread;
tThread *cur = Proc_GetCurThread();
{
tThread *thread;
tThread *cur = Proc_GetCurThread();
@@
-700,24
+693,17
@@
tThread *Threads_GetNextToRun(int CPU)
int number;
if(giNumActiveThreads == 0) {
int number;
if(giNumActiveThreads == 0) {
- //Log_Debug("Threads", "CPU%i has no threads to run", CPU);
return NULL;
}
// Special case: 1 thread
if(giNumActiveThreads == 1) {
return NULL;
}
// Special case: 1 thread
if(giNumActiveThreads == 1) {
- //Log_Debug("Threads", "CPU%i has only one thread %i %s",
- // CPU, gActiveThreads->TID, gActiveThreads->ThreadName);
return gActiveThreads;
}
return gActiveThreads;
}
- //Log(" Threads_GetNextToRun: giNumActiveThreads=%i,giTotalTickets=%i",
- // giNumActiveThreads, giTotalTickets);
// Get the ticket number
ticket = number = rand() % giTotalTickets;
// Get the ticket number
ticket = number = rand() % giTotalTickets;
- //Log(" Threads_GetNextToRun: ticket = %i", ticket);
-
// Find the next thread
for(thread=gActiveThreads;thread;thread=thread->Next)
{
// Find the next thread
for(thread=gActiveThreads;thread;thread=thread->Next)
{
@@
-735,9
+721,6
@@
tThread *Threads_GetNextToRun(int CPU)
giTotalTickets, number);
}
giTotalTickets, number);
}
- //Log_Debug("Threads", "Switching CPU%i to %p (%s)",
- // CPU, thread, thread->ThreadName);
-
return thread;
}
return thread;
}
@@
-747,9
+730,9
@@
tThread *Threads_GetNextToRun(int CPU)
*/
void Threads_SegFault(tVAddr Addr)
{
*/
void Threads_SegFault(tVAddr Addr)
{
- //Threads_SendSignal( Proc_GetCurThread()->TID, SIGSEGV );
Warning("Thread #%i committed a segfault at address %p", Proc_GetCurThread()->TID, Addr);
Warning("Thread #%i committed a segfault at address %p", Proc_GetCurThread()->TID, Addr);
- Threads_Exit( 0, -1 );
+ Threads_Fault( 1 );
+ //Threads_Exit( 0, -1 );
}
// === EXPORTS ===
}
// === EXPORTS ===
UCC
git Repository :: git.ucc.asn.au