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

Update.

Browse Source 
2004-04-16  Jakub Jelinek  <jakub@redhat.com>

	* misc/syslog.c (vsyslog): Avoid freeing failbuf.

2004-04-15  Jakub Jelinek  <jakub@redhat.com>

	* rt/Makefile (tests): Add tst-timer4.
	* rt/tst-timer4.c: New test.

2004-04-15  Jakub Jelinek  <jakub@redhat.com>

	* rt/tst-mqueue5.c (rtmin_code): New variable.
	(rtmin_handler): Set it.
	(thr, do_child, do_test): Also check rtmin_code.

2004-04-14  Jakub Jelinek  <jakub@redhat.com>

	* rt/Makefile (tests): Add tst-mqueue7.
	(tst-mqueue7-ARGS): Set.
	* rt/tst-mqueue7.c: New test.

2004-04-13  Jakub Jelinek  <jakub@redhat.com>

	* rt/Makefile (tests): Add tst-mqueue5 and tst-mqueue6.
	* rt/tst-mqueue1.c (do_one_test): Bitwise or check_attrs () into
	result instead of replacing it.  Use TEMP_FAILURE_RETRY around
	waitpid, kill child if waitpid failed.
	(do_test): Bitwise or check_attrs () into result instead of replacing
	it.  Change temp mq name.
	* rt/tst-mqueue5.c: New test.
	* rt/tst-mqueue6.c: New test.
	* rt/tst-mqueue.h: Include stdio.h, unistd.h, sys/uio.h.
	(temp_mq_list, delete_temp_mqs): Remove.
	(temp_mq_fd): New variable.
	(do_cleanup, do_prepare): New functions.
	(add_temp_mq): Rewritten to use a temp file.
	(PREPARE): Define.
	(CLEANUP_HANDLER): Change to do_cleanup ().

	* rt/tst-timer3.c: Don't fail if _POSIX_THREADS is not available.

2004-04-13  Thorsten Kukuk  <kukuk@suse.de>

	* sysdeps/s390/ffs.c: Include limits.h

2004-04-13  Kaz Kojima  <kkojima@rr.iij4u.or.jp>

	* sysdeps/unix/sysv/linux/sh/sysdep.h (SUBSTITUTE_ARGS_1,
	SUBSTITUTE_ARGS_2, SUBSTITUTE_ARGS_3, SUBSTITUTE_ARGS_4,
	SUBSTITUTE_ARGS_5, SUBSTITUTE_ARGS_6, SUBSTITUTE_ARGS_7): Load
	argument values into temporary variables.
This commit is contained in:
Ulrich Drepper 2004-04-16 20:44:32 +00:00
parent f93fa7d433
commit efa8adf5f9
10 changed files with 2172 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
ChangeLog
View File

@ -1,3 +1,55 @@
2004-04-16 Jakub Jelinek <jakub@redhat.com>
* misc/syslog.c (vsyslog): Avoid freeing failbuf.
2004-04-15 Jakub Jelinek <jakub@redhat.com>
* rt/Makefile (tests): Add tst-timer4.
* rt/tst-timer4.c: New test.
2004-04-15 Jakub Jelinek <jakub@redhat.com>
* rt/tst-mqueue5.c (rtmin_code): New variable.
(rtmin_handler): Set it.
(thr, do_child, do_test): Also check rtmin_code.
2004-04-14 Jakub Jelinek <jakub@redhat.com>
* rt/Makefile (tests): Add tst-mqueue7.
(tst-mqueue7-ARGS): Set.
* rt/tst-mqueue7.c: New test.
2004-04-13 Jakub Jelinek <jakub@redhat.com>
* rt/Makefile (tests): Add tst-mqueue5 and tst-mqueue6.
* rt/tst-mqueue1.c (do_one_test): Bitwise or check_attrs () into
result instead of replacing it. Use TEMP_FAILURE_RETRY around
waitpid, kill child if waitpid failed.
(do_test): Bitwise or check_attrs () into result instead of replacing
it. Change temp mq name.
* rt/tst-mqueue5.c: New test.
* rt/tst-mqueue6.c: New test.
* rt/tst-mqueue.h: Include stdio.h, unistd.h, sys/uio.h.
(temp_mq_list, delete_temp_mqs): Remove.
(temp_mq_fd): New variable.
(do_cleanup, do_prepare): New functions.
(add_temp_mq): Rewritten to use a temp file.
(PREPARE): Define.
(CLEANUP_HANDLER): Change to do_cleanup ().
* rt/tst-timer3.c: Don't fail if _POSIX_THREADS is not available.
2004-04-13 Thorsten Kukuk <kukuk@suse.de>
* sysdeps/s390/ffs.c: Include limits.h
2004-04-13 Kaz Kojima <kkojima@rr.iij4u.or.jp>
* sysdeps/unix/sysv/linux/sh/sysdep.h (SUBSTITUTE_ARGS_1,
SUBSTITUTE_ARGS_2, SUBSTITUTE_ARGS_3, SUBSTITUTE_ARGS_4,
SUBSTITUTE_ARGS_5, SUBSTITUTE_ARGS_6, SUBSTITUTE_ARGS_7): Load
argument values into temporary variables.
2004-04-15 Atsushi Nemoto <anemo@mba.ocn.ne.jp> 2004-04-15 Atsushi Nemoto <anemo@mba.ocn.ne.jp>
* sysdeps/mips/dl-machine.h (RTLD_START): Do not use nested .end. * sysdeps/mips/dl-machine.h (RTLD_START): Do not use nested .end.

