lby/lk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[kernel] remove current_thread global, add get|set_current_thread() accessor

Browse Source 
-Up to the architecture to implement the getter|setter
This commit is contained in:
Travis Geiselbrecht
2014-05-03 23:57:15 -07:00
parent a69f397e06
commit 94920d35d1
5 changed files with 56 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/debug.c
View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2008-2009 Travis Geiselbrecht
* Copyright (c) 2008-2014 Travis Geiselbrecht
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files
@@ -93,7 +93,7 @@ static enum handler_return threadload(struct timer *t, lk_time_t now, void *arg)
static lk_bigtime_t last_idle_time;
lk_bigtime_t idle_time = thread_stats.idle_time;
if (current_thread == idle_thread) {
if (get_current_thread()->priority == IDLE_PRIORITY) {
idle_time += current_time_hires() - thread_stats.last_idle_timestamp;
}
lk_bigtime_t delta_time = idle_time - last_idle_time;

16
kernel/mutex.c
View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2008-2013 Travis Geiselbrecht
* Copyright (c) 2008-2014 Travis Geiselbrecht
* Copyright (c) 2012-2012 Shantanu Gupta
*
* Permission is hereby granted, free of charge, to any person obtaining
@@ -55,9 +55,9 @@ void mutex_destroy(mutex_t *m)
DEBUG_ASSERT(m->magic == MUTEX_MAGIC);
#if LK_DEBUGLEVEL > 0
if (unlikely(m->holder != 0 && current_thread != m->holder))
if (unlikely(m->holder != 0 && get_current_thread() != m->holder))
panic("mutex_destroy: thread %p (%s) tried to release mutex %p it doesn't own. owned by %p (%s)\n",
current_thread, current_thread->name, m, m->holder, m->holder->name);
get_current_thread(), get_current_thread()->name, m, m->holder, m->holder->name);
#endif
enter_critical_section();
@@ -82,9 +82,9 @@ status_t mutex_acquire_timeout(mutex_t *m, lk_time_t timeout)
DEBUG_ASSERT(m->magic == MUTEX_MAGIC);
#if LK_DEBUGLEVEL > 0
if (unlikely(current_thread == m->holder))
if (unlikely(get_current_thread() == m->holder))
panic("mutex_acquire_timeout: thread %p (%s) tried to acquire mutex %p it already owns.\n",
current_thread, current_thread->name, m);
get_current_thread(), get_current_thread()->name, m);
#endif
enter_critical_section();
@@ -109,7 +109,7 @@ status_t mutex_acquire_timeout(mutex_t *m, lk_time_t timeout)
}
}
m->holder = current_thread;
m->holder = get_current_thread();
err:
exit_critical_section();
@@ -124,9 +124,9 @@ status_t mutex_release(mutex_t *m)
DEBUG_ASSERT(m->magic == MUTEX_MAGIC);
#if LK_DEBUGLEVEL > 0
if (unlikely(current_thread != m->holder)) {
if (unlikely(get_current_thread() != m->holder)) {
panic("mutex_release: thread %p (%s) tried to release mutex %p it doesn't own. owned by %p (%s)\n",
current_thread, current_thread->name, m, m->holder, m->holder ? m->holder->name : "none");
get_current_thread(), get_current_thread()->name, m, m->holder, m->holder ? m->holder->name : "none");
}
#endif

38
kernel/thread.c
View File

