From 6291ee3c5fa34e3b1a9df315f24268b91c8ec89b Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 27 Nov 2002 23:00:16 +0000 Subject: Update. 2002-11-27 Isamu Hasegawa * posix/regcomp.c (parse_expression): Set the bit since the back reference is used in the regular expression. * posix/regex_internal.c (re_node_set_init_1): Make it clean in case of malloc failure. (re_node_set_init_copy): Likewise. * posix/regex_internal.h (state_array_t): New structure. (re_sub_match_last_t): Likewise. (re_sub_match_top_t): Likewise. (re_match_context_t): Add new members. (re_dfa_t): Likewise. * posix/regexec.c (re_search_internal): Invoke prune_impossible_nodes to check the matching is really correct, and retry if failed. Move the routin pruning the impossible nodes from here, ... (prune_impossible_nodes): To this function. (check_matching): Invoke check_subexp_matching_top, and replace redundant checking with transit_state_bkref invocation. (proceed_next_node): Replace strncmp with memcmp. Reported by Paolo Bonzini . (update_cur_sifted_state): Remove search_subexp invocation. (search_subexp): Remove this function. (check_dst_limits_calc_pos): Use search_cur_bkref_entry for optimization. (sift_states_bkref): Use search_cur_bkref_entry for optimization. Remove unused invocation of match_ctx_add_entry. (transit_state): Invoke check_subexp_matching_top. (check_subexp_matching_top): New function. (transit_state_bkref): Remove unused array. Merge transit_state_bkref_loop. (transit_state_bkref_loop): Use get_subexp instead of sift_states_backward. Use search_cur_bkref_entry for optimization. Merge this function to transit_state_bkref. (get_subexp): New function. (get_subexp_sub): Likewise. (find_subexp_node): Likewise. (check_arrival): Likewise. (check_arrival_expand_ecl): Likewise. (check_arrival_expand_ecl_sub): Likewise. (expand_bkref_cache): Likewise. (match_ctx_init): Initialize new members. (match_ctx_clean): New function. (match_ctx_free): Release new members. (match_ctx_free_subtops): New function. (match_ctx_add_entry): Fix indent. (search_cur_bkref_entry): New function. (match_ctx_add_subtop): Likewise. (match_ctx_add_sublast): Likewise. --- nptl/sysdeps/i386/pthread_sigmask.c | 38 ---------------------------------- nptl/sysdeps/pthread/pthread_sigmask.c | 12 ++++++++++- nptl/sysdeps/x86_64/pthread_sigmask.c | 1 - 3 files changed, 11 insertions(+), 40 deletions(-) delete mode 100644 nptl/sysdeps/i386/pthread_sigmask.c delete mode 100644 nptl/sysdeps/x86_64/pthread_sigmask.c (limited to 'nptl') diff --git a/nptl/sysdeps/i386/pthread_sigmask.c b/nptl/sysdeps/i386/pthread_sigmask.c deleted file mode 100644 index aa071841db..0000000000 --- a/nptl/sysdeps/i386/pthread_sigmask.c +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright (C) 2002 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper , 2002. - - 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 -#include -#include -#include -#include - - -int -pthread_sigmask (how, newmask, oldmask) - int how; - const sigset_t *newmask; - sigset_t *oldmask; -{ - int result = INTERNAL_SYSCALL (sigprocmask, 3, how, newmask, oldmask); - - return (INTERNAL_SYSCALL_ERROR_P (result) - ? INTERNAL_SYSCALL_ERRNO (result) - : 0); -} diff --git a/nptl/sysdeps/pthread/pthread_sigmask.c b/nptl/sysdeps/pthread/pthread_sigmask.c index 8ec7cf81ee..5b46c53715 100644 --- a/nptl/sysdeps/pthread/pthread_sigmask.c +++ b/nptl/sysdeps/pthread/pthread_sigmask.c @@ -17,8 +17,10 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ +#include #include #include +#include int @@ -40,5 +42,13 @@ pthread_sigmask (how, newmask, oldmask) newmask = &local_newmask; } - return sigprocmask (how, newmask, oldmask); +#ifdef INTERNAL_SYSCALL + int result = INTERNAL_SYSCALL (sigprocmask, 3, how, newmask, oldmask); + + return (INTERNAL_SYSCALL_ERROR_P (result) + ? INTERNAL_SYSCALL_ERRNO (result) + : 0); +#else + return sigprocmask (how, newmask, oldmask) == -1 : errno : 0; +#endif } diff --git a/nptl/sysdeps/x86_64/pthread_sigmask.c b/nptl/sysdeps/x86_64/pthread_sigmask.c deleted file mode 100644 index 802d61f819..0000000000 --- a/nptl/sysdeps/x86_64/pthread_sigmask.c +++ /dev/null @@ -1 +0,0 @@ -#include "../i386/pthread_sigmask.c" -- cgit v1.2.3