sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove CONFIG_PTHREAD_RWLOCK. Rwlock interfaces built unconditionally.

Browse Source
This commit is contained in:
Gregory Nutt 2017-04-07 07:30:52 -06:00
parent 1fde89e2d9
commit acb6077988
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
examples/ostest/Makefile
View File

@ -71,6 +71,7 @@ endif
ifneq ($(CONFIG_DISABLE_PTHREAD),y) ifneq ($(CONFIG_DISABLE_PTHREAD),y)
CSRCS += cancel.c cond.c mutex.c sem.c semtimed.c barrier.c timedwait.c CSRCS += cancel.c cond.c mutex.c sem.c semtimed.c barrier.c timedwait.c
CSRCS += pthread_rwlock.c
ifneq ($(CONFIG_PTHREAD_MUTEX_UNSAFE),y) ifneq ($(CONFIG_PTHREAD_MUTEX_UNSAFE),y)
CSRCS += robust.c CSRCS += robust.c
@ -93,10 +94,6 @@ CSRCS += sporadic.c
endif endif
endif # CONFIG_DISABLE_PTHREAD endif # CONFIG_DISABLE_PTHREAD
ifeq ($(CONFIG_PTHREAD_RWLOCK),y)
CSRCS += pthread_rwlock.c
endif
ifneq ($(CONFIG_DISABLE_MQUEUE),y) ifneq ($(CONFIG_DISABLE_MQUEUE),y)
ifneq ($(CONFIG_DISABLE_PTHREAD),y) ifneq ($(CONFIG_DISABLE_PTHREAD),y)
CSRCS += mqueue.c timedmqueue.c CSRCS += mqueue.c timedmqueue.c

6
examples/ostest/ostest_main.c
View File

@ -424,15 +424,13 @@ static int user_main(int argc, char *argv[])
cond_test(); cond_test();
check_test_memory_usage(); check_test_memory_usage();
#endif #endif
#endif
#ifdef CONFIG_PTHREAD_RWLOCK /* Verify pthreads rwlock interfaces */
/* Verify pthreads and pthread mutex */
printf("\nuser_main: pthread_rwlock test\n"); printf("\nuser_main: pthread_rwlock test\n");
pthread_rwlock_test(); pthread_rwlock_test();
check_test_memory_usage(); check_test_memory_usage();
#endif /* CONFIG_PTHREAD_RWLOCK */ #endif /* !CONFIG_DISABLE_PTHREAD */
#ifndef CONFIG_DISABLE_PTHREAD #ifndef CONFIG_DISABLE_PTHREAD
/* Verify pthreads and condition variable timed waits */ /* Verify pthreads and condition variable timed waits */