@@ -55,9 +55,6 @@ struct thread_stats thread_stats;
/* global thread list */
static struct list_node thread_list;
/* the current thread */
thread_t *current_thread;
/* the global critical section count */
int critical_section_count;
@@ -69,7 +66,7 @@ static uint32_t run_queue_bitmap;
static thread_t bootstrap_thread;
/* the idle thread */
thread_t *idle_thread;
static thread_t *idle_thread;
/* local routines */
static void thread_resched(void);
@@ -182,6 +179,7 @@ thread_t *thread_create_etc(thread_t *t, const char *name, thread_start_routine
t->flags = flags;
/* inheirit thread local storage from the parent */
thread_t *current_thread = get_current_thread();
int i;
for (i=0; i < MAX_TLS_ENTRY; i++)
t->tls[i] = current_thread->tls[i];
@@ -299,6 +297,8 @@ status_t thread_detach(thread_t *t)
enter_critical_section();
thread_t *current_thread = get_current_thread();
/* if anyone is blocked on this thread, wake them up with a specific return code */
wait_queue_wake_all(&current_thread->retcode_wait_queue, false, ERR_THREAD_DETACHED);
@@ -323,6 +323,8 @@ status_t thread_detach(thread_t *t)
*/
void thread_exit(int retcode)
{
thread_t *current_thread = get_current_thread();
#if THREAD_CHECKS
ASSERT(current_thread->magic == THREAD_MAGIC);
ASSERT(current_thread->state == THREAD_RUNNING);
@@ -382,6 +384,8 @@ void thread_resched(void)
thread_t *oldthread;
thread_t *newthread;
thread_t *current_thread = get_current_thread();
// printf("thread_resched: current %p: ", current_thread);
// dump_thread(current_thread);
@@ -461,7 +465,7 @@ void thread_resched(void)
/* do the switch */
oldthread->saved_critical_section_count = critical_section_count;
current_thread = newthread;
set_current_thread(newthread);
critical_section_count = newthread->saved_critical_section_count;
arch_context_switch(oldthread, newthread);
}
@@ -477,6 +481,8 @@ void thread_resched(void)
*/
void thread_yield(void)
{
thread_t *current_thread = get_current_thread();
#if THREAD_CHECKS
ASSERT(current_thread->magic == THREAD_MAGIC);
ASSERT(current_thread->state == THREAD_RUNNING);
@@ -512,6 +518,8 @@ void thread_yield(void)
*/
void thread_preempt(void)
{
thread_t *current_thread = get_current_thread();
#if THREAD_CHECKS
ASSERT(current_thread->magic == THREAD_MAGIC);
ASSERT(current_thread->state == THREAD_RUNNING);
@@ -549,6 +557,8 @@ void thread_preempt(void)
*/
void thread_block(void)
{
thread_t *current_thread = get_current_thread();
#if THREAD_CHECKS
ASSERT(current_thread->magic == THREAD_MAGIC);
ASSERT(current_thread->state == THREAD_BLOCKED);
@@ -564,6 +574,8 @@ void thread_block(void)
enum handler_return thread_timer_tick(void)
{
thread_t *current_thread = get_current_thread();
if (current_thread == idle_thread)
return INT_NO_RESCHEDULE;
@@ -604,6 +616,8 @@ void thread_sleep(lk_time_t delay)
{
timer_t timer;
thread_t *current_thread = get_current_thread();
#if THREAD_CHECKS
ASSERT(current_thread->magic == THREAD_MAGIC);
ASSERT(current_thread->state == THREAD_RUNNING);
@@ -645,7 +659,7 @@ void thread_init_early(void)
t->flags = THREAD_FLAG_DETACHED;
wait_queue_init(&t->retcode_wait_queue);
list_add_head(&thread_list, &t->thread_list_node);
current_thread = t;
set_current_thread(t);
}
/**
@@ -665,6 +679,7 @@ void thread_init(void)
*/
void thread_set_name(const char *name)
{
thread_t *current_thread = get_current_thread();
strlcpy(current_thread->name, name, sizeof(current_thread->name));
}
@@ -679,7 +694,7 @@ void thread_set_priority(int priority)
priority = LOWEST_PRIORITY;
if (priority > HIGHEST_PRIORITY)
priority = HIGHEST_PRIORITY;
current_thread->priority = priority;
get_current_thread()->priority = priority;
}
/**
@@ -693,7 +708,7 @@ void thread_become_idle(void)
{
thread_set_name("idle");
thread_set_priority(IDLE_PRIORITY);
idle_thread = current_thread;
idle_thread = get_current_thread();
/* release the implicit boot critical section and yield to the scheduler */
exit_critical_section();
@@ -797,6 +812,8 @@ status_t wait_queue_block(wait_queue_t *wait, lk_time_t timeout)
{
timer_t timer;
thread_t *current_thread = get_current_thread();
#if THREAD_CHECKS
ASSERT(wait->magic == WAIT_QUEUE_MAGIC);
ASSERT(current_thread->state == THREAD_RUNNING);
@@ -847,6 +864,8 @@ int wait_queue_wake_one(wait_queue_t *wait, bool reschedule, status_t wait_queue
thread_t *t;
int ret = 0;
thread_t *current_thread = get_current_thread();
#if THREAD_CHECKS
ASSERT(wait->magic == WAIT_QUEUE_MAGIC);
ASSERT(in_critical_section());
@@ -899,6 +918,8 @@ int wait_queue_wake_all(wait_queue_t *wait, bool reschedule, status_t wait_queue
thread_t *t;
int ret = 0;
thread_t *current_thread = get_current_thread();
#if THREAD_CHECKS
ASSERT(wait->magic == WAIT_QUEUE_MAGIC);
ASSERT(in_critical_section());
@@ -990,4 +1011,5 @@ status_t thread_unblock_from_wait_queue(thread_t *t, status_t wait_queue_error)
return NO_ERROR;
}
/* vim: set ts=4 sw=4 noexpandtab: */