michaelh/zephyr
1
0
Fork 0
Code Releases Activity

kernel/stack: Spinlockify

Browse source 
One lock per stack.  Straightforward synchronization.

Signed-off-by: Andy Ross <andrew.j.ross@intel.com>
This commit is contained in:
Andy Ross 2018-07-26 10:23:02 -07:00 • committed by Anas Nashif
commit f0933d0ded
2 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/kernel.h
View file

@ -2370,6 +2370,7 @@ struct k_lifo {
struct k_stack { struct k_stack {
_wait_q_t wait_q; _wait_q_t wait_q;
struct k_spinlock lock;
u32_t *base, *next, *top; u32_t *base, *next, *top;
_OBJECT_TRACING_NEXT_PTR(k_stack) _OBJECT_TRACING_NEXT_PTR(k_stack)

22
kernel/stack.c
View file

@ -50,8 +50,8 @@ void k_stack_init(struct k_stack *stack, u32_t *buffer,
u32_t num_entries) u32_t num_entries)
{ {
_waitq_init(&stack->wait_q); _waitq_init(&stack->wait_q);
stack->base = buffer; stack->lock = (struct k_spinlock) {};
stack->next = buffer; stack->next = stack->base = buffer;
stack->top = stack->base + num_entries; stack->top = stack->base + num_entries;
SYS_TRACING_OBJ_INIT(k_stack, stack); SYS_TRACING_OBJ_INIT(k_stack, stack);
@ -99,11 +99,11 @@ void k_stack_cleanup(struct k_stack *stack)
void _impl_k_stack_push(struct k_stack *stack, u32_t data) void _impl_k_stack_push(struct k_stack *stack, u32_t data)
{ {
struct k_thread *first_pending_thread; struct k_thread *first_pending_thread;
u32_t key; k_spinlock_key_t key;
__ASSERT(stack->next != stack->top, "stack is full"); __ASSERT(stack->next != stack->top, "stack is full");
key = irq_lock(); key = k_spin_lock(&stack->lock);
first_pending_thread = _unpend_first_thread(&stack->wait_q); first_pending_thread = _unpend_first_thread(&stack->wait_q);
@ -112,12 +112,12 @@ void _impl_k_stack_push(struct k_stack *stack, u32_t data)
_set_thread_return_value_with_data(first_pending_thread, _set_thread_return_value_with_data(first_pending_thread,
0, (void *)data); 0, (void *)data);
_reschedule_irqlock(key); _reschedule(&stack->lock, key);
return; return;
} else { } else {
*(stack->next) = data; *(stack->next) = data;
stack->next++; stack->next++;
irq_unlock(key); k_spin_unlock(&stack->lock, key);
} }
} }
@ -138,24 +138,24 @@ Z_SYSCALL_HANDLER(k_stack_push, stack_p, data)
int _impl_k_stack_pop(struct k_stack *stack, u32_t *data, s32_t timeout) int _impl_k_stack_pop(struct k_stack *stack, u32_t *data, s32_t timeout)
{ {
u32_t key; k_spinlock_key_t key;
int result; int result;
key = irq_lock(); key = k_spin_lock(&stack->lock);
if (likely(stack->next > stack->base)) { if (likely(stack->next > stack->base)) {
stack->next--; stack->next--;
*data = *(stack->next); *data = *(stack->next);
irq_unlock(key); k_spin_unlock(&stack->lock, key);
return 0; return 0;
} }
if (timeout == K_NO_WAIT) { if (timeout == K_NO_WAIT) {
irq_unlock(key); k_spin_unlock(&stack->lock, key);
return -EBUSY; return -EBUSY;
} }
result = _pend_curr_irqlock(key, &stack->wait_q, timeout); result = _pend_curr(&stack->lock, key, &stack->wait_q, timeout);
if (result == -EAGAIN) { if (result == -EAGAIN) {
return -EAGAIN; return -EAGAIN;
} }