From 91e32540c463bc9a1158ce8fe668179f84c77226 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Fri, 11 Apr 2008 08:20:04 +0000 Subject: [PATCH] [BZ #5443] 2008-04-11 Jakub Jelinek [BZ #5443] * time/era.c: Transform __libc_setlocale_lock into rwlock. * time/alt_digit.c: Likewise. * wcsmbs/wcsmbsload.c: Likewise. --- ChangeLog | 7 +++++++ time/alt_digit.c | 16 ++++++++-------- time/era.c | 8 ++++---- wcsmbs/wcsmbsload.c | 8 ++++---- 4 files changed, 23 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8c755c5..49c916a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-04-11 Jakub Jelinek + + [BZ #5443] + * time/era.c: Transform __libc_setlocale_lock into rwlock. + * time/alt_digit.c: Likewise. + * wcsmbs/wcsmbsload.c: Likewise. + 2008-04-10 Ulrich Drepper * version.h (VERSION): Bump to 2.8. diff --git a/time/alt_digit.c b/time/alt_digit.c index 1a81ba1..95e4f07 100644 --- a/time/alt_digit.c +++ b/time/alt_digit.c @@ -1,5 +1,5 @@ /* Helper functions used by strftime/strptime to handle alternate digits. - Copyright (C) 1995-2001,02 Free Software Foundation, Inc. + Copyright (C) 1995-2002, 2008 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 @@ -24,7 +24,7 @@ #include /* Some of the functions here must not be used while setlocale is called. */ -__libc_lock_define (extern, __libc_setlocale_lock attribute_hidden) +__libc_rwlock_define (extern, __libc_setlocale_lock attribute_hidden) #define CURRENT(item) (current->values[_NL_ITEM_INDEX (item)].string) #define CURRENT_WSTR(item) \ @@ -77,7 +77,7 @@ _nl_get_alt_digit (unsigned int number, struct locale_data *current) if (number >= 100 || CURRENT (ALT_DIGITS)[0] == '\0') return NULL; - __libc_lock_lock (__libc_setlocale_lock); + __libc_rwlock_wrlock (__libc_setlocale_lock); if (current->private.time == NULL || ! current->private.time->alt_digits_initialized) @@ -88,7 +88,7 @@ _nl_get_alt_digit (unsigned int number, struct locale_data *current) ? current->private.time->alt_digits[number] : NULL); - __libc_lock_unlock (__libc_setlocale_lock); + __libc_rwlock_unlock (__libc_setlocale_lock); return result; } @@ -104,7 +104,7 @@ _nl_get_walt_digit (unsigned int number, struct locale_data *current) if (number >= 100 || CURRENT_WSTR (_NL_WALT_DIGITS)[0] == L'\0') return NULL; - __libc_lock_lock (__libc_setlocale_lock); + __libc_rwlock_wrlock (__libc_setlocale_lock); if (current->private.time == NULL) { @@ -141,7 +141,7 @@ _nl_get_walt_digit (unsigned int number, struct locale_data *current) result = data->walt_digits[number]; out: - __libc_lock_unlock (__libc_setlocale_lock); + __libc_rwlock_unlock (__libc_setlocale_lock); return (wchar_t *) result; } @@ -159,7 +159,7 @@ _nl_parse_alt_digit (const char **strp, struct locale_data *current) if (CURRENT_WSTR (_NL_WALT_DIGITS)[0] == L'\0') return result; - __libc_lock_lock (__libc_setlocale_lock); + __libc_rwlock_wrlock (__libc_setlocale_lock); if (current->private.time == NULL || ! current->private.time->alt_digits_initialized) @@ -184,7 +184,7 @@ _nl_parse_alt_digit (const char **strp, struct locale_data *current) } } - __libc_lock_unlock (__libc_setlocale_lock); + __libc_rwlock_unlock (__libc_setlocale_lock); if (result != -1) *strp += maxlen; diff --git a/time/era.c b/time/era.c index a8d2237..a6f4a4c 100644 --- a/time/era.c +++ b/time/era.c @@ -1,5 +1,5 @@ /* Helper functions used by strftime/strptime to handle locale-specific "eras". - Copyright (C) 1995-2001,02 Free Software Foundation, Inc. + Copyright (C) 1995-2002, 2008 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 @@ -24,7 +24,7 @@ #include /* Some of the functions here must not be used while setlocale is called. */ -__libc_lock_define (extern, __libc_setlocale_lock attribute_hidden) +__libc_rwlock_define (extern, __libc_setlocale_lock attribute_hidden) #define CURRENT(item) (current->values[_NL_ITEM_INDEX (item)].string) #define CURRENT_WORD(item) (current->values[_NL_ITEM_INDEX (item)].word) @@ -45,7 +45,7 @@ _nl_init_era_entries (struct locale_data *current) if (CURRENT_WORD (_NL_TIME_ERA_NUM_ENTRIES) == 0) return; - __libc_lock_lock (__libc_setlocale_lock); + __libc_rwlock_wrlock (__libc_setlocale_lock); if (current->private.time == NULL) { @@ -135,7 +135,7 @@ _nl_init_era_entries (struct locale_data *current) } out: - __libc_lock_unlock (__libc_setlocale_lock); + __libc_rwlock_unlock (__libc_setlocale_lock); } struct era_entry * diff --git a/wcsmbs/wcsmbsload.c b/wcsmbs/wcsmbsload.c index e82b1ff..2b46131 100644 --- a/wcsmbs/wcsmbsload.c +++ b/wcsmbs/wcsmbsload.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1998-2002,2004,2005 Free Software Foundation, Inc. +/* Copyright (C) 1998-2002,2004,2005,2008 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1998. @@ -145,7 +145,7 @@ __wcsmbs_getfct (const char *to, const char *from, size_t *nstepsp) /* Some of the functions here must not be used while setlocale is called. */ -__libc_lock_define (extern, __libc_setlocale_lock attribute_hidden) +__libc_rwlock_define (extern, __libc_setlocale_lock attribute_hidden) /* Load conversion functions for the currently selected locale. */ void @@ -153,7 +153,7 @@ internal_function __wcsmbs_load_conv (struct locale_data *new_category) { /* Acquire the lock. */ - __libc_lock_lock (__libc_setlocale_lock); + __libc_rwlock_wrlock (__libc_setlocale_lock); /* We should repeat the test since while we waited some other thread might have run this function. */ @@ -211,7 +211,7 @@ __wcsmbs_load_conv (struct locale_data *new_category) } } - __libc_lock_unlock (__libc_setlocale_lock); + __libc_rwlock_unlock (__libc_setlocale_lock); } -- 2.7.4