nptl: Convert tst-setuid2 to test-driver
Checks
Context |
Check |
Description |
dj/TryBot-apply_patch |
success
|
Patch applied to master at the time it was sent
|
dj/TryBot-32bit |
success
|
Build for i686
|
Commit Message
Use <support/test-driver.c> and replace pthread calls to its wrappers.
Also add xpthread_cond_signal to be consisant with other wrappers in
tst-setuid2.
Signed-off-by: Yu Chien Peter Lin <peterlin@andestech.com>
---
nptl/tst-setuid2.c | 52 ++++++++++------------------------
support/Makefile | 1 +
support/xpthread_cond_signal.c | 26 +++++++++++++++++
support/xthread.h | 1 +
4 files changed, 43 insertions(+), 37 deletions(-)
create mode 100644 support/xpthread_cond_signal.c
Comments
* Yu Chien Peter Lin:
> diff --git a/support/Makefile b/support/Makefile
> index 551d02941f..4046b12fbd 100644
> --- a/support/Makefile
> +++ b/support/Makefile
> @@ -159,6 +159,7 @@ libsupport-routines = \
> xpthread_cancel \
> xpthread_check_return \
> xpthread_cond_wait \
> + xpthread_cond_signal \
> xpthread_create \
> xpthread_detach \
> xpthread_join \
> diff --git a/support/xpthread_cond_signal.c b/support/xpthread_cond_signal.c
> new file mode 100644
> index 0000000000..51d04d2a66
> --- /dev/null
> +++ b/support/xpthread_cond_signal.c
> @@ -0,0 +1,26 @@
> +/* pthread_cond_signal with error checking.
> + Copyright (C) 2016-2022 Free Software Foundation, Inc.
Copyright year should be 2022.
Could you put the support/ changes into a separate patch? Rest looks
good.
@@ -20,6 +20,7 @@
#include <signal.h>
#include <stdbool.h>
#include <stdio.h>
+#include <support/xthread.h>
#include <sys/syscall.h>
#include <unistd.h>
@@ -36,30 +37,21 @@ static pthread_cond_t cond_recv;
static void *
thread_func (void *ctx __attribute__ ((unused)))
{
- int ret = pthread_mutex_lock (&mutex);
- if (ret != 0)
- FAIL ("pthread_mutex_lock (thread): %d", ret);
-
+ xpthread_mutex_lock (&mutex);
while (true)
{
if (func_sent != NULL)
{
void (*func) (void) = func_sent;
- ret = pthread_mutex_unlock (&mutex);
- if (ret != 0)
- FAIL ("pthread_mutex_unlock (thread): %d", ret);
+ xpthread_mutex_unlock (&mutex);
+
func ();
- ret = pthread_mutex_lock (&mutex);
- if (ret != 0)
- FAIL ("pthread_mutex_lock (thread): %d", ret);
+
+ xpthread_mutex_lock (&mutex);
func_sent = NULL;
- ret = pthread_cond_signal (&cond_recv);
- if (ret != 0)
- FAIL ("pthread_cond_signal (recv): %d", ret);
+ xpthread_cond_signal (&cond_recv);
}
- ret = pthread_cond_wait (&cond_send, &mutex);
- if (ret != 0)
- FAIL ("pthread_cond_wait (send): %d", ret);
+ xpthread_cond_wait (&cond_send, &mutex);
}
return NULL;
}
@@ -67,31 +59,18 @@ thread_func (void *ctx __attribute__ ((unused)))
static void
run_on_thread (void (*func) (void))
{
- int ret = pthread_mutex_lock (&mutex);
- if (ret != 0)
- FAIL ("pthread_mutex_lock (%s): %d", __func__, ret);
+ xpthread_mutex_lock (&mutex);
func_sent = func;
- ret = pthread_mutex_unlock (&mutex);
- if (ret != 0)
- FAIL ("pthread_mutex_unlock (%s): %d", __func__, ret);
+ xpthread_mutex_unlock (&mutex);
- ret = pthread_cond_signal (&cond_send);
- if (ret != 0)
- FAIL ("pthread_mutex_lock (%s): %d", __func__, ret);
-
- ret = pthread_mutex_lock (&mutex);
- if (ret != 0)
- FAIL ("pthread_mutex_lock (%s): %d", __func__, ret);
+ xpthread_cond_signal (&cond_send);
+ xpthread_mutex_lock (&mutex);
while (func_sent != NULL)
{
- ret = pthread_cond_wait (&cond_recv, &mutex);
- if (ret != 0)
- FAIL ("pthread_mutex_wait (%s): %d", __func__, ret);
+ xpthread_cond_wait (&cond_recv, &mutex);
}
- ret = pthread_mutex_unlock (&mutex);
- if (ret != 0)
- FAIL ("pthread_mutex_unlock (%s): %d", __func__, ret);
+ xpthread_mutex_unlock (&mutex);
}
static void
@@ -141,5 +120,4 @@ do_test (void)
return 0;
}
-#define TEST_FUNCTION do_test ()
-#include "../test-skeleton.c"
+#include <support/test-driver.c>
@@ -159,6 +159,7 @@ libsupport-routines = \
xpthread_cancel \
xpthread_check_return \
xpthread_cond_wait \
+ xpthread_cond_signal \
xpthread_create \
xpthread_detach \
xpthread_join \
new file mode 100644
@@ -0,0 +1,26 @@
+/* pthread_cond_signal with error checking.
+ Copyright (C) 2016-2022 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
+
+#include <support/xthread.h>
+
+void
+xpthread_cond_signal (pthread_cond_t *cond)
+{
+ xpthread_check_return
+ ("pthread_cond_signal", pthread_cond_signal (cond));
+}
@@ -62,6 +62,7 @@ void xpthread_mutex_consistent (pthread_mutex_t *);
void xpthread_spin_lock (pthread_spinlock_t *lock);
void xpthread_spin_unlock (pthread_spinlock_t *lock);
void xpthread_cond_wait (pthread_cond_t * cond, pthread_mutex_t * mutex);
+void xpthread_cond_signal (pthread_cond_t *cond);
pthread_t xpthread_create (pthread_attr_t *attr,
void *(*thread_func) (void *), void *closure);
void xpthread_detach (pthread_t thr);