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
More work on x86_64 build, error handling and IDT
[tpg/acess2.git]
/
Kernel
/
threads.c
diff --git
a/Kernel/threads.c
b/Kernel/threads.c
index
890f32d
..
8c51d9a
100644
(file)
--- a/
Kernel/threads.c
+++ b/
Kernel/threads.c
@@
-22,10
+22,11
@@
extern void ArchThreads_Init();
extern void Proc_Start();
extern tThread *Proc_GetCurThread();
extern int Proc_Clone(Uint *Err, Uint Flags);
extern void Proc_Start();
extern tThread *Proc_GetCurThread();
extern int Proc_Clone(Uint *Err, Uint Flags);
+extern void Proc_CallFaultHandler(tThread *Thread);
// === PROTOTYPES ===
void Threads_Init();
// === PROTOTYPES ===
void Threads_Init();
-
void
Threads_SetName(char *NewName);
+
int
Threads_SetName(char *NewName);
char *Threads_GetName(int ID);
void Threads_SetTickets(int Num);
tThread *Threads_CloneTCB(Uint *Err, Uint Flags);
char *Threads_GetName(int ID);
void Threads_SetTickets(int Num);
tThread *Threads_CloneTCB(Uint *Err, Uint Flags);
@@
-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;
@@
-118,13
+119,14
@@
void Threads_Init()
* \fn void Threads_SetName(char *NewName)
* \brief Sets the current thread's name
*/
* \fn void Threads_SetName(char *NewName)
* \brief Sets the current thread's name
*/
-
void
Threads_SetName(char *NewName)
+
int
Threads_SetName(char *NewName)
{
tThread *cur = Proc_GetCurThread();
if( IsHeap(cur->ThreadName) )
free( cur->ThreadName );
cur->ThreadName = malloc(strlen(NewName)+1);
strcpy(cur->ThreadName, NewName);
{
tThread *cur = Proc_GetCurThread();
if( IsHeap(cur->ThreadName) )
free( cur->ThreadName );
cur->ThreadName = malloc(strlen(NewName)+1);
strcpy(cur->ThreadName, NewName);
+ return 0;
}
/**
}
/**
@@
-149,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 );
}
/**
}
/**
@@
-200,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 ++ )
{
@@
-268,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)
@@
-403,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 );
@@
-441,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);
@@
-467,10
+466,10
@@
void Threads_Sleep()
tThread *cur = Proc_GetCurThread();
tThread *thread;
tThread *cur = Proc_GetCurThread();
tThread *thread;
-
Log("Proc_Sleep:
%i going to sleep", cur->TID);
+
//Log_Log("Threads", "
%i going to sleep", cur->TID);
// Acquire Spinlock
// 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 );
@@
-482,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;
}
@@
-504,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();
}
@@
-521,13
+520,16
@@
void Threads_Wake(tThread *Thread)
{
case THREAD_STAT_ACTIVE: break;
case THREAD_STAT_SLEEPING:
{
case THREAD_STAT_ACTIVE: break;
case THREAD_STAT_SLEEPING:
- LOCK( &giThreadListLock );
+ //Log_Log("Threads", "Waking %i (%p) from sleeping", Thread->TID, Thread);
+ LOCK( &glThreadListLock );
prev = Threads_int_GetPrev(&gSleepingThreads, Thread);
prev->Next = Thread->Next; // Remove from sleeping queue
Thread->Next = gActiveThreads; // Add to active queue
gActiveThreads = Thread;
prev = Threads_int_GetPrev(&gSleepingThreads, Thread);
prev->Next = Thread->Next; // Remove from sleeping queue
Thread->Next = gActiveThreads; // Add to active queue
gActiveThreads = Thread;
+ giNumActiveThreads ++;
+ giTotalTickets += Thread->NumTickets;
Thread->Status = THREAD_STAT_ACTIVE;
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");
@@
-541,90
+543,92
@@
void Threads_Wake(tThread *Thread)
}
}
}
}
+void Threads_WakeTID(tTID Thread)
+{
+ Threads_Wake( Threads_GetThread(Thread) );
+}
+
/**
* \fn void Threads_AddActive(tThread *Thread)
* \brief Adds a thread to the active queue
*/
void Threads_AddActive(tThread *Thread)
{
/**
* \fn void Threads_AddActive(tThread *Thread)
* \brief Adds a thread to the active queue
*/
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 ---
-
int
Threads_GetPID()
+
tPID
Threads_GetPID()
{
return Proc_GetCurThread()->TGID;
}
{
return Proc_GetCurThread()->TGID;
}
-
int
Threads_GetTID()
+
tTID
Threads_GetTID()
{
return Proc_GetCurThread()->TID;
}
tUID Threads_GetUID()
{
{
return Proc_GetCurThread()->TID;
}
tUID Threads_GetUID()
{
- tThread *t = Proc_GetCurThread();
- int ret = t->UID;
- Log("Threads_GetUID: TID %i, return %i", t->TID, ret);
- return ret;
+ return Proc_GetCurThread()->UID;
}
}
+tGID Threads_GetGID()
+{
+ return Proc_GetCurThread()->GID;
+}
+
int Threads_SetUID(Uint *Errno, tUID ID)
{
tThread *t = Proc_GetCurThread();
int Threads_SetUID(Uint *Errno, tUID ID)
{
tThread *t = Proc_GetCurThread();
@@
-637,10
+641,6
@@
int Threads_SetUID(Uint *Errno, tUID ID)
return 0;
}
return 0;
}
-tGID Threads_GetGID()
-{
- return Proc_GetCurThread()->GID;
-}
int Threads_SetGID(Uint *Errno, tGID ID)
{
tThread *t = Proc_GetCurThread();
int Threads_SetGID(Uint *Errno, tGID ID)
{
tThread *t = Proc_GetCurThread();
@@
-692,20
+692,18
@@
tThread *Threads_GetNextToRun(int CPU)
int ticket;
int number;
int ticket;
int number;
- if(giNumActiveThreads == 0) return NULL;
+ if(giNumActiveThreads == 0) {
+ return NULL;
+ }
// Special case: 1 thread
if(giNumActiveThreads == 1) {
return gActiveThreads;
}
// Special case: 1 thread
if(giNumActiveThreads == 1) {
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)
{
@@
-732,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