This is an automated email from the ASF dual-hosted git repository.
archer pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx-apps.git
commit d46dce5819541d1ec3e5b2423775a139a24ee84f
Author: Xiang Xiao <xiaoxi...@xiaomi.com>
AuthorDate: Sun Jul 16 01:19:36 2023 +0800
testing/ostest: Remove the unnecessary
defined(CONFIG_PTHREAD_CLEANUP_STACKSIZE)
Signed-off-by: Xiang Xiao <xiaoxi...@xiaomi.com>
---
testing/ostest/cancel.c | 10 +++++-----
testing/ostest/ostest_main.c | 2 +-
testing/ostest/pthread_rwlock_cancel.c | 6 ++----
3 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/testing/ostest/cancel.c b/testing/ostest/cancel.c
index babfe9adc..c0c41b076 100644
--- a/testing/ostest/cancel.c
+++ b/testing/ostest/cancel.c
@@ -49,7 +49,7 @@ static sem_t sem_thread_started;
* Private Functions
****************************************************************************/
-#if defined(CONFIG_PTHREAD_CLEANUP_STACKSIZE) &&
CONFIG_PTHREAD_CLEANUP_STACKSIZE > 0
+#if CONFIG_PTHREAD_CLEANUP_STACKSIZE > 0
static void sem_cleaner(FAR void *arg)
{
printf("sem_cleaner #%u\n", (unsigned int)((uintptr_t)arg));
@@ -60,7 +60,7 @@ static FAR void *sem_waiter(FAR void *parameter)
{
int status;
-#if defined(CONFIG_PTHREAD_CLEANUP_STACKSIZE) &&
CONFIG_PTHREAD_CLEANUP_STACKSIZE > 0
+#if CONFIG_PTHREAD_CLEANUP_STACKSIZE > 0
int i;
/* Register some clean-up handlers */
@@ -161,7 +161,7 @@ static FAR void *sem_waiter(FAR void *parameter)
}
#if !defined(CONFIG_DISABLE_MQUEUE) && defined(CONFIG_CANCELLATION_POINTS)
-#if defined(CONFIG_PTHREAD_CLEANUP_STACKSIZE) &&
CONFIG_PTHREAD_CLEANUP_STACKSIZE > 0
+#if CONFIG_PTHREAD_CLEANUP_STACKSIZE > 0
static void mqueue_cleaner(FAR void *arg)
{
FAR mqd_t *mqcancel = (FAR mqd_t *)arg;
@@ -182,7 +182,7 @@ static FAR void *mqueue_waiter(FAR void *parameter)
char msgbuffer[CONFIG_MQ_MAXMSGSIZE];
size_t nbytes;
-#if defined(CONFIG_PTHREAD_CLEANUP_STACKSIZE) &&
CONFIG_PTHREAD_CLEANUP_STACKSIZE > 0
+#if CONFIG_PTHREAD_CLEANUP_STACKSIZE > 0
/* Register clean-up handler */
pthread_cleanup_push(mqueue_cleaner, (FAR void *)&mqcancel);
@@ -249,7 +249,7 @@ static FAR void *asynch_waiter(FAR void *parameter)
{
int status;
-#if defined(CONFIG_PTHREAD_CLEANUP_STACKSIZE) &&
CONFIG_PTHREAD_CLEANUP_STACKSIZE > 0
+#if CONFIG_PTHREAD_CLEANUP_STACKSIZE > 0
int i;
/* Register some clean-up handlers */
diff --git a/testing/ostest/ostest_main.c b/testing/ostest/ostest_main.c
index 3f33c6c7c..02ae8efac 100644
--- a/testing/ostest/ostest_main.c
+++ b/testing/ostest/ostest_main.c
@@ -461,7 +461,7 @@ static int user_main(int argc, char *argv[])
pthread_rwlock_cancel_test();
check_test_memory_usage();
-#if defined(CONFIG_PTHREAD_CLEANUP_STACKSIZE) &&
CONFIG_PTHREAD_CLEANUP_STACKSIZE > 0
+#if CONFIG_PTHREAD_CLEANUP_STACKSIZE > 0
/* Verify pthread cancellation cleanup handlers */
printf("\nuser_main: pthread_cleanup test\n");
diff --git a/testing/ostest/pthread_rwlock_cancel.c
b/testing/ostest/pthread_rwlock_cancel.c
index 8998bf395..4bb0eae4f 100644
--- a/testing/ostest/pthread_rwlock_cancel.c
+++ b/testing/ostest/pthread_rwlock_cancel.c
@@ -204,8 +204,7 @@ static void test_timeout(void)
* usable state after deferred cancellation.
*/
-#if defined(CONFIG_PTHREAD_CLEANUP_STACKSIZE) &&
CONFIG_PTHREAD_CLEANUP_STACKSIZE > 0
-#ifdef CONFIG_CANCELLATION_POINTS
+#if CONFIG_PTHREAD_CLEANUP_STACKSIZE > 0 && defined(CONFIG_CANCELLATION_POINTS)
status = pthread_rwlock_trywrlock(&write_lock);
if (status != EBUSY)
{
@@ -255,8 +254,7 @@ static void test_timeout(void)
"ERROR pthread_rwlock_wrlock, status=%d\n", status);
ASSERT(false);
}
-#endif /* CONFIG_CANCELLATION_POINTS */
-#endif /* defined(CONFIG_PTHREAD_CLEANUP_STACKSIZE) &&
CONFIG_PTHREAD_CLEANUP_STACKSIZE > 0 */
+#endif /* CONFIG_PTHREAD_CLEANUP_STACKSIZE > 0 && CONFIG_CANCELLATION_POINTS */
pthread_rwlock_destroy(&write_lock);
pthread_rwlock_destroy(&read_lock);
