aboutsummaryrefslogtreecommitdiff
path: root/rt/tst-mqueue.h
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2004-04-16 20:44:32 +0000
committerUlrich Drepper <drepper@redhat.com>2004-04-16 20:44:32 +0000
commitefa8adf5f9bb4ababd27d13e37d97687dfa0a8b4 (patch)
tree38302d42474dcb0188c837637d8bd171bb059315 /rt/tst-mqueue.h
parentf93fa7d43323e152df4e5e35d97c598581db4cb3 (diff)
downloadglibc-efa8adf5f9bb4ababd27d13e37d97687dfa0a8b4.tar
glibc-efa8adf5f9bb4ababd27d13e37d97687dfa0a8b4.tar.gz
glibc-efa8adf5f9bb4ababd27d13e37d97687dfa0a8b4.tar.bz2
glibc-efa8adf5f9bb4ababd27d13e37d97687dfa0a8b4.zip
Update.
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.
Diffstat (limited to 'rt/tst-mqueue.h')
-rw-r--r--rt/tst-mqueue.h64
1 files changed, 43 insertions, 21 deletions
diff --git a/rt/tst-mqueue.h b/rt/tst-mqueue.h
index 3659795a1b..8e73be51ce 100644
--- a/rt/tst-mqueue.h
+++ b/rt/tst-mqueue.h
@@ -21,42 +21,64 @@
#include <mqueue.h>
#include <search.h>
#include <stdlib.h>
+#include <stdio.h>
#include <string.h>
+#include <sys/uio.h>
+#include <unistd.h>
-/* List of temporary files. */
-struct temp_mq_list
-{
- struct qelem q;
- char name[1];
-} *temp_mq_list;
+static int temp_mq_fd;
/* Add temporary files in list. */
static void
__attribute__ ((unused))
add_temp_mq (const char *name)
{
- size_t len = strlen (name);
- struct temp_mq_list *newp
- = (struct temp_mq_list *) calloc (sizeof (*newp) + len, 1);
- if (newp != NULL)
+ struct iovec iov[2];
+ iov[0].iov_base = (char *) name;
+ iov[0].iov_len = strlen (name);
+ iov[1].iov_base = (char *) "\n";
+ iov[1].iov_len = 1;
+ if (writev (temp_mq_fd, iov, 2) != iov[0].iov_len + 1)
+ printf ("Could not record temp mq filename %s\n", name);
+}
+
+/* Delete all temporary message queues. */
+static void
+do_cleanup (void)
+{
+ 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)
{
- memcpy (newp->name, name, len + 1);
- if (temp_mq_list == NULL)
- temp_mq_list = (struct temp_mq_list *) &newp->q;
- else
- insque (newp, temp_mq_list);
+ if (line[rets - 1] != '\n')
+ continue;
+
+ line[rets - 1] = '\0';
+ mq_unlink (line);
}
+ fclose (f);
}
-/* Delete all temporary files. */
static void
-delete_temp_mqs (void)
+do_prepare (void)
{
- while (temp_mq_list != NULL)
+ char name [] = "/tmp/tst-mqueueN.XXXXXX";
+ temp_mq_fd = mkstemp (name);
+ if (temp_mq_fd == -1)
{
- mq_unlink (temp_mq_list->name);
- temp_mq_list = (struct temp_mq_list *) temp_mq_list->q.q_forw;
+ printf ("Could not create temporary file %s: %m\n", name);
+ exit (1);
}
+ unlink (name);
}
-#define CLEANUP_HANDLER delete_temp_mqs ()
+#define PREPARE(argc, argv) do_prepare ()
+#define CLEANUP_HANDLER do_cleanup ()