aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog11
-rw-r--r--localedata/ChangeLog4
-rw-r--r--localedata/SUPPORTED2
-rw-r--r--malloc/malloc.c16
-rw-r--r--posix/regex.c4
-rw-r--r--posix/tst-regex.c244
6 files changed, 274 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 5838cb5..0cb258b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2001-06-22 Jakub Jelinek <jakub@redhat.com>
+
+ * posix/regex.c (regex_compile, re_match_2_internal): Fix comment
+ typos.
+
+2001-06-01 Wolfram Gloger <wg@malloc.de>
+
+ * malloc/malloc.c (malloc_atfork, free_atfork): Use a unique value
+ ATFORK_ARENA_PTR, not 0, for the thread-specific arena pointer
+ when malloc_atfork is in use.
+
2001-06-22 Andreas Jaeger <aj@suse.de>
* sysdeps/i386/fpu/s_nextafterl.c (__nextafterl): Add parenthese
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 9958c69..c29ed46 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,7 @@
+2001-06-25 Jakub Jelinek <jakub@redhat.com>
+
+ * SUPPORTED (zh_HK): Update character map name to BIG5-HKSCS.
+
2001-06-09 Bruno Haible <haible@clisp.cons.org>
* charmaps/BIG5-HKSCS: Renamed from charmaps/BIG5HKSCS. Change
diff --git a/localedata/SUPPORTED b/localedata/SUPPORTED
index 64cc202..a790946 100644
--- a/localedata/SUPPORTED
+++ b/localedata/SUPPORTED
@@ -144,6 +144,6 @@ vi_VN UTF-8
zh_CN GB2312
zh_CN.GB18030 GB18030
zh_CN.GBK GBK
-zh_HK BIG5HKSCS
+zh_HK BIG5-HKSCS
zh_TW BIG5
zh_TW.EUC-TW EUC-TW
diff --git a/malloc/malloc.c b/malloc/malloc.c
index a9541b9..c0f70af 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -1595,6 +1595,11 @@ int __malloc_initialized = -1;
#ifndef NO_THREADS
+/* Magic value for the thread-specific arena pointer when
+ malloc_atfork() is in use. */
+
+#define ATFORK_ARENA_PTR ((Void_t*)-1)
+
/* The following two functions are registered via thread_atfork() to
make sure that the mutexes remain in a consistent state in the
fork()ed version of a thread. Also adapt the malloc and free hooks
@@ -1627,7 +1632,7 @@ ptmalloc_lock_all __MALLOC_P((void))
__free_hook = free_atfork;
/* Only the current thread may perform malloc/free calls now. */
tsd_getspecific(arena_key, save_arena);
- tsd_setspecific(arena_key, (Void_t*)0);
+ tsd_setspecific(arena_key, ATFORK_ARENA_PTR);
#endif
}
@@ -4169,6 +4174,8 @@ struct mallinfo mALLINFo()
#ifndef NO_THREADS
tsd_getspecific(arena_key, vptr);
+ if(vptr == ATFORK_ARENA_PTR)
+ vptr = (Void_t*)&main_arena;
#endif
malloc_update_mallinfo((vptr ? (arena*)vptr : &main_arena), &mi);
return mi;
@@ -4724,7 +4731,8 @@ malloc_atfork(sz, caller) size_t sz; const Void_t *caller;
mchunkptr victim;
tsd_getspecific(arena_key, vptr);
- if(!vptr) {
+ if(vptr == ATFORK_ARENA_PTR) {
+ /* We are the only thread that may allocate at all. */
if(save_malloc_hook != malloc_check) {
if(request2size(sz, nb))
return 0;
@@ -4772,10 +4780,10 @@ free_atfork(mem, caller) Void_t* mem; const Void_t *caller;
ar_ptr = arena_for_ptr(p);
tsd_getspecific(arena_key, vptr);
- if(vptr)
+ if(vptr != ATFORK_ARENA_PTR)
(void)mutex_lock(&ar_ptr->mutex);
chunk_free(ar_ptr, p);
- if(vptr)
+ if(vptr != ATFORK_ARENA_PTR)
(void)mutex_unlock(&ar_ptr->mutex);
}
diff --git a/posix/regex.c b/posix/regex.c
index 20d8b71..aedabc6 100644
--- a/posix/regex.c
+++ b/posix/regex.c
@@ -2339,7 +2339,7 @@ PREFIX(regex_compile) (ARG_PREFIX(pattern), ARG_PREFIX(size), syntax, bufp)
/* A temporary space to keep wchar_t pattern and compiled pattern. */
CHAR_T *pattern, *COMPILED_BUFFER_VAR;
size_t size;
- /* offset buffer for optimizatoin. See convert_mbs_to_wc. */
+ /* offset buffer for optimization. See convert_mbs_to_wc. */
int *mbs_offset = NULL;
/* It hold whether each wchar_t is binary data or not. */
char *is_binary = NULL;
@@ -5468,7 +5468,7 @@ PREFIX(re_match_2_internal) (bufp, ARG_PREFIX(string1), ARG_PREFIX(size1),
CHAR_T *string1 = NULL, *string2 = NULL;
/* We need the size of wchar_t buffers correspond to csize1, csize2. */
int size1 = 0, size2 = 0;
- /* offset buffer for optimizatoin. See convert_mbs_to_wc. */
+ /* offset buffer for optimization. See convert_mbs_to_wc. */
int *mbs_offset1 = NULL, *mbs_offset2 = NULL;
/* They hold whether each wchar_t is binary data or not. */
char *is_binary = NULL;
diff --git a/posix/tst-regex.c b/posix/tst-regex.c
new file mode 100644
index 0000000..436ad57
--- /dev/null
+++ b/posix/tst-regex.c
@@ -0,0 +1,244 @@
+/* Copyright (C) 2001 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 Library General Public License as
+ published by the Free Software Foundation; either version 2 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
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library 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 <spawn.h>
+#include "spawn_int.h"
+
+#include <assert.h>
+#include <errno.h>
+#include <error.h>
+#include <fcntl.h>
+#include <iconv.h>
+#include <locale.h>
+#include <mcheck.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <regex.h>
+
+
+#ifdef _POSIX_CPUTIME
+static clockid_t cl;
+static int use_clock;
+#endif
+
+static int run_test (const char *expr, const char *mem, size_t memlen);
+
+
+int
+main (void)
+{
+ const char *file;
+ char *mem;
+ char *umem;
+ size_t memlen;
+ int fd;
+ struct stat st;
+#ifdef _POSIX_CPUTIME
+ unsigned int sum = 0;
+#endif
+ size_t offset;
+ int result;
+ char *inmem;
+ char *outmem;
+ size_t inlen;
+ size_t outlen;
+ iconv_t cd;
+ char *expr;
+ char *uexpr;
+
+ mtrace ();
+
+ /* Make the content of the file available in memory. */
+ file = "../ChangeLog.8";
+ fd = open (file, O_RDONLY);
+ if (fd == -1)
+ error (EXIT_FAILURE, errno, "cannot open %s", basename (file));
+
+ if (fstat (fd, &st) != 0)
+ error (EXIT_FAILURE, errno, "cannot stat %s", basename (file));
+ memlen = st.st_size;
+
+ mem = (char *) malloc (memlen + 1);
+ if (mem == NULL)
+ error (EXIT_FAILURE, errno, "while allocating buffer");
+
+ if (read (fd, mem, memlen) != memlen)
+ error (EXIT_FAILURE, 0, "cannot read entire file");
+ mem[memlen] = '\0';
+
+ close (fd);
+
+#ifdef _POSIX_CPUTIME
+ /* If possible we will time the regex calls. */
+ use_clock = clock_getcpuclockid (0, &cl) == 0;
+
+ /* Now make sure the file is actually loaded. */
+ if (use_clock)
+ {
+ for (offset = 0; offset < memlen; ++offset)
+ sum += mem[offset];
+ /* We print it so that the compiler cannnot optimize the loop away. */
+ printf ("sum = %u\n", sum);
+ }
+#endif
+
+ /* First test: search with an ISO-8859-1 locale. */
+ if (setlocale (LC_ALL, "de_DE.ISO-8859-1") == NULL)
+ error (EXIT_FAILURE, 0, "cannot set locale de_DE.ISO-8859-1");
+
+ /* This is the expression we'll use. */
+ expr = "[äáàâéèêíìîñöóòôüúùû]";
+
+ puts ("\nTest with 8-bit locale");
+ result = run_test (expr, mem, memlen);
+
+ /* Second test: search with an UTF-8 locale. */
+ if (setlocale (LC_ALL, "de_DE.UTF-8") == NULL)
+ error (EXIT_FAILURE, 0, "cannot set locale de_DE.UTF-8");
+
+ /* For the second test we have to convert the file to UTF-8. */
+ umem = (char *) malloc (2 * memlen);
+ if (umem == NULL)
+ error (EXIT_FAILURE, errno, "while allocating buffer");
+
+ cd = iconv_open ("UTF-8", "ISO-8859-1");
+ if (cd == (iconv_t) -1)
+ error (EXIT_FAILURE, errno, "cannot get conversion descriptor");
+
+ inmem = mem;
+ inlen = memlen;
+ outmem = umem;
+ outlen = 2 * memlen;
+ iconv (cd, &inmem, &inlen, &outmem, &outlen);
+ if (inlen != 0)
+ error (EXIT_FAILURE, errno, "cannot convert buffer");
+
+ inmem = expr;
+ inlen = strlen (expr);
+ outlen = inlen * MB_CUR_MAX;
+ outmem = uexpr = alloca (outlen + 1);
+ iconv (cd, &inmem, &inlen, &outmem, &outlen);
+ if (inlen != 0)
+ error (EXIT_FAILURE, errno, "cannot convert expression");
+
+ iconv_close (cd);
+
+ /* Run the tests. */
+ puts ("\nTest with multi-byte locale");
+ result |= run_test (uexpr, umem, 2 * memlen - outlen);
+
+ /* Free the resources. */
+ free (mem);
+
+ return result;
+}
+
+
+static int
+run_test (const char *expr, const char *mem, size_t memlen)
+{
+#ifdef _POSIX_CPUTIME
+ struct timespec start;
+ struct timespec finish;
+#endif
+ regex_t re;
+ int err;
+ size_t offset;
+ int cnt;
+
+#ifdef _POSIX_CPUTIME
+ if (use_clock)
+ use_clock = clock_gettime (cl, &start) == 0;
+#endif
+
+ err = regcomp (&re, expr, 0);
+ if (err != REG_NOERROR)
+ {
+ char buf[200];
+ regerror (err, &re, buf, sizeof buf);
+ error (EXIT_FAILURE, 0, "cannot compile expression: %s", buf);
+ }
+
+ cnt = 0;
+ offset = 0;
+ assert (mem[memlen] == '\0');
+ while (offset < memlen)
+ {
+ regmatch_t ma[1];
+ const char *sp;
+ const char *ep;
+
+ err = regexec (&re, mem + offset, 1, ma, 0);
+ if (err == REG_NOMATCH)
+ break;
+
+ if (err != REG_NOERROR)
+ {
+ char buf[200];
+ regerror (err, &re, buf, sizeof buf);
+ error (EXIT_FAILURE, 0, "cannot use expression: %s", buf);
+ }
+
+ assert (ma[0].rm_so >= 0);
+ sp = mem + offset + ma[0].rm_so;
+ while (sp > expr && sp[-1] != '\n')
+ --sp;
+
+ ep = mem + offset + ma[0].rm_so;
+ while (*ep != '\0' && *ep != '\n')
+ ++ep;
+
+ printf ("match %d: \"%.*s\"\n", ++cnt, (int) (ep - sp), sp);
+
+ offset = ep + 1 - mem;
+ }
+
+ regfree (&re);
+
+#ifdef _POSIX_CPUTIME
+ if (use_clock)
+ {
+ use_clock = clock_gettime (cl, &finish) == 0;
+ if (use_clock)
+ {
+ if (finish.tv_nsec < start.tv_nsec)
+ {
+ finish.tv_nsec -= start.tv_nsec - 1000000000;
+ finish.tv_sec -= 1 + start.tv_sec;
+ }
+ else
+ {
+ finish.tv_nsec -= start.tv_nsec;
+ finish.tv_sec -= start.tv_sec;
+ }
+
+ printf ("elapsed time: %ld.%09ld sec\n",
+ finish.tv_sec, finish.tv_nsec);
+ }
+ }
+#endif
+
+ /* Return an error if the number of matches found is not match we
+ expect. */
+ return cnt != 2;
+}