Mirrors/libhermit
1
0
Fork 0
mirror of https://github.com/hermitcore/libhermit.git synced 2025-03-09 00:00:03 +01:00
Code Issues Releases Wiki Activity

use for all locks 64bit atomics

Browse source
This commit is contained in:
Stefan Lankes 2017-05-24 22:25:03 +02:00
parent d044ea58b4
commit 96d2f99aec
2 changed files with 26 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
include/hermit/spinlock.h
View file

@ -60,8 +60,8 @@ inline static int spinlock_init(spinlock_t* s) {
if (BUILTIN_EXPECT(!s, 0))
return -EINVAL;
atomic_int32_set(&s->queue, 0);
atomic_int32_set(&s->dequeue, 1);
atomic_int64_set(&s->queue, 0);
atomic_int64_set(&s->dequeue, 1);
s->owner = MAX_TASKS;
s->counter = 0;
@ -69,7 +69,7 @@ inline static int spinlock_init(spinlock_t* s) {
}
/** @brief Destroy spinlock after use
* @return
* @return
* - 0 on success
* - -EINVAL (-22) on failure
*/
@ -83,13 +83,13 @@ inline static int spinlock_destroy(spinlock_t* s) {
return 0;
}
/** @brief Lock spinlock at entry of critical section
/** @brief Lock spinlock at entry of critical section
* @return
* - 0 on success
* - -EINVAL (-22) on failure
*/
inline static int spinlock_lock(spinlock_t* s) {
int32_t ticket;
int64_t ticket;
task_t* curr_task;
if (BUILTIN_EXPECT(!s, 0))
@ -101,23 +101,18 @@ inline static int spinlock_lock(spinlock_t* s) {
return 0;
}
#if 1
ticket = atomic_int32_inc(&s->queue);
while(atomic_int32_read(&s->dequeue) != ticket) {
//PAUSE;
check_scheduling();
ticket = atomic_int64_inc(&s->queue);
while(atomic_int64_read(&s->dequeue) != ticket) {
PAUSE;
}
s->owner = curr_task->id;
s->counter = 1;
#else
while( atomic_int32_test_and_set(&s->dequeue,0) );
#endif
return 0;
}
/** @brief Unlock spinlock on exit of critical section
* @return
/** @brief Unlock spinlock on exit of critical section
* @return
* - 0 on success
* - -EINVAL (-22) on failure
*/
@ -128,11 +123,7 @@ inline static int spinlock_unlock(spinlock_t* s) {
s->counter--;
if (!s->counter) {
s->owner = MAX_TASKS;
#if 1
atomic_int32_inc(&s->dequeue);
#else
atomic_int32_set(&s->dequeue,1);
#endif
atomic_int64_inc(&s->dequeue);
}
return 0;
@ -142,7 +133,7 @@ inline static int spinlock_unlock(spinlock_t* s) {
*
* Initialize each irqsave spinlock before use!
*
* @return
* @return
* - 0 on success
* - -EINVAL (-22) on failure
*/
@ -150,8 +141,8 @@ inline static int spinlock_irqsave_init(spinlock_irqsave_t* s) {
if (BUILTIN_EXPECT(!s, 0))
return -EINVAL;
atomic_int32_set(&s->queue, 0);
atomic_int32_set(&s->dequeue, 1);
atomic_int64_set(&s->queue, 0);
atomic_int64_set(&s->dequeue, 1);
s->flags = 0;
s->coreid = (uint32_t)-1;
s->counter = 0;
@ -160,7 +151,7 @@ inline static int spinlock_irqsave_init(spinlock_irqsave_t* s) {
}
/** @brief Destroy irqsave spinlock after use
* @return
* @return
* - 0 on success
* - -EINVAL (-22) on failure
*/
@ -176,13 +167,13 @@ inline static int spinlock_irqsave_destroy(spinlock_irqsave_t* s) {
}
/** @brief Lock spinlock on entry of critical section and disable interrupts
* @return
* @return
* - 0 on success
* - -EINVAL (-22) on failure
*/
inline static int spinlock_irqsave_lock(spinlock_irqsave_t* s) {
int64_t ticket;
uint8_t flags;
int32_t ticket;
if (BUILTIN_EXPECT(!s, 0))
return -EINVAL;
@ -193,8 +184,8 @@ inline static int spinlock_irqsave_lock(spinlock_irqsave_t* s) {
return 0;
}
ticket = atomic_int32_inc(&s->queue);
while (atomic_int32_read(&s->dequeue) != ticket) {
ticket = atomic_int64_inc(&s->queue);
while (atomic_int64_read(&s->dequeue) != ticket) {
PAUSE;
}
@ -206,7 +197,7 @@ inline static int spinlock_irqsave_lock(spinlock_irqsave_t* s) {
}
/** @brief Unlock spinlock on exit of critical section and re-enable interrupts
* @return
* @return
* - 0 on success
* - -EINVAL (-22) on failure
*/
@ -222,7 +213,7 @@ inline static int spinlock_irqsave_unlock(spinlock_irqsave_t* s) {
s->coreid = (uint32_t) -1;
s->flags = 0;
atomic_int32_inc(&s->dequeue);
atomic_int64_inc(&s->dequeue);
irq_nested_enable(flags);
}

10
include/hermit/spinlock_types.h
View file

@ -44,9 +44,9 @@ extern "C" {
/** @brief Spinlock structure */
typedef struct spinlock {
/// Internal queue
atomic_int32_t queue;
/// Internal dequeue
atomic_int32_t dequeue;
atomic_int64_t queue;
/// Internal dequeue
atomic_int64_t dequeue;
/// Owner of this spinlock structure
tid_t owner;
/// Internal counter var
@ -55,9 +55,9 @@ typedef struct spinlock {
typedef struct spinlock_irqsave {
/// Internal queue
atomic_int32_t queue;
atomic_int64_t queue;
/// Internal dequeue
atomic_int32_t dequeue;
atomic_int64_t dequeue;
/// Core Id of the lock owner
uint32_t coreid;
/// Internal counter var