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
Usermode/ld-acess - Fixing Elf64 support (and incorrect Uint* sizes)
[tpg/acess2.git]
/
Kernel
/
threads.c
diff --git
a/Kernel/threads.c
b/Kernel/threads.c
index
f84ca7c
..
a81736b
100644
(file)
--- a/
Kernel/threads.c
+++ b/
Kernel/threads.c
@@
-904,14
+904,17
@@
void Threads_AddActive(tThread *Thread)
/**
* \brief Removes the current thread from the active queue
/**
* \brief Removes the current thread from the active queue
- * \warning This should ONLY be called with t
ask switches disable
d
+ * \warning This should ONLY be called with t
he lock hel
d
* \return Current thread pointer
*/
tThread *Threads_RemActive(void)
{
tThread *ret = Proc_GetCurThread();
* \return Current thread pointer
*/
tThread *Threads_RemActive(void)
{
tThread *ret = Proc_GetCurThread();
-
- SHORTLOCK( &glThreadListLock );
+
+ if( !IS_LOCKED(&glThreadListLock) ) {
+ Log_KernelPanic("Threads", "Threads_RemActive called without lock held");
+ return NULL;
+ }
// Delete from active queue
#if SCHEDULER_TYPE == SCHED_RR_PRI
// Delete from active queue
#if SCHEDULER_TYPE == SCHED_RR_PRI
@@
-938,8
+941,6
@@
tThread *Threads_RemActive(void)
GetCPUNum(), ret, ret->TID, ret->ThreadName, giFreeTickets);
#endif
GetCPUNum(), ret, ret->TID, ret->ThreadName, giFreeTickets);
#endif
- SHORTREL( &glThreadListLock );
-
return ret;
}
return ret;
}
@@
-1312,6
+1313,9
@@
tThread *Threads_GetNextToRun(int CPU, tThread *Last)
SHORTREL(&glThreadListLock);
return NULL;
}
SHORTREL(&glThreadListLock);
return NULL;
}
+ if( thread->Status != THREAD_STAT_ACTIVE ) {
+ LogF("Oops, Thread %i (%s) is not active\n", thread->TID, thread->ThreadName);
+ }
}
#elif SCHEDULER_TYPE == SCHED_RR_SIM
{
}
#elif SCHEDULER_TYPE == SCHED_RR_SIM
{
UCC
git Repository :: git.ucc.asn.au