+2008-04-11 Jakub Jelinek <jakub@redhat.com>
+
+ [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 <drepper@redhat.com>
* version.h (VERSION): Bump to 2.8.
/* 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
#include <string.h>
/* 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) \
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)
? current->private.time->alt_digits[number]
: NULL);
- __libc_lock_unlock (__libc_setlocale_lock);
+ __libc_rwlock_unlock (__libc_setlocale_lock);
return result;
}
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)
{
result = data->walt_digits[number];
out:
- __libc_lock_unlock (__libc_setlocale_lock);
+ __libc_rwlock_unlock (__libc_setlocale_lock);
return (wchar_t *) result;
}
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)
}
}
- __libc_lock_unlock (__libc_setlocale_lock);
+ __libc_rwlock_unlock (__libc_setlocale_lock);
if (result != -1)
*strp += maxlen;
/* 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
#include <string.h>
/* 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)
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)
{
}
out:
- __libc_lock_unlock (__libc_setlocale_lock);
+ __libc_rwlock_unlock (__libc_setlocale_lock);
}
struct era_entry *
-/* 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 <drepper@cygnus.com>, 1998.
/* 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
__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. */
}
}
- __libc_lock_unlock (__libc_setlocale_lock);
+ __libc_rwlock_unlock (__libc_setlocale_lock);
}