Skip to content

Commit

Permalink
add test for mutex_unlock_and_sleep()
Browse files Browse the repository at this point in the history
  • Loading branch information
Martin authored and Martin committed Mar 3, 2014
1 parent 05f085d commit 35106e3
Show file tree
Hide file tree
Showing 3 changed files with 74 additions and 1 deletion.
2 changes: 1 addition & 1 deletion core/mutex.c
Expand Up @@ -120,7 +120,7 @@ void mutex_unlock(struct mutex_t *mutex)

void mutex_unlock_and_sleep(struct mutex_t *mutex)
{
DEBUG("%s: unlocking mutex. val: %u pid: %u, and take a nap\n", active_thread->name, mutex->val, thread_pid);
DEBUG("%s: unlocking mutex. val: %u pid: %u, and taking a nap\n", active_thread->name, mutex->val, thread_pid);
int irqstate = disableIRQ();

if (mutex->val != 0) {
Expand Down
4 changes: 4 additions & 0 deletions tests/test_mutex_unlock_and_sleep/Makefile
@@ -0,0 +1,4 @@
export PROJECT = test_mutex_unlock_and_sleep
include ../Makefile.tests_common

include $(RIOTBASE)/Makefile.include
69 changes: 69 additions & 0 deletions tests/test_mutex_unlock_and_sleep/main.c
@@ -0,0 +1,69 @@
/*
* Copyright (C) 2014 Hamburg University of Applied Siences (HAW)
*
* This file is subject to the terms and conditions of the GNU Lesser General
* Public License. See the file LICENSE in the top level directory for more
* details.
*/

/**
* @ingroup tests
* @{
*
* @file
* @brief simple test application for atomic mutex unlocking and sleeping
*
* @author Martin Landsmann <martin.landsmann@haw-hamburg.de>
*
* @}
*/

#include <stdio.h>
#include "thread.h"
#include "mutex.h"

static mutex_t mutex;
static volatile int indicator, count;

static char stack[KERNEL_CONF_STACKSIZE_MAIN];
static void second_thread(void)
{
while (1) {
mutex_lock(&mutex);
thread_wakeup(1);
indicator--;
mutex_unlock_and_sleep(&mutex);
}
}

int main(void)
{
indicator = 0;
count = 0;
mutex_init(&mutex);

thread_create(stack,
KERNEL_CONF_STACKSIZE_MAIN,
PRIORITY_MAIN - 1,
CREATE_WOUT_YIELD | CREATE_STACKTEST,
second_thread,
"second_thread");

while (1) {
mutex_lock(&mutex);
thread_wakeup(2);
indicator++;
count++;

if (indicator > 1 || indicator < -1) {
printf("Error, threads did not sleep properly. [indicator: %d]\n", indicator);
return -1;
}

if ((count % 100000) == 0) {
printf("Still alive alternated [count: %dk] times.\n", count / 1000);
}

mutex_unlock_and_sleep(&mutex);
}
}

0 comments on commit 35106e3

Please sign in to comment.