diff options
author | Alex AUVOLAT <alexis211@gmail.com> | 2012-05-01 17:42:36 +0200 |
---|---|---|
committer | Alex AUVOLAT <alexis211@gmail.com> | 2012-05-01 17:42:36 +0200 |
commit | e9683297bf480f9590b0e5796f4520fb430e2e03 (patch) | |
tree | 93ef75cd154edf4c342d0a22cd56eb3670feb2b5 /src/kernel/lib | |
parent | e8cf65c07d78e3cfbac953b1b97c51998a5900df (diff) | |
download | TCE-e9683297bf480f9590b0e5796f4520fb430e2e03.tar.gz TCE-e9683297bf480f9590b0e5796f4520fb430e2e03.zip |
Now using Doug Lea's malloc for userland too. And improved stability.
Diffstat (limited to 'src/kernel/lib')
-rw-r--r-- | src/kernel/lib/mutex.c | 24 | ||||
-rw-r--r-- | src/kernel/lib/mutex.h | 15 |
2 files changed, 0 insertions, 39 deletions
diff --git a/src/kernel/lib/mutex.c b/src/kernel/lib/mutex.c deleted file mode 100644 index 2664eb0..0000000 --- a/src/kernel/lib/mutex.c +++ /dev/null @@ -1,24 +0,0 @@ -#include "mutex.h" -#include <task/task.h> - -/* Internal use only. This function is atomic, meaning it cannot be interrupted by a system task switch. */ -static uint32_t atomic_exchange(uint32_t* ptr, uint32_t newval) { - uint32_t r; - asm volatile("xchg (%%ecx), %%eax" : "=a"(r) : "c"(ptr), "a"(newval)); - return r; -} - -void mutex_lock(uint32_t* mutex) { - while (atomic_exchange(mutex, MUTEX_LOCKED) == MUTEX_LOCKED) { - thread_sleep(1); - } -} - -int mutex_lockE(uint32_t* mutex) { - if (atomic_exchange(mutex, MUTEX_LOCKED) == MUTEX_LOCKED) return 0; - return 1; -} - -void mutex_unlock(uint32_t* mutex) { - *mutex = MUTEX_UNLOCKED; -} diff --git a/src/kernel/lib/mutex.h b/src/kernel/lib/mutex.h deleted file mode 100644 index 2687b30..0000000 --- a/src/kernel/lib/mutex.h +++ /dev/null @@ -1,15 +0,0 @@ -#ifndef DEF_MUTEX_H -#define DEF_MUTEX_H - -#include <types.h> - -#define MUTEX_LOCKED 1 -#define MUTEX_UNLOCKED 0 - -//A mutex is just an uint32_t - -void mutex_lock(uint32_t* mutex); //wait for mutex to be free -int mutex_lockE(uint32_t* mutex); //lock mutex only if free, returns !0 if locked, 0 if was busy -void mutex_unlock(uint32_t* mutex); - -#endif |