[rtems commit] psxtmtests: Avoid build system defined defines
Sebastian Huber
sebh at rtems.org
Tue Nov 12 09:07:05 UTC 2019
Module: rtems
Branch: master
Commit: 150fbaf9c94237072617fbcb10ee95a346c7e13d
Changeset: http://git.rtems.org/rtems/commit/?id=150fbaf9c94237072617fbcb10ee95a346c7e13d
Author: Sebastian Huber <sebastian.huber at embedded-brains.de>
Date: Tue Nov 5 15:17:14 2019 +0100
psxtmtests: Avoid build system defined defines
Update #3818.
---
testsuites/psxtmtests/Makefile.am | 12 +-
testsuites/psxtmtests/psxtmcond08/init.c | 184 +--------------------
.../psxtmtests/psxtmcond08/psxtmcond08impl.h | 182 ++++++++++++++++++++
testsuites/psxtmtests/psxtmcond09/init.c | 2 +
testsuites/psxtmtests/psxtmcond10/init.c | 2 +
5 files changed, 193 insertions(+), 189 deletions(-)
diff --git a/testsuites/psxtmtests/Makefile.am b/testsuites/psxtmtests/Makefile.am
index 88ee7f2..fea5836 100644
--- a/testsuites/psxtmtests/Makefile.am
+++ b/testsuites/psxtmtests/Makefile.am
@@ -184,29 +184,27 @@ psxtmcond08_SOURCES = psxtmcond08/init.c ../tmtests/include/timesys.h \
../support/src/tmtests_empty_function.c \
../support/src/tmtests_support.c
psxtmcond08_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmcond08) \
- $(support_includes) -I$(top_srcdir)/../tmtests/include -DUSE_WAIT
+ $(support_includes) -I$(top_srcdir)/../tmtests/include
endif
if TEST_psxtmcond09
psxtm_tests += psxtmcond09
psxtm_docs += psxtmcond09/psxtmcond09.doc
-psxtmcond09_SOURCES = psxtmcond08/init.c ../tmtests/include/timesys.h \
+psxtmcond09_SOURCES = psxtmcond09/init.c ../tmtests/include/timesys.h \
../support/src/tmtests_empty_function.c \
../support/src/tmtests_support.c
psxtmcond09_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmcond09) \
- $(support_includes) -I$(top_srcdir)/../tmtests/include \
- -DUSE_TIMEDWAIT_WITH_VALUE
+ $(support_includes) -I$(top_srcdir)/../tmtests/include
endif
if TEST_psxtmcond10
psxtm_tests += psxtmcond10
psxtm_docs += psxtmcond10/psxtmcond10.doc
-psxtmcond10_SOURCES = psxtmcond08/init.c ../tmtests/include/timesys.h \
+psxtmcond10_SOURCES = psxtmcond10/init.c ../tmtests/include/timesys.h \
../support/src/tmtests_empty_function.c \
../support/src/tmtests_support.c
psxtmcond10_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmcond10) \
- $(support_includes) -I$(top_srcdir)/../tmtests/include \
- -DUSE_TIMEDWAIT_WAIT_VALUE_IN_PAST
+ $(support_includes) -I$(top_srcdir)/../tmtests/include
endif
if TEST_psxtmkey01
diff --git a/testsuites/psxtmtests/psxtmcond08/init.c b/testsuites/psxtmtests/psxtmcond08/init.c
index 7faffe1..c4fa914 100644
--- a/testsuites/psxtmtests/psxtmcond08/init.c
+++ b/testsuites/psxtmtests/psxtmcond08/init.c
@@ -1,182 +1,2 @@
-/*
- * COPYRIGHT (c) 1989-2013.
- * On-Line Applications Research Corporation (OAR).
- *
- * The license and distribution terms for this file may be
- * found in the file LICENSE in this distribution or at
- * http://www.rtems.org/license/LICENSE.
- */
-
-#if !defined(OPERATION_COUNT)
-#define OPERATION_COUNT 100
-#endif
-
-#if defined(USE_WAIT)
- #define TEST_NUMBER "08"
- #define TEST_CASE "pthread_cond_wait: blocking"
-#elif defined(USE_TIMEDWAIT_WITH_VALUE)
- #define TEST_NUMBER "09"
- #define TEST_CASE "pthread_cond_timedwait: blocking"
-#elif defined(USE_TIMEDWAIT_WAIT_VALUE_IN_PAST)
- #define TEST_NUMBER "10"
- #define TEST_CASE "pthread_cond_timedwait: time in past error"
-#else
- #error "How am I being compiled?"
-#endif
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <sys/time.h>
-#include <stdio.h>
-#include <time.h>
-#include <errno.h>
-#include <sched.h>
-#include <timesys.h>
-#include <tmacros.h>
-#include <rtems/btimer.h>
-#include "test_support.h"
-
-#include <pthread.h>
-
-const char rtems_test_name[] = "PSXTMCOND 08";
-
-/* forward declarations to avoid warnings */
-void *POSIX_Init(void *argument);
-void *Middle(void *argument);
-void *Low(void *argument);
-
-pthread_cond_t CondID;
-pthread_mutex_t MutexID;
-struct timespec sleepTime;
-
-void *Low(
- void *argument
-)
-{
- uint32_t end_time;
-
- end_time = benchmark_timer_read();
-
- put_time(
- TEST_CASE,
- end_time,
- OPERATION_COUNT,
- 0,
- 0
- );
-
- TEST_END();
-
- rtems_test_exit( 0 );
- return NULL;
-}
-
-void *Middle(
- void *argument
-)
-{
- int rc;
-
-
- rc = pthread_mutex_lock(&MutexID);
- rtems_test_assert( rc == 0 );
-
- /* block and switch to another task here */
-
- #if defined(USE_WAIT)
- rc = pthread_cond_wait( &CondID, &MutexID );
- rtems_test_assert( rc == 0 );
-
- #elif defined(USE_TIMEDWAIT_WITH_VALUE)
- /* adjust sleepTime to get something obviously in the future */
- ++sleepTime.tv_sec;
-
- rc = pthread_cond_timedwait( &CondID, &MutexID, &sleepTime );
- rtems_test_assert( rc == 0 );
-
- #elif defined(USE_TIMEDWAIT_WAIT_VALUE_IN_PAST)
- {
- /* override sleepTime with something obviously in the past */
- sleepTime.tv_sec = 0;
- sleepTime.tv_nsec = 5;
-
- /* this does all the work of timedwait but immediately returns */
- rc = pthread_cond_timedwait( &CondID, &MutexID, &sleepTime );
- rtems_test_assert(rc == ETIMEDOUT);
- benchmark_timer_read();
- }
- #endif
-
- pthread_mutex_unlock(&MutexID);
- #if defined(USE_TIMEDWAIT_WAIT_VALUE_IN_PAST)
- /*
- * In this case, unlock does not switch to another thread. so we need
- * to explicitly yield. If we do not yield, then we will measure the
- * time required to do an implicit pthread_exit() which is undesirable
- * from a measurement viewpoint.
- */
- sched_yield();
- #endif
- return NULL;
-}
-
-void *POSIX_Init(
- void *argument
-)
-{
- int i;
- int status;
- pthread_t threadId;
- int rc;
- struct timeval tp;
-
- TEST_BEGIN();
-
- rc = gettimeofday(&tp, NULL);
- rtems_test_assert( rc == 0 );
-
- /* Convert from timeval to timespec */
- sleepTime.tv_sec = tp.tv_sec;
- sleepTime.tv_nsec = tp.tv_usec * 1000;
-
- rc = pthread_cond_init(&CondID, NULL);
- rtems_test_assert( rc == 0 );
-
- rc = pthread_mutex_init(&MutexID, NULL);
- rtems_test_assert( rc == 0 );
-
- rc = pthread_mutex_lock(&MutexID);
- rtems_test_assert( rc == 0 );
-
- for ( i=0 ; i < OPERATION_COUNT - 1 ; i++ ) {
- status = pthread_create( &threadId, NULL, Middle, NULL );
- rtems_test_assert( !status );
- }
-
- status = pthread_create( &threadId, NULL, Low, NULL );
- rtems_test_assert( !status );
-
- /* start the timer and switch through all the other tasks */
- benchmark_timer_initialize();
-
- rc = pthread_mutex_unlock(&MutexID);
- rtems_test_assert( rc == 0 );
-
- /* Should never return. */
- return NULL;
-}
-
-/* configuration information */
-
-#define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER
-#define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER
-
-#define CONFIGURE_MAXIMUM_POSIX_THREADS OPERATION_COUNT + 2
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE
-
-#define CONFIGURE_INIT
-
-#include <rtems/confdefs.h>
- /* end of file */
+#define USE_WAIT
+#include "psxtmcond08impl.h"
diff --git a/testsuites/psxtmtests/psxtmcond08/psxtmcond08impl.h b/testsuites/psxtmtests/psxtmcond08/psxtmcond08impl.h
new file mode 100644
index 0000000..7faffe1
--- /dev/null
+++ b/testsuites/psxtmtests/psxtmcond08/psxtmcond08impl.h
@@ -0,0 +1,182 @@
+/*
+ * COPYRIGHT (c) 1989-2013.
+ * On-Line Applications Research Corporation (OAR).
+ *
+ * The license and distribution terms for this file may be
+ * found in the file LICENSE in this distribution or at
+ * http://www.rtems.org/license/LICENSE.
+ */
+
+#if !defined(OPERATION_COUNT)
+#define OPERATION_COUNT 100
+#endif
+
+#if defined(USE_WAIT)
+ #define TEST_NUMBER "08"
+ #define TEST_CASE "pthread_cond_wait: blocking"
+#elif defined(USE_TIMEDWAIT_WITH_VALUE)
+ #define TEST_NUMBER "09"
+ #define TEST_CASE "pthread_cond_timedwait: blocking"
+#elif defined(USE_TIMEDWAIT_WAIT_VALUE_IN_PAST)
+ #define TEST_NUMBER "10"
+ #define TEST_CASE "pthread_cond_timedwait: time in past error"
+#else
+ #error "How am I being compiled?"
+#endif
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <sys/time.h>
+#include <stdio.h>
+#include <time.h>
+#include <errno.h>
+#include <sched.h>
+#include <timesys.h>
+#include <tmacros.h>
+#include <rtems/btimer.h>
+#include "test_support.h"
+
+#include <pthread.h>
+
+const char rtems_test_name[] = "PSXTMCOND 08";
+
+/* forward declarations to avoid warnings */
+void *POSIX_Init(void *argument);
+void *Middle(void *argument);
+void *Low(void *argument);
+
+pthread_cond_t CondID;
+pthread_mutex_t MutexID;
+struct timespec sleepTime;
+
+void *Low(
+ void *argument
+)
+{
+ uint32_t end_time;
+
+ end_time = benchmark_timer_read();
+
+ put_time(
+ TEST_CASE,
+ end_time,
+ OPERATION_COUNT,
+ 0,
+ 0
+ );
+
+ TEST_END();
+
+ rtems_test_exit( 0 );
+ return NULL;
+}
+
+void *Middle(
+ void *argument
+)
+{
+ int rc;
+
+
+ rc = pthread_mutex_lock(&MutexID);
+ rtems_test_assert( rc == 0 );
+
+ /* block and switch to another task here */
+
+ #if defined(USE_WAIT)
+ rc = pthread_cond_wait( &CondID, &MutexID );
+ rtems_test_assert( rc == 0 );
+
+ #elif defined(USE_TIMEDWAIT_WITH_VALUE)
+ /* adjust sleepTime to get something obviously in the future */
+ ++sleepTime.tv_sec;
+
+ rc = pthread_cond_timedwait( &CondID, &MutexID, &sleepTime );
+ rtems_test_assert( rc == 0 );
+
+ #elif defined(USE_TIMEDWAIT_WAIT_VALUE_IN_PAST)
+ {
+ /* override sleepTime with something obviously in the past */
+ sleepTime.tv_sec = 0;
+ sleepTime.tv_nsec = 5;
+
+ /* this does all the work of timedwait but immediately returns */
+ rc = pthread_cond_timedwait( &CondID, &MutexID, &sleepTime );
+ rtems_test_assert(rc == ETIMEDOUT);
+ benchmark_timer_read();
+ }
+ #endif
+
+ pthread_mutex_unlock(&MutexID);
+ #if defined(USE_TIMEDWAIT_WAIT_VALUE_IN_PAST)
+ /*
+ * In this case, unlock does not switch to another thread. so we need
+ * to explicitly yield. If we do not yield, then we will measure the
+ * time required to do an implicit pthread_exit() which is undesirable
+ * from a measurement viewpoint.
+ */
+ sched_yield();
+ #endif
+ return NULL;
+}
+
+void *POSIX_Init(
+ void *argument
+)
+{
+ int i;
+ int status;
+ pthread_t threadId;
+ int rc;
+ struct timeval tp;
+
+ TEST_BEGIN();
+
+ rc = gettimeofday(&tp, NULL);
+ rtems_test_assert( rc == 0 );
+
+ /* Convert from timeval to timespec */
+ sleepTime.tv_sec = tp.tv_sec;
+ sleepTime.tv_nsec = tp.tv_usec * 1000;
+
+ rc = pthread_cond_init(&CondID, NULL);
+ rtems_test_assert( rc == 0 );
+
+ rc = pthread_mutex_init(&MutexID, NULL);
+ rtems_test_assert( rc == 0 );
+
+ rc = pthread_mutex_lock(&MutexID);
+ rtems_test_assert( rc == 0 );
+
+ for ( i=0 ; i < OPERATION_COUNT - 1 ; i++ ) {
+ status = pthread_create( &threadId, NULL, Middle, NULL );
+ rtems_test_assert( !status );
+ }
+
+ status = pthread_create( &threadId, NULL, Low, NULL );
+ rtems_test_assert( !status );
+
+ /* start the timer and switch through all the other tasks */
+ benchmark_timer_initialize();
+
+ rc = pthread_mutex_unlock(&MutexID);
+ rtems_test_assert( rc == 0 );
+
+ /* Should never return. */
+ return NULL;
+}
+
+/* configuration information */
+
+#define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER
+
+#define CONFIGURE_MAXIMUM_POSIX_THREADS OPERATION_COUNT + 2
+#define CONFIGURE_POSIX_INIT_THREAD_TABLE
+
+#define CONFIGURE_INIT
+
+#include <rtems/confdefs.h>
+ /* end of file */
diff --git a/testsuites/psxtmtests/psxtmcond09/init.c b/testsuites/psxtmtests/psxtmcond09/init.c
new file mode 100644
index 0000000..5a40a7a
--- /dev/null
+++ b/testsuites/psxtmtests/psxtmcond09/init.c
@@ -0,0 +1,2 @@
+#define USE_TIMEDWAIT_WITH_VALUE
+#include "../psxtmcond08/psxtmcond08impl.h"
diff --git a/testsuites/psxtmtests/psxtmcond10/init.c b/testsuites/psxtmtests/psxtmcond10/init.c
new file mode 100644
index 0000000..ba08dc1
--- /dev/null
+++ b/testsuites/psxtmtests/psxtmcond10/init.c
@@ -0,0 +1,2 @@
+#define USE_TIMEDWAIT_WAIT_VALUE_IN_PAST
+#include "../psxtmcond08/psxtmcond08impl.h"
More information about the vc
mailing list