5
misc/syslog.c
View File

@ -237,7 +237,7 @@ vsyslog(pri, fmt, ap)
v->iov_len = 1; v->iov_len = 1;
} }
__libc_cleanup_push (free, buf); __libc_cleanup_push (free, buf == failbuf ? NULL : buf);
/* writev is a cancellation point. */ /* writev is a cancellation point. */
(void)__writev(STDERR_FILENO, iov, v - iov + 1); (void)__writev(STDERR_FILENO, iov, v - iov + 1);
@ -305,7 +305,8 @@ vsyslog(pri, fmt, ap)
__libc_cleanup_pop (0); __libc_cleanup_pop (0);
__libc_lock_unlock (syslog_lock); __libc_lock_unlock (syslog_lock);
free (buf); if (buf != failbuf)
free (buf);
} }
libc_hidden_def (vsyslog) libc_hidden_def (vsyslog)

4
rt/Makefile
View File

@ -44,7 +44,7 @@ librt-routines = $(aio-routines) \
tests := tst-shm tst-clock tst-clock_nanosleep tst-timer tst-timer2 \ tests := tst-shm tst-clock tst-clock_nanosleep tst-timer tst-timer2 \
tst-aio tst-aio64 tst-aio2 tst-aio3 tst-aio4 tst-aio5 tst-aio6 \ tst-aio tst-aio64 tst-aio2 tst-aio3 tst-aio4 tst-aio5 tst-aio6 \
tst-aio7 tst-mqueue1 tst-mqueue2 tst-mqueue3 tst-mqueue4 \ tst-aio7 tst-mqueue1 tst-mqueue2 tst-mqueue3 tst-mqueue4 \
tst-timer3 tst-mqueue5 tst-mqueue6 tst-mqueue7 tst-timer3 tst-timer4
extra-libs := librt extra-libs := librt
extra-libs-others := $(extra-libs) extra-libs-others := $(extra-libs)
@ -75,6 +75,8 @@ ifeq (yes,$(build-bounded))
$(tests:%=$(objpfx)%-bp): $(objpfx)librt_b.a $(bounded-thread-library) $(tests:%=$(objpfx)%-bp): $(objpfx)librt_b.a $(bounded-thread-library)
endif endif
tst-mqueue7-ARGS = -- $(built-program-cmd)
ifeq (yes,$(build-static-nss)) ifeq (yes,$(build-static-nss))
otherlibs += $(nssobjdir)/libnss_files.a $(resolvobjdir)/libnss_dns.a \ otherlibs += $(nssobjdir)/libnss_files.a $(resolvobjdir)/libnss_dns.a \
$(resolvobjdir)/libresolv.a $(resolvobjdir)/libresolv.a

68
rt/tst-mqueue.h
View File

@ -21,42 +21,64 @@
#include <mqueue.h> #include <mqueue.h>
#include <search.h> #include <search.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h>
#include <string.h> #include <string.h>
#include <sys/uio.h>
#include <unistd.h>
/* List of temporary files. */ static int temp_mq_fd;
struct temp_mq_list
{
struct qelem q;
char name[1];
} *temp_mq_list;
/* Add temporary files in list. */ /* Add temporary files in list. */
static void static void
__attribute__ ((unused)) __attribute__ ((unused))
add_temp_mq (const char *name) add_temp_mq (const char *name)
{ {
size_t len = strlen (name); struct iovec iov[2];
struct temp_mq_list *newp iov[0].iov_base = (char *) name;
= (struct temp_mq_list *) calloc (sizeof (*newp) + len, 1); iov[0].iov_len = strlen (name);
if (newp != NULL) iov[1].iov_base = (char *) "\n";
{ iov[1].iov_len = 1;
memcpy (newp->name, name, len + 1); if (writev (temp_mq_fd, iov, 2) != iov[0].iov_len + 1)
if (temp_mq_list == NULL) printf ("Could not record temp mq filename %s\n", name);
temp_mq_list = (struct temp_mq_list *) &newp->q;
else
insque (newp, temp_mq_list);
}
} }
/* Delete all temporary files. */ /* Delete all temporary message queues. */
static void static void
delete_temp_mqs (void) do_cleanup (void)
{ {
while (temp_mq_list != NULL) if (lseek (temp_mq_fd, 0, SEEK_SET) != 0)
return;
FILE *f = fdopen (temp_mq_fd, "r");
if (f == NULL)
return;
char *line = NULL;
size_t n = 0;
ssize_t rets;
while ((rets = getline (&line, &n, f)) > 0)
{ {
mq_unlink (temp_mq_list->name); if (line[rets - 1] != '\n')
temp_mq_list = (struct temp_mq_list *) temp_mq_list->q.q_forw; continue;
line[rets - 1] = '\0';
mq_unlink (line);
} }
fclose (f);
} }
#define CLEANUP_HANDLER delete_temp_mqs () static void
do_prepare (void)
{
char name [] = "/tmp/tst-mqueueN.XXXXXX";
temp_mq_fd = mkstemp (name);
if (temp_mq_fd == -1)
{
printf ("Could not create temporary file %s: %m\n", name);
exit (1);
}
unlink (name);
}
#define PREPARE(argc, argv) do_prepare ()
#define CLEANUP_HANDLER do_cleanup ()

19
rt/tst-mqueue1.c
View File

