Add recursive mutex test
git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@771 7fd9a85b-ad96-42d3-883c-3090e2eb8679
This commit is contained in:
patacongo
parent
464b3b848d
commit
b30d00c10f
|
|
@ -372,3 +372,5 @@
|
|||
0.3.12 2008-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr>
|
||||
|
||||
* Improved solution to POSIX timer lifetime controls bug fixed in 0.3.11.
|
||||
* Add test for recursive mutexes
|
||||
* Correct bug in recursive mutex logic
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
<tr align="center" bgcolor="#e4e4e4">
|
||||
<td>
|
||||
<h1><big><font color="#3c34ec"><i>NuttX RTOS</i></font></big></h1>
|
||||
<p>Last Updated: June 1, 2008</p>
|
||||
<p>Last Updated: June 3, 2008</p>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
|
@ -1020,6 +1020,10 @@ buildroot-0.1.0 2007-03-09 <spudmonkey@racsa.co.cr>
|
|||
<pre><ul>
|
||||
nuttx-0.3.12 2008-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr>
|
||||
|
||||
* Improved solution to POSIX timer lifetime controls bug fixed in 0.3.11.
|
||||
* Add test for recursive mutexes
|
||||
* Correct bug in recursive mutex logic
|
||||
|
||||
pascal-0.1.3 2008-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr>
|
||||
|
||||
buildroot-0.1.1 2008-xx-xx <spudmonkey@racsa.co.cr>
|
||||
|
|
|
|||
|
|
@ -94,6 +94,7 @@ CONFIG_START_MONTH=2
|
|||
CONFIG_START_DAY=27
|
||||
CONFIG_JULIAN_TIME=n
|
||||
CONFIG_DEV_CONSOLE=y
|
||||
CONFIG_MUTEX_TYPES=y
|
||||
|
||||
#
|
||||
# The following can be used to disable categories of
|
||||
|
|
|
|||
|
|
@ -41,6 +41,9 @@ AOBJS = $(ASRCS:.S=$(OBJEXT))
|
|||
CSRCS = main.c dev_null.c
|
||||
ifneq ($(CONFIG_DISABLE_PTHREAD),y)
|
||||
CSRCS += cancel.c cond.c mutex.c sem.c roundrobin.c barrier.c
|
||||
ifeq ($(CONFIG_MUTEX_TYPES),y)
|
||||
CSRCS += rmutex.c
|
||||
endif
|
||||
endif
|
||||
ifneq ($(CONFIG_DISABLE_SIGNALS),y)
|
||||
CSRCS += sighand.c
|
||||
|
|
|
|||
|
|
@ -313,6 +313,14 @@ static int user_main(int argc, char *argv[])
|
|||
check_test_memory_usage();
|
||||
#endif
|
||||
|
||||
#if !defined(CONFIG_DISABLE_PTHREAD) && defined(CONFIG_MUTEX_TYPES)
|
||||
/* Verify recursive mutexes */
|
||||
|
||||
printf("\nuser_main: recursive mutex test\n");
|
||||
recursive_mutex_test();
|
||||
check_test_memory_usage();
|
||||
#endif
|
||||
|
||||
#ifndef CONFIG_DISABLE_PTHREAD
|
||||
/* Verify pthread cancellation */
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
/************************************************************
|
||||
* ostest.h
|
||||
/****************************************************************************
|
||||
* examples/ostest/ostest.h
|
||||
*
|
||||
* Copyright (C) 2007 Gregory Nutt. All rights reserved.
|
||||
* Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
|
||||
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
|
|
@ -14,7 +14,7 @@
|
|||
* notice, this list of conditions and the following disclaimer in
|
||||
* the documentation and/or other materials provided with the
|
||||
* distribution.
|
||||
* 3. Neither the name Gregory Nutt nor the names of its contributors may be
|
||||
* 3. Neither the name NuttX nor the names of its contributors may be
|
||||
* used to endorse or promote products derived from this software
|
||||
* without specific prior written permission.
|
||||
*
|
||||
|
|
@ -31,80 +31,84 @@
|
|||
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
* POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
************************************************************/
|
||||
****************************************************************************/
|
||||
|
||||
#ifndef __OSTEST_H
|
||||
#define __OSTEST_H
|
||||
|
||||
/************************************************************
|
||||
/****************************************************************************
|
||||
* Compilation Switches
|
||||
************************************************************/
|
||||
****************************************************************************/
|
||||
|
||||
/************************************************************
|
||||
/****************************************************************************
|
||||
* Included Files
|
||||
************************************************************/
|
||||
****************************************************************************/
|
||||
|
||||
/************************************************************
|
||||
/****************************************************************************
|
||||
* Definitions
|
||||
************************************************************/
|
||||
****************************************************************************/
|
||||
|
||||
/************************************************************
|
||||
/****************************************************************************
|
||||
* Public Types
|
||||
************************************************************/
|
||||
****************************************************************************/
|
||||
|
||||
/************************************************************
|
||||
/****************************************************************************
|
||||
* Public Variables
|
||||
************************************************************/
|
||||
****************************************************************************/
|
||||
|
||||
/************************************************************
|
||||
/****************************************************************************
|
||||
* Public Function Prototypes
|
||||
************************************************************/
|
||||
****************************************************************************/
|
||||
|
||||
/* dev_null.c ***********************************************/
|
||||
/* dev_null.c ***************************************************************/
|
||||
|
||||
extern int dev_null(void);
|
||||
|
||||
/* mutex.c **************************************************/
|
||||
/* mutex.c ******************************************************************/
|
||||
|
||||
extern void mutex_test(void);
|
||||
|
||||
/* sem.c ****************************************************/
|
||||
/* rmutex.c ******************************************************************/
|
||||
|
||||
extern void recursive_mutex_test(void);
|
||||
|
||||
/* sem.c ********************************************************************/
|
||||
|
||||
extern void sem_test(void);
|
||||
|
||||
/* cond.c ***************************************************/
|
||||
/* cond.c *******************************************************************/
|
||||
|
||||
extern void cond_test(void);
|
||||
|
||||
/* mqueue.c *************************************************/
|
||||
/* mqueue.c *****************************************************************/
|
||||
|
||||
extern void mqueue_test(void);
|
||||
|
||||
/* timedmqueue.c ********************************************/
|
||||
/* timedmqueue.c ************************************************************/
|
||||
|
||||
extern void timedmqueue_test(void);
|
||||
|
||||
/* cancel.c *************************************************/
|
||||
/* cancel.c *****************************************************************/
|
||||
|
||||
extern void cancel_test(void);
|
||||
|
||||
/* timedwait.c **********************************************/
|
||||
/* timedwait.c **************************************************************/
|
||||
|
||||
extern void timedwait_test(void);
|
||||
|
||||
/* sighand.c ************************************************/
|
||||
/* sighand.c ****************************************************************/
|
||||
|
||||
extern void sighand_test(void);
|
||||
|
||||
/* posixtimers.c ********************************************/
|
||||
/* posixtimers.c ************************************************************/
|
||||
|
||||
extern void timer_test(void);
|
||||
|
||||
/* roundrobin.c *********************************************/
|
||||
/* roundrobin.c *************************************************************/
|
||||
|
||||
extern void rr_test(void);
|
||||
|
||||
/* barrier.c ************************************************/
|
||||
/* barrier.c ****************************************************************/
|
||||
|
||||
extern void barrier_test(void);
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,166 @@
|
|||
/***********************************************************************
|
||||
* rmutex.c
|
||||
*
|
||||
* Copyright (C) 2008 Gregory Nutt. All rights reserved.
|
||||
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
*
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in
|
||||
* the documentation and/or other materials provided with the
|
||||
* distribution.
|
||||
* 3. Neither the name NuttX nor the names of its contributors may be
|
||||
* used to endorse or promote products derived from this software
|
||||
* without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
||||
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
||||
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
||||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
|
||||
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
|
||||
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
|
||||
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
|
||||
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
* POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
***********************************************************************/
|
||||
|
||||
#include <stdio.h>
|
||||
#include <pthread.h>
|
||||
#include "ostest.h"
|
||||
|
||||
#ifndef NULL
|
||||
# define NULL (void*)0
|
||||
#endif
|
||||
|
||||
#define NTHREADS 3
|
||||
#define NLOOPS 3
|
||||
#define NRECURSIONS 3
|
||||
|
||||
static pthread_mutex_t mut;
|
||||
|
||||
static void thread_inner(int id, int level)
|
||||
{
|
||||
int status;
|
||||
if (level < NRECURSIONS)
|
||||
{
|
||||
/* Take the mutex */
|
||||
|
||||
printf("thread_inner[%d, %d]: Locking\n", id, level);
|
||||
status = pthread_mutex_lock(&mut);
|
||||
if (status != 0)
|
||||
{
|
||||
printf("thread_inner[%d, %d]: ERROR pthread_mutex_lock failed: %d\n",
|
||||
id, level, status);
|
||||
}
|
||||
printf("thread_inner[%d, %d]: Locked\n", id, level);
|
||||
|
||||
/* Give the other threads a chance */
|
||||
|
||||
pthread_yield();
|
||||
thread_inner(id, level+1);
|
||||
pthread_yield();
|
||||
|
||||
/* Unlock the mutex */
|
||||
|
||||
printf("thread_inner[%d, %d]: Unlocking\n", id, level);
|
||||
status = pthread_mutex_unlock(&mut);
|
||||
if (status != 0)
|
||||
{
|
||||
printf("thread_inner[%d, %d]: ERROR pthread_mutex_unlock failed: %d\n",
|
||||
id, level, status);
|
||||
}
|
||||
printf("thread_inner[%d, %d]: Unlocked\n", id, level);
|
||||
pthread_yield();
|
||||
}
|
||||
}
|
||||
|
||||
static void *thread_outer(void *parameter)
|
||||
{
|
||||
int i;
|
||||
printf("thread_outer[%d]: Started\n", (int)parameter);
|
||||
for (i = 0; i < NLOOPS; i++)
|
||||
{
|
||||
printf("thread_outer[%d]: Loop %d\n", (int)parameter, i);
|
||||
thread_inner((int)parameter, 0);
|
||||
}
|
||||
printf("thread_outer[%d]: Exitting\n", (int)parameter);
|
||||
pthread_exit(NULL);
|
||||
return NULL; /* Non-reachable -- needed for some compilers */
|
||||
}
|
||||
|
||||
void recursive_mutex_test(void)
|
||||
{
|
||||
pthread_t thread[NTHREADS];
|
||||
#ifdef SDCC
|
||||
pthread_addr_t result[NTHREADS];
|
||||
pthread_attr_t attr;
|
||||
#endif
|
||||
pthread_mutexattr_t mattr;
|
||||
int type;
|
||||
int status;
|
||||
int i;
|
||||
|
||||
/* Initialize the mutex attributes */
|
||||
|
||||
pthread_mutexattr_init(&mattr);
|
||||
status = pthread_mutexattr_settype(&mattr, PTHREAD_MUTEX_RECURSIVE);
|
||||
if (status != 0)
|
||||
{
|
||||
printf("recursive_mutex_test: ERROR pthread_mutexattr_settype failed, status=%d\n", status);
|
||||
}
|
||||
|
||||
status = pthread_mutexattr_gettype(&mattr, &type);
|
||||
if (status != 0)
|
||||
{
|
||||
printf("recursive_mutex_test: ERROR pthread_mutexattr_gettype failed, status=%d\n", status);
|
||||
}
|
||||
if (type != PTHREAD_MUTEX_RECURSIVE)
|
||||
{
|
||||
printf("recursive_mutex_test: ERROR pthread_mutexattr_gettype return type=%d\n", type);
|
||||
}
|
||||
|
||||
/* Initialize the mutex */
|
||||
|
||||
printf("recursive_mutex_test: Initializing mutex\n");
|
||||
pthread_mutex_init(&mut, &mattr);
|
||||
|
||||
/* Start the threads -- all at the same, default priority */
|
||||
|
||||
for (i = 0; i < NTHREADS; i++)
|
||||
{
|
||||
printf("recursive_mutex_test: Starting thread %d\n", i+1);
|
||||
#ifdef SDCC
|
||||
(void)pthread_attr_init(&attr);
|
||||
status = pthread_create(&thread[i], &attr, thread_outer, (pthread_addr_t)i+1);
|
||||
#else
|
||||
status = pthread_create(&thread[i], NULL, thread_outer, (pthread_addr_t)i+1);
|
||||
#endif
|
||||
if (status != 0)
|
||||
{
|
||||
printf("recursive_mutex_test: ERRROR thread#%d creation: %d\n", i+1, status);
|
||||
}
|
||||
}
|
||||
|
||||
/* Wait for all; of the threads to complete */
|
||||
|
||||
for (i = 0; i < NTHREADS; i++)
|
||||
{
|
||||
printf("recursive_mutex_test: Waiting for thread %d\n", i+1);
|
||||
#ifdef SDCC
|
||||
pthread_join(thread[i], &result1);
|
||||
#else
|
||||
pthread_join(thread[i], NULL);
|
||||
#endif
|
||||
}
|
||||
|
||||
printf("recursive_mutex_test: Complete\n");
|
||||
}
|
||||
Loading…
Reference in New Issue