aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2001-07-24 07:01:51 +0000
committerUlrich Drepper <drepper@redhat.com>2001-07-24 07:01:51 +0000
commit06b5289f832efb5389778017e37a02d967ea7232 (patch)
treebb3047b619350a7b81c6e16dbd174198125fc183
parent63825a6125508cb289e76f906925af4d86f56590 (diff)
downloadglibc-06b5289f832efb5389778017e37a02d967ea7232.tar
glibc-06b5289f832efb5389778017e37a02d967ea7232.tar.gz
glibc-06b5289f832efb5389778017e37a02d967ea7232.tar.bz2
glibc-06b5289f832efb5389778017e37a02d967ea7232.zip
Update.
* locale/programs/locale.c (write_locales): Disable implicit locking for the stream. Use feof_unlocked instead of feof.
-rw-r--r--ChangeLog3
-rw-r--r--linuxthreads/ChangeLog3
-rw-r--r--linuxthreads/tst-context.c98
-rw-r--r--locale/programs/locale.c6
4 files changed, 109 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 776acd7d86..f1d13a1737 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2001-07-23 Ulrich Drepper <drepper@redhat.com>
+ * locale/programs/locale.c (write_locales): Disable implicit
+ locking for the stream. Use feof_unlocked instead of feof.
+
* sysdeps/unix/sysv/linux/i386/makecontext.S: Initialize %fs, %gs,
and floating-point status as well.
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index 1e86a66bbb..8644edae60 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,5 +1,8 @@
2001-07-23 Ulrich Drepper <drepper@redhat.com>
+ * Makefile (tests): Add tst-context.
+ * tst-context.c: New file.
+
* sysdeps/pthread/bits/stdio-lock.h: Define
_IO_cleanup_region_start_noarg.
diff --git a/linuxthreads/tst-context.c b/linuxthreads/tst-context.c
new file mode 100644
index 0000000000..cf4783dec1
--- /dev/null
+++ b/linuxthreads/tst-context.c
@@ -0,0 +1,98 @@
+#include <errno.h>
+#include <error.h>
+#include <pthread.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <ucontext.h>
+
+#include "pt-machine.h"
+
+
+#define N 4
+
+#ifdef FLOATING_STACKS
+static char stacks[N][8192];
+static ucontext_t ctx[N][2];
+static volatile int failures;
+
+static void
+fct (long int n)
+{
+ /* Just to use the thread local descriptor. */
+ printf ("%ld: in %s now\n", n, __FUNCTION__);
+ errno = 0;
+}
+
+static void *
+threadfct (void *arg)
+{
+ int n = (int) (long int) arg;
+
+ printf ("%d: %s: before makecontext\n", n, __FUNCTION__);
+
+ ctx[n][1].uc_stack.ss_sp = stacks[n];
+ ctx[n][1].uc_stack.ss_size = 8192;
+ ctx[n][1].uc_link = &ctx[n][0];
+ makecontext (&ctx[n][1], (void (*) (void)) fct, 1, (long int) n);
+
+ printf ("%d: %s: before swapcontext\n", n, __FUNCTION__);
+
+ if (swapcontext (&ctx[n][0], &ctx[n][1]) != 0)
+ {
+ ++failures;
+ printf ("%d: %s: swapcontext failed\n", n, __FUNCTION__);
+ }
+ else
+ printf ("%d: back in %s\n", n, __FUNCTION__);
+
+ return NULL;
+}
+#endif
+
+
+static volatile int global;
+
+int
+main (void)
+{
+#ifndef FLOATING_STACKS
+ puts ("not supported");
+ return 0;
+#else
+ int n;
+ pthread_t th[N];
+ ucontext_t mctx;
+
+ puts ("making contexts");
+ if (getcontext (&mctx) != 0)
+ {
+ if (errno == ENOSYS)
+ exit (0);
+
+ printf ("%s: getcontext: %m\n", __FUNCTION__);
+ exit (1);
+ }
+
+ /* Play some tricks with this context. */
+ if (++global == 1)
+ if (setcontext (&mctx) != 0)
+ {
+ printf ("%s: setcontext: %m\n", __FUNCTION__);
+ exit (1);
+ }
+ if (global != 2)
+ {
+ printf ("%s: 'global' not incremented twice\n", __FUNCTION__);
+ exit (1);
+ }
+
+ for (n = 0; n < N; ++n)
+ if (pthread_create (&th[n], NULL, threadfct, (void *) n) != 0)
+ error (EXIT_FAILURE, errno, "cannot create all threads");
+
+ for (n = 0; n < N; ++n)
+ pthread_join (th[n], NULL);
+
+ return failures;
+#endif
+}
diff --git a/locale/programs/locale.c b/locale/programs/locale.c
index 9c689d2eb6..da1c0ff7d6 100644
--- a/locale/programs/locale.c
+++ b/locale/programs/locale.c
@@ -34,6 +34,7 @@
#include <locale.h>
#include <search.h>
#include <stdio.h>
+#include <stdio_ext.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
@@ -364,7 +365,10 @@ write_locales (void)
/* Ignore non-existing files. */
continue;
- while (! feof (fp))
+ /* No threads present. */
+ __fsetlocking (fp, FSETLOCKING_BYCALLER);
+
+ while (! feof_unlocked (fp))
{
/* It is a reasonable approach to use a fix buffer here
because