michaelh/zephyr
1
0
Fork 0
Code Releases Activity

kernel: delete k_futex_init()

Browse source 
There's no need for a system call for this; futexes live in
user memory and the initialization bit is ignored.

It's sufficient to just do an atomic_set().

Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
This commit is contained in:
Andrew Boie 2019-06-28 10:37:06 -07:00 • committed by Andrew Boie
commit 8753becbe1
3 changed files with 9 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

11
include/kernel.h
View file

@ -2139,17 +2139,6 @@ struct z_futex_data {
* @{ * @{
*/ */
/**
* @brief Initialize a futex.
*
* This routine initializes a futex object, prior to its first use.
*
* @param futex Address of the k_futex.
*
* @return N/A
*/
__syscall void k_futex_init(struct k_futex *futex);
/** /**
* @brief Pend the current thread on a futex * @brief Pend the current thread on a futex
* *

17
kernel/futex.c
View file

@ -24,23 +24,6 @@ static struct z_futex_data *k_futex_find_data(struct k_futex *futex)
return (struct z_futex_data *)obj->data; return (struct z_futex_data *)obj->data;
} }
void z_impl_k_futex_init(struct k_futex *futex)
{
futex->val = 0U;
z_object_init(futex);
}
Z_SYSCALL_HANDLER(k_futex_init, futex)
{
if (Z_SYSCALL_MEMORY_WRITE(futex, sizeof(struct k_futex)) != 0) {
return -EACCES;
}
z_impl_k_futex_init((struct k_futex *)futex);
return 0;
}
int z_impl_k_futex_wake(struct k_futex *futex, bool wake_all) int z_impl_k_futex_wake(struct k_futex *futex, bool wake_all)
{ {
k_spinlock_key_t key; k_spinlock_key_t key;

26
tests/kernel/mem_protect/futex/src/main.c
View file

@ -161,8 +161,7 @@ void test_futex_wait_forever(void)
{ {
timeout = K_FOREVER; timeout = K_FOREVER;
k_futex_init(&simple_futex); atomic_set(&simple_futex.val, 1);
atomic_inc(&simple_futex.val);
k_thread_create(&futex_tid, stack_1, STACK_SIZE, k_thread_create(&futex_tid, stack_1, STACK_SIZE,
futex_wait_task, &timeout, NULL, NULL, futex_wait_task, &timeout, NULL, NULL,
@ -182,8 +181,7 @@ void test_futex_wait_timeout(void)
{ {
timeout = K_MSEC(50); timeout = K_MSEC(50);
k_futex_init(&simple_futex); atomic_set(&simple_futex.val, 1);
atomic_inc(&simple_futex.val);
k_thread_create(&futex_tid, stack_1, STACK_SIZE, k_thread_create(&futex_tid, stack_1, STACK_SIZE,
futex_wait_task, &timeout, NULL, NULL, futex_wait_task, &timeout, NULL, NULL,
@ -203,8 +201,7 @@ void test_futex_wait_nowait(void)
{ {
timeout = K_NO_WAIT; timeout = K_NO_WAIT;
k_futex_init(&simple_futex); atomic_set(&simple_futex.val, 1);
atomic_inc(&simple_futex.val);
k_thread_create(&futex_tid, stack_1, STACK_SIZE, k_thread_create(&futex_tid, stack_1, STACK_SIZE,
futex_wait_task, &timeout, NULL, NULL, futex_wait_task, &timeout, NULL, NULL,
@ -227,8 +224,7 @@ void test_futex_wait_forever_wake(void)
woken = 1; woken = 1;
timeout = K_FOREVER; timeout = K_FOREVER;
k_futex_init(&simple_futex); atomic_set(&simple_futex.val, 1);
atomic_inc(&simple_futex.val);
k_thread_create(&futex_tid, stack_1, STACK_SIZE, k_thread_create(&futex_tid, stack_1, STACK_SIZE,
futex_wait_wake_task, &timeout, NULL, NULL, futex_wait_wake_task, &timeout, NULL, NULL,
@ -261,8 +257,7 @@ void test_futex_wait_timeout_wake(void)
woken = 1; woken = 1;
timeout = K_MSEC(100); timeout = K_MSEC(100);
k_futex_init(&simple_futex); atomic_set(&simple_futex.val, 1);
atomic_inc(&simple_futex.val);
k_thread_create(&futex_tid, stack_1, STACK_SIZE, k_thread_create(&futex_tid, stack_1, STACK_SIZE,
futex_wait_wake_task, &timeout, NULL, NULL, futex_wait_wake_task, &timeout, NULL, NULL,
@ -295,8 +290,7 @@ void test_futex_wait_nowait_wake(void)
woken = 0; woken = 0;
timeout = K_NO_WAIT; timeout = K_NO_WAIT;
k_futex_init(&simple_futex); atomic_set(&simple_futex.val, 1);
atomic_inc(&simple_futex.val);
k_thread_create(&futex_tid, stack_1, STACK_SIZE, k_thread_create(&futex_tid, stack_1, STACK_SIZE,
futex_wait_wake_task, &timeout, NULL, NULL, futex_wait_wake_task, &timeout, NULL, NULL,
@ -322,8 +316,7 @@ void test_futex_wait_forever_wake_from_isr(void)
{ {
timeout = K_FOREVER; timeout = K_FOREVER;
k_futex_init(&simple_futex); atomic_set(&simple_futex.val, 1);
atomic_inc(&simple_futex.val);
k_thread_create(&futex_tid, stack_1, STACK_SIZE, k_thread_create(&futex_tid, stack_1, STACK_SIZE,
futex_wait_wake_task, &timeout, NULL, NULL, futex_wait_wake_task, &timeout, NULL, NULL,
@ -349,7 +342,7 @@ void test_futex_multiple_threads_wait_wake(void)
timeout = K_FOREVER; timeout = K_FOREVER;
woken = TOTAL_THREADS_WAITING; woken = TOTAL_THREADS_WAITING;
k_futex_init(&simple_futex); atomic_clear(&simple_futex.val);
for (int i = 0; i < TOTAL_THREADS_WAITING; i++) { for (int i = 0; i < TOTAL_THREADS_WAITING; i++) {
atomic_inc(&simple_futex.val); atomic_inc(&simple_futex.val);
@ -386,8 +379,7 @@ void test_multiple_futex_wait_wake(void)
for (int i = 0; i < TOTAL_THREADS_WAITING; i++) { for (int i = 0; i < TOTAL_THREADS_WAITING; i++) {
index[i] = i; index[i] = i;
k_futex_init(&multiple_futex[i]); atomic_set(&multiple_futex[i].val, 1);
atomic_inc(&multiple_futex[i].val);
k_thread_create(&multiple_tid[i], multiple_stack[i], k_thread_create(&multiple_tid[i], multiple_stack[i],
STACK_SIZE, futex_multiple_wait_wake_task, STACK_SIZE, futex_multiple_wait_wake_task,
&timeout, &index[i], NULL, PRIO_WAIT, &timeout, &index[i], NULL, PRIO_WAIT,