@ -83,7 +83,7 @@ do_one_test (mqd_t q, const char *name, int nonblock)
result = 1; result = 1;
} }
else else
result = check_attrs (&attr, nonblock, 0); result |= check_attrs (&attr, nonblock, 0);
if (mq_receive (q, &v[0], 1, NULL) != -1) if (mq_receive (q, &v[0], 1, NULL) != -1)
{ {
@ -156,7 +156,7 @@ do_one_test (mqd_t q, const char *name, int nonblock)
result = 1; result = 1;
} }
else else
result = check_attrs (&attr, nonblock, 10); result |= check_attrs (&attr, nonblock, 10);
pid_t pid = fork (); pid_t pid = fork ();
if (pid == -1) if (pid == -1)
@ -188,7 +188,7 @@ do_one_test (mqd_t q, const char *name, int nonblock)
result = 1; result = 1;
} }
else else
result = check_attrs (&attr, nonblock, 10); result |= check_attrs (&attr, nonblock, 10);
unsigned char vr[11] = { }; unsigned char vr[11] = { };
unsigned int prio; unsigned int prio;
@ -272,7 +272,7 @@ do_one_test (mqd_t q, const char *name, int nonblock)
result = 1; result = 1;
} }
else else
result = check_attrs (&attr, nonblock, 0); result |= check_attrs (&attr, nonblock, 0);
if (mq_close (q) != 0) if (mq_close (q) != 0)
{ {
@ -284,9 +284,10 @@ do_one_test (mqd_t q, const char *name, int nonblock)
} }
int status; int status;
if (waitpid (pid, &status, 0) != pid) if (TEMP_FAILURE_RETRY (waitpid (pid, &status, 0)) != pid)
{ {
printf ("waitpid failed: %m\n"); printf ("waitpid failed: %m\n");
kill (pid, SIGKILL);
result = 1; result = 1;
} }
else if (!WIFEXITED (status) || WEXITSTATUS (status)) else if (!WIFEXITED (status) || WEXITSTATUS (status))
@ -302,7 +303,7 @@ do_one_test (mqd_t q, const char *name, int nonblock)
result = 1; result = 1;
} }
else else
result = check_attrs (&attr, nonblock, 0); result |= check_attrs (&attr, nonblock, 0);
return result; return result;
} }
@ -313,8 +314,8 @@ do_test (void)
{ {
int result = 0; int result = 0;
char name[sizeof "/tst-mqueue-" + sizeof (pid_t) * 3]; char name[sizeof "/tst-mqueue1-" + sizeof (pid_t) * 3];
snprintf (name, sizeof (name), "/tst-mqueue-%u", getpid ()); snprintf (name, sizeof (name), "/tst-mqueue1-%u", getpid ());
struct mq_attr attr = { .mq_maxmsg = 10, .mq_msgsize = 1 }; struct mq_attr attr = { .mq_maxmsg = 10, .mq_msgsize = 1 };
mqd_t q = mq_open (name, O_CREAT | O_EXCL | O_WRONLY, 0600, &attr); mqd_t q = mq_open (name, O_CREAT | O_EXCL | O_WRONLY, 0600, &attr);
@ -327,7 +328,7 @@ do_test (void)
else else
add_temp_mq (name); add_temp_mq (name);
result = do_one_test (q, name, 0); result |= do_one_test (q, name, 0);
mqd_t q2 = mq_open (name, O_WRONLY | O_NONBLOCK); mqd_t q2 = mq_open (name, O_WRONLY | O_NONBLOCK);
if (q2 == (mqd_t) -1) if (q2 == (mqd_t) -1)

1014
rt/tst-mqueue5.c Normal file
View File

File diff suppressed because it is too large Load Diff

305
rt/tst-mqueue6.c Normal file
View File

@ -0,0 +1,305 @@
/* Test mq_notify.
Copyright (C) 2004 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Jakub Jelinek <jakub@redhat.com>, 2004.
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, write to the Free
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
#include <errno.h>
#include <fcntl.h>
#include <mqueue.h>
#include <limits.h>
#include <signal.h>
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/mman.h>
#include <sys/time.h>
#include <sys/wait.h>
#include <time.h>
#include <unistd.h>
#include "tst-mqueue.h"
#if _POSIX_THREADS
# include <pthread.h>
#define mqsend(q) (mqsend) (q, __LINE__)
static inline int
(mqsend) (mqd_t q, int line)
{
char c;
if (mq_send (q, &c, 1, 1) != 0)
{
printf ("mq_send on line %d failed with: %m\n", line);
return 1;
}
return 0;
}
#define mqrecv(q) (mqrecv) (q, __LINE__)
static inline int
(mqrecv) (mqd_t q, int line)
{
char c;
ssize_t rets = TEMP_FAILURE_RETRY (mq_receive (q, &c, 1, NULL));
if (rets != 1)
{
if (rets == -1)
printf ("mq_receive on line %d failed with: %m\n", line);
else
printf ("mq_receive on line %d returned %zd != 1\n",
line, rets);
return 1;
}
return 0;
}
volatile int fct_cnt, fct_err;
size_t fct_guardsize;
static void
fct (union sigval s)
{
mqd_t q = *(mqd_t *) s.sival_ptr;
pthread_attr_t nattr;
int ret = pthread_getattr_np (pthread_self (), &nattr);
if (ret)
{
errno = ret;
printf ("pthread_getattr_np failed: %m\n");
fct_err = 1;
}
else
{
ret = pthread_attr_getguardsize (&nattr, &fct_guardsize);
if (ret)
{
errno = ret;
printf ("pthread_attr_getguardsize failed: %m\n");
fct_err = 1;
}
if (pthread_attr_destroy (&nattr) != 0)
{
puts ("pthread_attr_destroy failed");
fct_err = 1;
}
}
++fct_cnt;
fct_err |= mqsend (q);
}
#define TEST_FUNCTION do_test ()
static int
do_test (void)
{
int result = 0;
char name[sizeof "/tst-mqueue6-" + sizeof (pid_t) * 3];
snprintf (name, sizeof (name), "/tst-mqueue6-%u", getpid ());
struct mq_attr attr = { .mq_maxmsg = 1, .mq_msgsize = 1 };
mqd_t q = mq_open (name, O_CREAT | O_EXCL | O_RDWR, 0600, &attr);
if (q == (mqd_t) -1)
{
printf ("mq_open failed with: %m\n");
return result;
}
else
add_temp_mq (name);
pthread_attr_t nattr;
if (pthread_attr_init (&nattr)
|| pthread_attr_setguardsize (&nattr, 0))
{
puts ("pthread_attr_t setup failed");
result = 1;
}
fct_guardsize = 1;
struct sigevent ev;
memset (&ev, 0xaa, sizeof (ev));
ev.sigev_notify = SIGEV_THREAD;
ev.sigev_notify_function = fct;
ev.sigev_notify_attributes = &nattr;
ev.sigev_value.sival_ptr = &q;
if (mq_notify (q, &ev) != 0)
{
printf ("mq_notify (q, { SIGEV_THREAD }) failed with: %m\n");
result = 1;
}
size_t ps = sysconf (_SC_PAGESIZE);
if (pthread_attr_setguardsize (&nattr, 32 * ps))
{
puts ("pthread_attr_t setup failed");
result = 1;
}
if (mq_notify (q, &ev) == 0)
{
puts ("second mq_notify (q, { SIGEV_NONE }) unexpectedly succeeded");
result = 1;
}
else if (errno != EBUSY)
{
printf ("second mq_notify (q, { SIGEV_NONE }) failed with: %m\n");
result = 1;
}
if (fct_cnt != 0)
{
printf ("fct called too early (%d on %d)\n", fct_cnt, __LINE__);
result = 1;
}
result |= mqsend (q);
result |= mqrecv (q);
result |= mqrecv (q);
if (fct_cnt != 1)
{
printf ("fct not called (%d on %d)\n", fct_cnt, __LINE__);
result = 1;
}
else if (fct_guardsize != 0)
{
printf ("fct_guardsize %zd != 0\n", fct_guardsize);
result = 1;
}
if (mq_notify (q, &ev) != 0)
{
printf ("third mq_notify (q, { SIGEV_NONE }) failed with: %m\n");
result = 1;
}
if (mq_notify (q, NULL) != 0)
{
printf ("mq_notify (q, NULL) failed with: %m\n");
result = 1;
}
memset (&ev, 0x11, sizeof (ev));
ev.sigev_notify = SIGEV_THREAD;
ev.sigev_notify_function = fct;
ev.sigev_notify_attributes = &nattr;
ev.sigev_value.sival_ptr = &q;
if (mq_notify (q, &ev) != 0)
{
printf ("mq_notify (q, { SIGEV_THREAD }) failed with: %m\n");
result = 1;
}
if (pthread_attr_setguardsize (&nattr, 0))
{
puts ("pthread_attr_t setup failed");
result = 1;
}
if (mq_notify (q, &ev) == 0)
{
puts ("second mq_notify (q, { SIGEV_NONE }) unexpectedly succeeded");
result = 1;
}
else if (errno != EBUSY)
{
printf ("second mq_notify (q, { SIGEV_NONE }) failed with: %m\n");
result = 1;
}
if (fct_cnt != 1)
{
printf ("fct called too early (%d on %d)\n", fct_cnt, __LINE__);
result = 1;
}
result |= mqsend (q);
result |= mqrecv (q);
result |= mqrecv (q);
if (fct_cnt != 2)
{
printf ("fct not called (%d on %d)\n", fct_cnt, __LINE__);
result = 1;
}
else if (fct_guardsize != 32 * ps)
{
printf ("fct_guardsize %zd != %zd\n", fct_guardsize, 32 * ps);
result = 1;
}
if (mq_notify (q, &ev) != 0)
{
printf ("third mq_notify (q, { SIGEV_NONE }) failed with: %m\n");
result = 1;
}
if (mq_notify (q, NULL) != 0)
{
printf ("mq_notify (q, NULL) failed with: %m\n");
result = 1;
}
if (pthread_attr_destroy (&nattr) != 0)
{
puts ("pthread_attr_destroy failed");
result = 1;
}
if (mq_unlink (name) != 0)
{
printf ("mq_unlink failed: %m\n");
result = 1;
}
if (mq_close (q) != 0)
{
printf ("mq_close failed: %m\n");
result = 1;
}
memset (&ev, 0x55, sizeof (ev));
ev.sigev_notify = SIGEV_THREAD;
ev.sigev_notify_function = fct;
ev.sigev_notify_attributes = NULL;
ev.sigev_value.sival_int = 0;
if (mq_notify (q, &ev) == 0)
{
puts ("mq_notify on closed mqd_t unexpectedly succeeded");
result = 1;
}
else if (errno != EBADF)
{
printf ("mq_notify on closed mqd_t did not fail with EBADF: %m\n");
result = 1;
}
if (fct_err)
result = 1;
return result;
}
#else
# define TEST_FUNCTION 0
#endif
#include "../test-skeleton.c"

109
rt/tst-mqueue7.c Normal file
View File

@ -0,0 +1,109 @@
/* Test all open message queues descriptors are closed during exec*.
Copyright (C) 2004 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Jakub Jelinek <jakub@redhat.com>, 2004.
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, write to the Free
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
#include <errno.h>
#include <fcntl.h>
#include <mqueue.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/wait.h>
#include <time.h>
#include <unistd.h>
#define OPT_AFTEREXEC 20000
static mqd_t after_exec = (mqd_t) -1;
#define CMDLINE_OPTIONS \
{ "after-exec", required_argument, NULL, OPT_AFTEREXEC },
#define CMDLINE_PROCESS \
case OPT_AFTEREXEC: \
after_exec = (mqd_t) strtoul (optarg, NULL, 0); \
break;
static int
do_after_exec (void)
{
int result = 0;
struct mq_attr attr;
if (mq_getattr (after_exec, &attr) == 0)
{
puts ("mq_getattr after exec unexpectedly succeeded");
result = 1;
}
else if (errno != EBADF)
{
printf ("mq_getattr after exec did not fail with EBADF: %m\n");
result = 1;
}
return result;
}
static int
do_test (int argc, char **argv)
{
if (after_exec != (mqd_t) -1)
return do_after_exec ();
char name[sizeof "/tst-mqueue7-" + sizeof (pid_t) * 3];
snprintf (name, sizeof (name), "/tst-mqueue7-%u", getpid ());
struct mq_attr attr = { .mq_maxmsg = 10, .mq_msgsize = 1 };
mqd_t q = mq_open (name, O_CREAT | O_EXCL | O_WRONLY, 0600, &attr);
if (q == (mqd_t) -1)
{
printf ("mq_open failed with: %m\n");
return 0;
}
else if (mq_unlink (name) != 0)
{
printf ("mq_unlink failed with: %m\n");
return 1;
}
if (mq_getattr (q, &attr) != 0)
{
printf ("mq_getattr failed: %m\n");
return 1;
}
char after_exec_arg[sizeof "--after-exec=0x" + sizeof (long) * 3];
snprintf (after_exec_arg, sizeof (after_exec_arg),
"--after-exec=0x%lx", (long) q);
char *newargv[argc + 2];
for (int i = 1; i < argc; ++i)
newargv[i - 1] = argv[i];
newargv[argc - 1] = "--direct";
newargv[argc] = after_exec_arg;
newargv[argc + 1] = NULL;
/* Verify that exec* has the effect of mq_close (q). */
execv (newargv[0], (char * const *) newargv);
printf ("execv failed: %m\n");
return 1;
}
#include "../test-skeleton.c"

9
rt/tst-timer3.c
View File

@ -9,7 +9,8 @@
#include <sys/time.h> #include <sys/time.h>
#include <sys/resource.h> #include <sys/resource.h>
#include <unistd.h> #include <unistd.h>
#include <pthread.h> #if _POSIX_THREADS
# include <pthread.h>
/* Creating timers in another thread should work too. */ /* Creating timers in another thread should work too. */
@ -77,5 +78,9 @@ do_test (void)
return 0; return 0;
} }
#define TEST_FUNCTION do_test () # define TEST_FUNCTION do_test ()
#else
# define TEST_FUNCTION 0
#endif
#include "../test-skeleton.c" #include "../test-skeleton.c"

