riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tests/pthread_rwlock: improve test behaviour

Browse Source
This commit is contained in:
Alexandre Abadie 2017-10-29 12:22:44 +01:00
parent 67187e240f
commit 31ffda0a68
2 changed files with 34 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/pthread_rwlock/Makefile
View File

@ -8,8 +8,6 @@ USEMODULE += pthread
USEMODULE += xtimer
USEMODULE += random
CFLAGS += -DNATIVE_AUTO_EXIT
BOARD_INSUFFICIENT_MEMORY += airfy-beacon chronos mbed_lpc1768 msb-430 msb-430h \
nrf51dongle nrf6310 nucleo32-f031 nucleo32-f042 nucleo32-l031 \
nucleo-f030 nucleo-f334 nucleo-l053 pca10000 pca10005 \

45
tests/pthread_rwlock/main.c
View File

@ -53,21 +53,32 @@
static pthread_rwlock_t rwlock;
static volatile unsigned counter;
#define PRINTF(FMT, ...) \
printf("%c%" PRIkernel_pid " (prio=%u): " FMT "\n", __func__[0], sched_active_pid, sched_active_thread->priority, __VA_ARGS__)
static kernel_pid_t main_thread_pid;
#define PRINTF(FMT, ...) \
printf("%c%" PRIkernel_pid " (prio=%u): " FMT "\n", \
__func__[0], sched_active_pid, \
sched_active_thread->priority, \
(int)__VA_ARGS__)
static void _notify_main_thread(void)
{
msg_t msg;
msg_send(&msg, main_thread_pid);
}
static void do_sleep(int factor)
{
uint32_t timeout_us = (random_uint32() % 100000) * factor;
/* PRINTF("sleep for % 8i µs.", timeout_us); */
PRINTF("sleep for % 8i µs.", timeout_us);
xtimer_usleep(timeout_us);
}
static void *writer(void *arg)
{
(void) arg;
/* PRINTF("%s", "start"); */
for (int i = 0; i < NUM_ITERATIONS; ++i) {
puts("start");
for (unsigned i = 0; i < NUM_ITERATIONS; ++i) {
pthread_rwlock_wrlock(&rwlock);
unsigned cur = ++counter;
do_sleep(3); /* simulate time that it takes to write the value */
@ -75,15 +86,16 @@ static void *writer(void *arg)
pthread_rwlock_unlock(&rwlock);
do_sleep(2);
}
/* PRINTF("%s", "done"); */
puts("done");
_notify_main_thread();
return NULL;
}
static void *reader(void *arg)
{
(void) arg;
/* PRINTF("%s", "start"); */
for (int i = 0; i < NUM_ITERATIONS; ++i) {
puts("start");
for (unsigned i = 0; i < NUM_ITERATIONS; ++i) {
pthread_rwlock_rdlock(&rwlock);
unsigned cur = counter;
do_sleep(1); /* simulate time that it takes to read the value */
@ -91,7 +103,9 @@ static void *reader(void *arg)
pthread_rwlock_unlock(&rwlock);
do_sleep(1);
}
/* PRINTF("%s", "done"); */
puts("done");
_notify_main_thread();
return NULL;
}
@ -99,7 +113,9 @@ int main(void)
{
static char stacks[NUM_CHILDREN][THREAD_STACKSIZE_MAIN];
puts("Main start.");
puts("START");
/* Get main thread pid */
main_thread_pid = thread_getpid();
for (unsigned i = 0; i < NUM_CHILDREN; ++i) {
int prio;
@ -132,6 +148,13 @@ int main(void)
fun, NULL, name);
}
puts("Main done.");
/* Block until all children threads are done */
for (unsigned i = 0; i < NUM_CHILDREN; ++i) {
msg_t msg;
msg_receive(&msg);
}
puts("SUCCESS");
return 0;
}