AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-25 06:20:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

tst-cancel4: deal with ENOSYS errors

Browse Source 
The Hurd port doesn't have support for sigwaitinfo, sigtimedwait, and msgget
yet, so let us ignore the test for these when they return ENOSYS.

* nptl/tst-cancel4.c (tf_sigwaitinfo): Fallback on sigwait when
sigwaitinfo returns ENOSYS.
(tf_sigtimedwait): Likewise with sigtimedwait.
(tf_msgrcv, tf_msgsnd): Fallback on tf_usleep when msgget returns ENOSYS.
This commit is contained in:
Samuel Thibault 2020-07-05 19:21:45 +02:00
parent a3f747a912
commit f9cf873537
1 changed files with 38 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
nptl/tst-cancel4.c
View File

@ -607,7 +607,15 @@ tf_sigwaitinfo (void *arg)
pthread_cleanup_push (cl, NULL);
/* Wait for SIGUSR1. */
sigwaitinfo (&mask, &info);
int ret;
ret = sigwaitinfo (&mask, &info);
if (ret == -1 && errno == ENOSYS)
{
int sig;
printf ("sigwaitinfo not supported\n");
sigwait (&mask, &sig);
}
pthread_cleanup_pop (0);
@ -634,7 +642,15 @@ tf_sigtimedwait (void *arg)
struct timespec ts = { .tv_sec = 60, .tv_nsec = 0 };
pthread_cleanup_push (cl, NULL);
sigtimedwait (&mask, &info, &ts);
int ret;
ret = sigtimedwait (&mask, &info, &ts);
if (ret == -1 && errno == ENOSYS)
{
int sig;
printf ("sigtimedwait not supported\n");
sigwait (&mask, &sig);
}
pthread_cleanup_pop (0);
@ -1459,7 +1475,16 @@ tf_msgrcv (void *arg)
{
tempmsg = msgget (IPC_PRIVATE, 0666 | IPC_CREAT);
if (tempmsg == -1)
{
if (errno == ENOSYS)
{
printf ("msgget not supported\n");
tf_usleep (arg);
pthread_exit (NULL);
}
else
FAIL_EXIT1 ("msgget (IPC_PRIVATE, 0666 | IPC_CREAT): %m");
}
xpthread_barrier_wait (&b2);
@ -1505,7 +1530,16 @@ tf_msgsnd (void *arg)
tempmsg = msgget (IPC_PRIVATE, 0666 | IPC_CREAT);
if (tempmsg == -1)
{
if (errno == ENOSYS)
{
printf ("msgget not supported\n");
tf_usleep (arg);
pthread_exit (NULL);
}
else
FAIL_EXIT1 ("msgget (IPC_PRIVATE, 0666 | IPC_CREAT): %m");
}
xpthread_barrier_wait (&b2);