624
rt/tst-timer4.c Normal file
View File

@ -0,0 +1,624 @@
/* Tests for POSIX timer implementation.
Copyright (C) 2004 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Jakub Jelinek <jakub@redhat.com>, 2004
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; see the file COPYING.LIB. If not,
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
#include <errno.h>
#include <signal.h>
#include <stdio.h>
#include <time.h>
#include <unistd.h>
#if _POSIX_THREADS
# include <pthread.h>
pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER;
pthread_cond_t cond = PTHREAD_COND_INITIALIZER;
timer_t timer_none, timer_sig1, timer_sig2, timer_thr1, timer_thr2;
int thr1_cnt, thr1_err;
union sigval thr1_sigval;
struct timespec thr1_ts;
static void
thr1 (union sigval sigval)
{
pthread_mutex_lock (&lock);
thr1_err = clock_gettime (CLOCK_REALTIME, &thr1_ts);
if (thr1_cnt >= 5)
{
struct itimerspec it = { };
thr1_err |= timer_settime (timer_thr1, 0, &it, NULL);
}
thr1_sigval = sigval;
++thr1_cnt;
pthread_cond_signal (&cond);
pthread_mutex_unlock (&lock);
}
int thr2_cnt, thr2_err;
union sigval thr2_sigval;
size_t thr2_guardsize;
struct timespec thr2_ts;
static void
thr2 (union sigval sigval)
{
pthread_attr_t nattr;
int err = 0;
size_t guardsize = -1;
int ret = pthread_getattr_np (pthread_self (), &nattr);
if (ret)
{
errno = ret;
printf ("pthread_getattr_np failed: %m\n");
err = 1;
}
else
{
ret = pthread_attr_getguardsize (&nattr, &guardsize);
if (ret)
{
errno = ret;
printf ("pthread_attr_getguardsize failed: %m\n");
err = 1;
}
if (pthread_attr_destroy (&nattr) != 0)
{
puts ("pthread_attr_destroy failed");
err = 1;
}
}
pthread_mutex_lock (&lock);
thr2_err = clock_gettime (CLOCK_REALTIME, &thr2_ts) | err;
if (thr2_cnt >= 5)
{
struct itimerspec it = { };
thr2_err |= timer_settime (timer_thr2, 0, &it, NULL);
}
thr2_sigval = sigval;
++thr2_cnt;
thr2_guardsize = guardsize;
pthread_cond_signal (&cond);
pthread_mutex_unlock (&lock);
}
volatile int sig1_cnt, sig1_err;
volatile union sigval sig1_sigval;
struct timespec sig1_ts;
static void
sig1_handler (int sig, siginfo_t *info, void *ctx)
{
int err = 0;
if (sig != SIGRTMIN) err |= 1 << 0;
if (info->si_signo != SIGRTMIN) err |= 1 << 1;
if (info->si_code != SI_TIMER) err |= 1 << 2;
if (clock_gettime (CLOCK_REALTIME, &sig1_ts) != 0)
err |= 1 << 3;
if (sig1_cnt >= 5)
{
struct itimerspec it = { };
if (timer_settime (timer_sig1, 0, &it, NULL))
err |= 1 << 4;
}
sig1_err |= err;
sig1_sigval = info->si_value;
++sig1_cnt;
}
volatile int sig2_cnt, sig2_err;
volatile union sigval sig2_sigval;
struct timespec sig2_ts;
static void
sig2_handler (int sig, siginfo_t *info, void *ctx)
{
int err = 0;
if (sig != SIGRTMIN + 1) err |= 1 << 0;
if (info->si_signo != SIGRTMIN + 1) err |= 1 << 1;
if (info->si_code != SI_TIMER) err |= 1 << 2;
if (clock_gettime (CLOCK_REALTIME, &sig2_ts) != 0)
err |= 1 << 3;
if (sig2_cnt >= 5)
{
struct itimerspec it = { };
if (timer_settime (timer_sig2, 0, &it, NULL))
err |= 1 << 4;
}
sig2_err |= err;
sig2_sigval = info->si_value;
++sig2_cnt;
}
/* Check if end is later or equal to start + nsec. */
static int
check_ts (const char *name, const struct timespec *start,
const struct timespec *end, long msec)
{
struct timespec ts = *start;
ts.tv_sec += msec / 1000000;
ts.tv_nsec += (msec % 1000000) * 1000;
if (ts.tv_nsec >= 1000000000)
{
++ts.tv_sec;
ts.tv_nsec -= 1000000000;
}
if (end->tv_sec < ts.tv_sec
|| (end->tv_sec == ts.tv_sec && end->tv_nsec < ts.tv_nsec))
{
printf ("timer %s invoked too soon: %ld.%09ld instead of expected %ld.%09ld\n",
name, (long) end->tv_sec, end->tv_nsec,
(long) ts.tv_sec, ts.tv_nsec);
return 1;
}
else
return 0;
}
#define TIMEOUT 15
#define TEST_FUNCTION do_test ()
static int
do_test (void)
{
int result = 0;
struct timespec ts;
if (clock_gettime (CLOCK_REALTIME, &ts) != 0)
{
printf ("clock_gettime failed: %m\n");
result = 1;
}
else
printf ("clock_gettime returned timespec = { %ld, %ld }\n",
(long) ts.tv_sec, ts.tv_nsec);
if (clock_getres (CLOCK_REALTIME, &ts) != 0)
{
printf ("clock_getres failed: %m\n");
result = 1;
}
else
printf ("clock_getres returned timespec = { %ld, %ld }\n",
(long) ts.tv_sec, ts.tv_nsec);
struct sigevent ev;
memset (&ev, 0x11, sizeof (ev));
ev.sigev_notify = SIGEV_NONE;
if (timer_create (CLOCK_REALTIME, &ev, &timer_none) != 0)
{
printf ("timer_create for timer_none failed: %m\n");
result = 1;
}
struct sigaction sa = { .sa_sigaction = sig1_handler,
.sa_flags = SA_SIGINFO };
sigemptyset (&sa.sa_mask);
sigaction (SIGRTMIN, &sa, NULL);
sa.sa_sigaction = sig2_handler;
sigaction (SIGRTMIN + 1, &sa, NULL);
memset (&ev, 0x22, sizeof (ev));
ev.sigev_notify = SIGEV_SIGNAL;
ev.sigev_signo = SIGRTMIN;
ev.sigev_value.sival_ptr = &ev;
if (timer_create (CLOCK_REALTIME, &ev, &timer_sig1) != 0)
{
printf ("timer_create for timer_sig1 failed: %m\n");
result = 1;
}
memset (&ev, 0x33, sizeof (ev));
ev.sigev_notify = SIGEV_SIGNAL;
ev.sigev_signo = SIGRTMIN + 1;
ev.sigev_value.sival_int = 163;
if (timer_create (CLOCK_REALTIME, &ev, &timer_sig2) != 0)
{
printf ("timer_create for timer_sig2 failed: %m\n");
result = 1;
}
memset (&ev, 0x44, sizeof (ev));
ev.sigev_notify = SIGEV_THREAD;
ev.sigev_notify_function = thr1;
ev.sigev_notify_attributes = NULL;
ev.sigev_value.sival_ptr = &ev;
if (timer_create (CLOCK_REALTIME, &ev, &timer_thr1) != 0)
{
printf ("timer_create for timer_thr1 failed: %m\n");
result = 1;
}
pthread_attr_t nattr;
if (pthread_attr_init (&nattr)
|| pthread_attr_setguardsize (&nattr, 0))
{
puts ("pthread_attr_t setup failed");
result = 1;
}
memset (&ev, 0x55, sizeof (ev));
ev.sigev_notify = SIGEV_THREAD;
ev.sigev_notify_function = thr2;
ev.sigev_notify_attributes = &nattr;
ev.sigev_value.sival_int = 111;
if (timer_create (CLOCK_REALTIME, &ev, &timer_thr2) != 0)
{
printf ("timer_create for timer_thr2 failed: %m\n");
result = 1;
}
int ret = timer_getoverrun (timer_thr1);
if (ret != 0)
{
if (ret == -1)
printf ("timer_getoverrun failed: %m\n");
else
printf ("timer_getoverrun returned %d != 0\n", ret);
result = 1;
}
struct itimerspec it;
it.it_value.tv_sec = 0;
it.it_value.tv_nsec = -26;
it.it_interval.tv_sec = 0;
it.it_interval.tv_nsec = 0;
if (timer_settime (timer_sig1, 0, &it, NULL) == 0)
{
puts ("timer_settime with negative tv_nsec unexpectedly succeeded");
result = 1;
}
else if (errno != EINVAL)
{
printf ("timer_settime with negative tv_nsec did not fail with "
"EINVAL: %m\n");
result = 1;
}
it.it_value.tv_nsec = 100000;
it.it_interval.tv_nsec = 1000000000;
if (timer_settime (timer_sig2, 0, &it, NULL) == 0)
{
puts ("timer_settime with tv_nsec 1000000000 unexpectedly succeeded");
result = 1;
}
else if (errno != EINVAL)
{
printf ("timer_settime with tv_nsec 1000000000 did not fail with "
"EINVAL: %m\n");
result = 1;
}
it.it_value.tv_nsec = 0;
it.it_interval.tv_nsec = -26;
if (timer_settime (timer_thr1, 0, &it, NULL) != 0)
{
printf ("timer_settime with it_value 0 it_interval invalid failed: %m\n");
/* FIXME: is this mandated by POSIX?
result = 1; */
}
it.it_interval.tv_nsec = 3000000000;
if (timer_settime (timer_thr2, 0, &it, NULL) != 0)
{
printf ("timer_settime with it_value 0 it_interval invalid failed: %m\n");
/* FIXME: is this mandated by POSIX?
result = 1; */
}
struct timespec startts;
if (clock_gettime (CLOCK_REALTIME, &startts) != 0)
{
printf ("clock_gettime failed: %m\n");
result = 1;
}
it.it_value.tv_nsec = 100000000;
it.it_interval.tv_nsec = 0;
if (timer_settime (timer_none, 0, &it, NULL) != 0)
{
printf ("timer_settime timer_none failed: %m\n");
result = 1;
}
it.it_value.tv_nsec = 200000000;
if (timer_settime (timer_thr1, 0, &it, NULL) != 0)
{
printf ("timer_settime timer_thr1 failed: %m\n");
result = 1;
}
it.it_value.tv_nsec = 300000000;
if (timer_settime (timer_thr2, 0, &it, NULL) != 0)
{
printf ("timer_settime timer_thr2 failed: %m\n");
result = 1;
}
it.it_value.tv_nsec = 400000000;
if (timer_settime (timer_sig1, 0, &it, NULL) != 0)
{
printf ("timer_settime timer_sig1 failed: %m\n");
result = 1;
}
it.it_value.tv_nsec = 500000000;
if (TEMP_FAILURE_RETRY (timer_settime (timer_sig2, 0, &it, NULL)) != 0)
{
printf ("timer_settime timer_sig2 failed: %m\n");
result = 1;
}
pthread_mutex_lock (&lock);
while (thr1_cnt == 0 || thr2_cnt == 0)
pthread_cond_wait (&cond, &lock);
pthread_mutex_unlock (&lock);
while (sig1_cnt == 0 || sig2_cnt == 0)
{
ts.tv_sec = 0;
ts.tv_nsec = 100000000;
nanosleep (&ts, NULL);
}
pthread_mutex_lock (&lock);
if (thr1_cnt != 1)
{
printf ("thr1 not called exactly once, but %d times\n", thr1_cnt);
result = 1;
}
else if (thr1_err)
{
puts ("an error occurred in thr1");
result = 1;
}
else if (thr1_sigval.sival_ptr != &ev)
{
printf ("thr1_sigval.sival_ptr %p != %p\n", thr1_sigval.sival_ptr, &ev);
result = 1;
}
else if (check_ts ("thr1", &startts, &thr1_ts, 200000))
result = 1;
if (thr2_cnt != 1)
{
printf ("thr2 not called exactly once, but %d times\n", thr2_cnt);
result = 1;
}
else if (thr2_err)
{
puts ("an error occurred in thr2");
result = 1;
}
else if (thr2_sigval.sival_int != 111)
{
printf ("thr2_sigval.sival_ptr %d != 111\n", thr2_sigval.sival_int);
result = 1;
}
else if (check_ts ("thr2", &startts, &thr2_ts, 300000))
result = 1;
else if (thr2_guardsize != 0)
{
printf ("thr2 guardsize %zd != 0\n", thr2_guardsize);
result = 1;
}
pthread_mutex_unlock (&lock);
if (sig1_cnt != 1)
{
printf ("sig1 not called exactly once, but %d times\n", sig1_cnt);
result = 1;
}
else if (sig1_err)
{
printf ("errors occurred in sig1 handler %x\n", sig1_err);
result = 1;
}
else if (sig1_sigval.sival_ptr != &ev)
{
printf ("sig1_sigval.sival_ptr %p != %p\n", sig1_sigval.sival_ptr, &ev);
result = 1;
}
else if (check_ts ("sig1", &startts, &sig1_ts, 400000))
result = 1;
if (sig2_cnt != 1)
{
printf ("sig2 not called exactly once, but %d times\n", sig2_cnt);
result = 1;
}
else if (sig2_err)
{
printf ("errors occurred in sig2 handler %x\n", sig2_err);
result = 1;
}
else if (sig2_sigval.sival_int != 163)
{
printf ("sig2_sigval.sival_ptr %d != 163\n", sig2_sigval.sival_int);
result = 1;
}
else if (check_ts ("sig2", &startts, &sig2_ts, 500000))
result = 1;
if (timer_gettime (timer_none, &it) != 0)
{
printf ("timer_gettime timer_none failed: %m\n");
result = 1;
}
else if (it.it_value.tv_sec || it.it_value.tv_nsec
|| it.it_interval.tv_sec || it.it_interval.tv_nsec)
{
printf ("timer_gettime timer_none returned { %ld.%09ld, %ld.%09ld }\n",
(long) it.it_value.tv_sec, it.it_value.tv_nsec,
(long) it.it_interval.tv_sec, it.it_interval.tv_nsec);
result = 1;
}
if (clock_gettime (CLOCK_REALTIME, &startts) != 0)
{
printf ("clock_gettime failed: %m\n");
result = 1;
}
it.it_value.tv_sec = 1;
it.it_value.tv_nsec = 0;
it.it_interval.tv_sec = 0;
it.it_interval.tv_nsec = 100000000;
if (timer_settime (timer_none, 0, &it, NULL) != 0)
{
printf ("timer_settime timer_none failed: %m\n");
result = 1;
}
it.it_value.tv_nsec = 100000000;
it.it_interval.tv_nsec = 200000000;
if (timer_settime (timer_thr1, 0, &it, NULL) != 0)
{
printf ("timer_settime timer_thr1 failed: %m\n");
result = 1;
}
it.it_value.tv_nsec = 200000000;
it.it_interval.tv_nsec = 300000000;
if (timer_settime (timer_thr2, 0, &it, NULL) != 0)
{
printf ("timer_settime timer_thr2 failed: %m\n");
result = 1;
}
it.it_value.tv_nsec = 300000000;
it.it_interval.tv_nsec = 400000000;
if (timer_settime (timer_sig1, 0, &it, NULL) != 0)
{
printf ("timer_settime timer_sig1 failed: %m\n");
result = 1;
}
it.it_value.tv_nsec = 400000000;
it.it_interval.tv_nsec = 500000000;
if (TEMP_FAILURE_RETRY (timer_settime (timer_sig2, 0, &it, NULL)) != 0)
{
printf ("timer_settime timer_sig2 failed: %m\n");
result = 1;
}
pthread_mutex_lock (&lock);
while (thr1_cnt < 6 || thr2_cnt < 6)
pthread_cond_wait (&cond, &lock);
pthread_mutex_unlock (&lock);
while (sig1_cnt < 6 || sig2_cnt < 6)
{
ts.tv_sec = 0;
ts.tv_nsec = 100000000;
nanosleep (&ts, NULL);
}
pthread_mutex_lock (&lock);
if (thr1_err)
{
puts ("an error occurred in thr1");
result = 1;
}
else if (check_ts ("thr1", &startts, &thr1_ts, 1100000 + 4 * 200000))
result = 1;
if (thr2_err)
{
puts ("an error occurred in thr2");
result = 1;
}
else if (check_ts ("thr2", &startts, &thr2_ts, 1200000 + 4 * 300000))
result = 1;
else if (thr2_guardsize != 0)
{
printf ("thr2 guardsize %zd != 0\n", thr2_guardsize);
result = 1;
}
pthread_mutex_unlock (&lock);
if (sig1_err)
{
printf ("errors occurred in sig1 handler %x\n", sig1_err);
result = 1;
}
else if (check_ts ("sig1", &startts, &sig1_ts, 1300000 + 4 * 400000))
result = 1;
if (sig2_err)
{
printf ("errors occurred in sig2 handler %x\n", sig2_err);
result = 1;
}
else if (check_ts ("sig2", &startts, &sig2_ts, 1400000 + 4 * 500000))
result = 1;
if (timer_gettime (timer_none, &it) != 0)
{
printf ("timer_gettime timer_none failed: %m\n");
result = 1;
}
else if (it.it_interval.tv_sec || it.it_interval.tv_nsec != 100000000)
{
printf ("second timer_gettime timer_none returned it_interval %ld.%09ld\n",
(long) it.it_interval.tv_sec, it.it_interval.tv_nsec);
/* FIXME: For now disabled.
result = 1; */
}
if (timer_delete (timer_none) != 0)
{
printf ("timer_delete for timer_none failed: %m\n");
result = 1;
}
if (timer_delete (timer_sig1) != 0)
{
printf ("timer_delete for timer_sig1 failed: %m\n");
result = 1;
}
if (timer_delete (timer_sig2) != 0)
{
printf ("timer_delete for timer_sig2 failed: %m\n");
result = 1;
}
if (timer_delete (timer_thr1) != 0)
{
printf ("timer_delete for timer_thr1 failed: %m\n");
result = 1;
}
if (timer_delete (timer_thr2) != 0)
{
printf ("timer_delete for timer_thr2 failed: %m\n");
result = 1;
}
return result;
}
#else
# define TEST_FUNCTION 0
#endif
#include "../test-skeleton.c"