len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-14 10:37:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use API call instead of accessing a global variable for receiving the current thread.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25657 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Thomas Martitz 2010-04-16 22:01:59 +00:00
parent da018391e0
commit d9af87c40b
3 changed files with 12 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

23
firmware/kernel.c
View file

@ -57,8 +57,6 @@ volatile long current_tick SHAREDDATA_ATTR = 0;
/* List of tick tasks - final element always NULL for termination */ /* List of tick tasks - final element always NULL for termination */
void (*tick_funcs[MAX_NUM_TICK_TASKS+1])(void); void (*tick_funcs[MAX_NUM_TICK_TASKS+1])(void);
extern struct core_entry cores[NUM_CORES];
/* This array holds all queues that are initiated. It is used for broadcast. */ /* This array holds all queues that are initiated. It is used for broadcast. */
static struct static struct
{ {
@ -535,7 +533,7 @@ void queue_wait(struct event_queue *q, struct queue_event *ev)
#ifdef HAVE_PRIORITY_SCHEDULING #ifdef HAVE_PRIORITY_SCHEDULING
KERNEL_ASSERT(QUEUE_GET_THREAD(q) == NULL || KERNEL_ASSERT(QUEUE_GET_THREAD(q) == NULL ||
QUEUE_GET_THREAD(q) == cores[CURRENT_CORE].running, QUEUE_GET_THREAD(q) == thread_id_entry(THREAD_ID_CURRENT),
"queue_wait->wrong thread\n"); "queue_wait->wrong thread\n");
#endif #endif
@ -547,7 +545,7 @@ void queue_wait(struct event_queue *q, struct queue_event *ev)
if (q->read == q->write) if (q->read == q->write)
{ {
struct thread_entry *current = cores[CURRENT_CORE].running; struct thread_entry *current = thread_id_entry(THREAD_ID_CURRENT);
do do
{ {
@ -582,7 +580,7 @@ void queue_wait_w_tmo(struct event_queue *q, struct queue_event *ev, int ticks)
#ifdef HAVE_EXTENDED_MESSAGING_AND_NAME #ifdef HAVE_EXTENDED_MESSAGING_AND_NAME
KERNEL_ASSERT(QUEUE_GET_THREAD(q) == NULL || KERNEL_ASSERT(QUEUE_GET_THREAD(q) == NULL ||
QUEUE_GET_THREAD(q) == cores[CURRENT_CORE].running, QUEUE_GET_THREAD(q) == thread_id_entry(THREAD_ID_CURRENT),
"queue_wait_w_tmo->wrong thread\n"); "queue_wait_w_tmo->wrong thread\n");
#endif #endif
@ -594,7 +592,7 @@ void queue_wait_w_tmo(struct event_queue *q, struct queue_event *ev, int ticks)
if (q->read == q->write && ticks > 0) if (q->read == q->write && ticks > 0)
{ {
struct thread_entry *current = cores[CURRENT_CORE].running; struct thread_entry *current = thread_id_entry(THREAD_ID_CURRENT);
IF_COP( current->obj_cl = &q->cl; ) IF_COP( current->obj_cl = &q->cl; )
current->bqp = &q->queue; current->bqp = &q->queue;
@ -669,7 +667,7 @@ intptr_t queue_send(struct event_queue *q, long id, intptr_t data)
{ {
struct queue_sender_list *send = q->send; struct queue_sender_list *send = q->send;
struct thread_entry **spp = &send->senders[wr]; struct thread_entry **spp = &send->senders[wr];
struct thread_entry *current = cores[CURRENT_CORE].running; struct thread_entry *current = thread_id_entry(THREAD_ID_CURRENT);
if(UNLIKELY(*spp)) if(UNLIKELY(*spp))
{ {
@ -878,8 +876,7 @@ void mutex_init(struct mutex *m)
/* Gain ownership of a mutex object or block until it becomes free */ /* Gain ownership of a mutex object or block until it becomes free */
void mutex_lock(struct mutex *m) void mutex_lock(struct mutex *m)
{ {
const unsigned int core = CURRENT_CORE; struct thread_entry *current = thread_id_entry(THREAD_ID_CURRENT);
struct thread_entry *current = cores[core].running;
if(current == MUTEX_GET_THREAD(m)) if(current == MUTEX_GET_THREAD(m))
{ {
@ -918,10 +915,10 @@ void mutex_lock(struct mutex *m)
void mutex_unlock(struct mutex *m) void mutex_unlock(struct mutex *m)
{ {
/* unlocker not being the owner is an unlocking violation */ /* unlocker not being the owner is an unlocking violation */
KERNEL_ASSERT(MUTEX_GET_THREAD(m) == cores[CURRENT_CORE].running, KERNEL_ASSERT(MUTEX_GET_THREAD(m) == thread_id_entry(THREAD_ID_CURRENT),
"mutex_unlock->wrong thread (%s != %s)\n", "mutex_unlock->wrong thread (%s != %s)\n",
MUTEX_GET_THREAD(m)->name, MUTEX_GET_THREAD(m)->name,
cores[CURRENT_CORE].running->name); thread_id_entry(THREAD_ID_CURRENT)->name);
if(m->count > 0) if(m->count > 0)
{ {
@ -989,7 +986,7 @@ void semaphore_wait(struct semaphore *s)
} }
/* too many waits - block until dequeued... */ /* too many waits - block until dequeued... */
current = cores[CURRENT_CORE].running; current = thread_id_entry(THREAD_ID_CURRENT);
IF_COP( current->obj_cl = &s->cl; ) IF_COP( current->obj_cl = &s->cl; )
current->bqp = &s->queue; current->bqp = &s->queue;
@ -1051,7 +1048,7 @@ int wakeup_wait(struct wakeup *w, int timeout)
if(LIKELY(w->signalled == 0 && timeout != TIMEOUT_NOBLOCK)) if(LIKELY(w->signalled == 0 && timeout != TIMEOUT_NOBLOCK))
{ {
struct thread_entry * current = cores[CURRENT_CORE].running; struct thread_entry * current = thread_id_entry(THREAD_ID_CURRENT);
IF_COP( current->obj_cl = &w->cl; ) IF_COP( current->obj_cl = &w->cl; )
current->bqp = &w->queue; current->bqp = &w->queue;

2
firmware/thread.c
View file

@ -119,7 +119,7 @@
/* Cast to the the machine pointer size, whose size could be < 4 or > 32 /* Cast to the the machine pointer size, whose size could be < 4 or > 32
* (someday :). */ * (someday :). */
#define DEADBEEF ((uintptr_t)0xdeadbeefdeadbeefull) #define DEADBEEF ((uintptr_t)0xdeadbeefdeadbeefull)
struct core_entry cores[NUM_CORES] IBSS_ATTR; static struct core_entry cores[NUM_CORES] IBSS_ATTR;
struct thread_entry threads[MAXTHREADS] IBSS_ATTR; struct thread_entry threads[MAXTHREADS] IBSS_ATTR;
static const char main_thread_name[] = "main"; static const char main_thread_name[] = "main";

2
uisimulator/sdl/thread-sdl.c
View file

@ -50,7 +50,7 @@ static char __name[32];
({ fprintf(stderr, str); exit(-1); }) ({ fprintf(stderr, str); exit(-1); })
/* Thread/core entries as in rockbox core */ /* Thread/core entries as in rockbox core */
struct core_entry cores[NUM_CORES]; static struct core_entry cores[NUM_CORES];
struct thread_entry threads[MAXTHREADS]; struct thread_entry threads[MAXTHREADS];
/* Jump buffers for graceful exit - kernel threads don't stay neatly /* Jump buffers for graceful exit - kernel threads don't stay neatly
* in their start routines responding to messages so this is the only * in their start routines responding to messages so this is the only