diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2007-03-24 22:32:53 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2007-03-24 22:32:53 +0000 |
commit | 40220c909fa3d16296ef0d6cdd12cf209c16674e (patch) | |
tree | 8f0c2f2c40e13f4478d67740d015bf3f28ccf7f0 | |
parent | 66ed96432d7d27f4bb321166538a1b71c277d154 (diff) | |
download | px4-nuttx-40220c909fa3d16296ef0d6cdd12cf209c16674e.tar.gz px4-nuttx-40220c909fa3d16296ef0d6cdd12cf209c16674e.tar.bz2 px4-nuttx-40220c909fa3d16296ef0d6cdd12cf209c16674e.zip |
Add test of pthread barrier logic
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@144 42af7a65-404d-4744-a932-0658087f49c3
-rw-r--r-- | nuttx/ChangeLog | 7 | ||||
-rw-r--r-- | nuttx/Documentation/NuttX.html | 7 | ||||
-rw-r--r-- | nuttx/TODO | 11 | ||||
-rw-r--r-- | nuttx/examples/ostest/Makefile | 2 | ||||
-rw-r--r-- | nuttx/examples/ostest/barrier.c | 151 | ||||
-rw-r--r-- | nuttx/examples/ostest/main.c | 8 | ||||
-rw-r--r-- | nuttx/examples/ostest/ostest.h | 4 |
7 files changed, 178 insertions, 12 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index 7cbf2249b..13b02bf47 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -76,10 +76,11 @@ * Corrected memory leak in OS pthread join logic * Corrected memory leaks in examples/ostest due to failures to join or detach from pthreads. - * added pthread_once(), pthread_kill(), pthread_sigmask() - * added pthread_barrierattr_*() APIs - * added pthread_barrier_init(), pthread_barrier_destroy(), and + * Added pthread_once(), pthread_kill(), pthread_sigmask() + * Added pthread_barrierattr_*() APIs + * Added pthread_barrier_init(), pthread_barrier_destroy(), and pthread_barrier_wait(); + * Added pthread barrier test * Added protection so that errno cannot be modified from interrupt handling. * sched_setparam(), sched_setscheduler() now correctly set diff --git a/nuttx/Documentation/NuttX.html b/nuttx/Documentation/NuttX.html index 330429e3b..0b843a4d9 100644 --- a/nuttx/Documentation/NuttX.html +++ b/nuttx/Documentation/NuttX.html @@ -437,10 +437,11 @@ Other memory: * Corrected memory leak in OS pthread join logic * Corrected memory leaks in examples/ostest due to failures to join or detach from pthreads. - * added pthread_once(), pthread_kill(), pthread_sigmask() - * added pthread_barrierattr_*() APIs - * added pthread_barrier_init(), pthread_barrier_destroy(), and + * Added pthread_once(), pthread_kill(), pthread_sigmask() + * Added pthread_barrierattr_*() APIs + * Added pthread_barrier_init(), pthread_barrier_destroy(), and pthread_barrier_wait(); + * Added pthread barrier test * Added protection so that errno cannot be modified from interrupt handling. * sched_setparam(), sched_setscheduler() now correctly set diff --git a/nuttx/TODO b/nuttx/TODO index 5c9705687..597d27bd8 100644 --- a/nuttx/TODO +++ b/nuttx/TODO @@ -32,6 +32,12 @@ o Libraries - There needs to be some kind of mutual exclusion protection on buffered I/O. If two threads try fflush-ing at the same time, there is corruption of the output. +- At present, there is a failure in the examples/ostest POSIX timer + test when CONFIG_DEBUG is enabled. This is almost certainly yet + another case where printf (or its kin) are being called from a + sensitive area in the OS. +- I am now seeing the same thing with the dm320 barrier test. + Apparently printf has some thread safety issues. o File system - This probabaly needs some rethinking. @@ -47,13 +53,8 @@ o Build system - Something leaves garbage link 'include' in arch/*/include o Applications & Tests -- Need a test for the pthread_barrierattr_* and pthread_barrier_* APIs. o C5471 -- At present, there is a failure in the examples/ostest POSIX timer - test when CONFIG_DEBUG is enabled. This is almost certainly yet - another case where printf (or its kin) are being called from a - sensitive area in the OS. o pjrc-8052 / MCS51 * Current status: diff --git a/nuttx/examples/ostest/Makefile b/nuttx/examples/ostest/Makefile index d8101368f..9c8f0d6d7 100644 --- a/nuttx/examples/ostest/Makefile +++ b/nuttx/examples/ostest/Makefile @@ -42,7 +42,7 @@ ASRCS = 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 +CSRCS += cancel.c cond.c mutex.c sem.c roundrobin.c barrier.c endif ifneq ($(CONFIG_DISABLE_SIGNALS),y) CSRCS += sighand.c diff --git a/nuttx/examples/ostest/barrier.c b/nuttx/examples/ostest/barrier.c new file mode 100644 index 000000000..f84ae36df --- /dev/null +++ b/nuttx/examples/ostest/barrier.c @@ -0,0 +1,151 @@ +/*********************************************************************** + * barrier.c + * + * Copyright (C) 2007 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 Gregory Nutt 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 <sys/types.h> +#include <stdio.h> +#include <unistd.h> +#include <pthread.h> +#include "ostest.h" + +#define NBARRIER_THREADS 8 + +static pthread_barrier_t barrier; + +static void *barrier_func(void *parameter) +{ + int id = (int)parameter; + int status; + + printf("barrier_func: Thread %d started\n", id); + usleep(500*1000); + + /* Take the semaphore */ + + printf("barrier_func: Thread %d calling pthread_barrier_wait()\n", id); + status = pthread_barrier_wait(&barrier); + if (status == 0) + { + printf("barrier_func: Thread %d, back with status=0 (I am not special)\n", id, status); + } + else if (status == PTHREAD_BARRIER_SERIAL_THREAD) + { + printf("barrier_func: Thread %d, back with status=PTHREAD_BARRIER_SERIAL_THREAD (I AM SPECIAL)\n", id, status); + } + else + { + printf("barrier_func: ERROR thread %d could not get semaphore value\n", id); + } + + usleep(500*1000); + printf("barrier_func: Thread %d done\n", id); + return NULL; +} + +void barrier_test(void) +{ + pthread_t barrier_thread[NBARRIER_THREADS]; + pthread_addr_t result; + pthread_attr_t attr; + pthread_barrierattr_t barrierattr; + int status; + int i; + + printf("barrier_test: Initializing barrier\n"); + + status = pthread_barrierattr_init(&barrierattr); + if (status != OK) + { + printf("barrier_test: pthread_barrierattr_init failed, status=%d\n", status); + } + + status = pthread_barrier_init(&barrier, &barrierattr, NBARRIER_THREADS); + if (status != OK) + { + printf("barrier_test: pthread_barrierattr_init failed, status=%d\n", status); + } + /* Create the barrier */ + + status = pthread_barrierattr_init(&barrierattr); + + /* Start NBARRIER_THREADS thread instances */ + + status = pthread_attr_init(&attr); + if (status != OK) + { + printf("barrier_test: pthread_attr_init failed, status=%d\n", status); + } + + for (i = 0; i < NBARRIER_THREADS; i++) + { + status = pthread_create(&barrier_thread[i], &attr, barrier_func, (pthread_addr_t)i); + if (status != 0) + { + printf("barrier_test: Error in thread %d create, status=%d\n", i, status); + } + else + { + printf("barrier_test: Thread %d created\n", i); + } + } + + /* Wait for all thread instances to complete */ + + for (i = 0; i < NBARRIER_THREADS; i++) + { + status = pthread_join(barrier_thread[i], &result); + if (status != 0) + { + printf("barrier_test: Error in thread %d join, status=%d\n", i, status); + } + else + { + printf("barrier_test: Thread %d completed with result=%p\n", i, result); + } + } + + /* Destroy the barrier */ + + status = pthread_barrier_destroy(&barrier); + if (status != OK) + { + printf("barrier_test: pthread_barrier_destroy failed, status=%d\n", status); + } + + status = pthread_barrierattr_destroy(&barrierattr); + if (status != OK) + { + printf("barrier_test: pthread_barrierattr_destroy failed, status=%d\n", status); + } +} diff --git a/nuttx/examples/ostest/main.c b/nuttx/examples/ostest/main.c index c78fc0cde..c06ab86df 100644 --- a/nuttx/examples/ostest/main.c +++ b/nuttx/examples/ostest/main.c @@ -277,6 +277,14 @@ static int user_main(int argc, char *argv[]) check_test_memory_usage(); #endif +#ifndef CONFIG_DISABLE_PTHREAD + /* Verify pthread barriers */ + + printf("\nuser_main: barrier test\n"); + barrier_test(); + check_test_memory_usage(); +#endif + /* Compare memory usage at time user_start started until * user_main exits. These should not be identical, but should * be similar enough that we can detect any serious OS memory diff --git a/nuttx/examples/ostest/ostest.h b/nuttx/examples/ostest/ostest.h index 710c6f965..b76297ebe 100644 --- a/nuttx/examples/ostest/ostest.h +++ b/nuttx/examples/ostest/ostest.h @@ -100,4 +100,8 @@ extern void timer_test(void); extern void rr_test(void); +/* barrier.c ************************************************/ + +extern void barrier_test(void); + #endif /* __OSTEST_H */ |