Module Name: src
Committed By: christos
Date: Fri Dec 17 23:11:57 UTC 2010
Modified Files:
src/lib/libc/time: localtime.c
Log Message:
PR/44248: Antti Kantee: Fix multi-threaded localtime hang.
To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/lib/libc/time/localtime.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/time/localtime.c
diff -u src/lib/libc/time/localtime.c:1.49 src/lib/libc/time/localtime.c:1.50
--- src/lib/libc/time/localtime.c:1.49 Thu Dec 16 13:38:07 2010
+++ src/lib/libc/time/localtime.c Fri Dec 17 18:11:57 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: localtime.c,v 1.49 2010/12/16 18:38:07 christos Exp $ */
+/* $NetBSD: localtime.c,v 1.50 2010/12/17 23:11:57 christos Exp $ */
/*
** This file is in the public domain, so clarified as of
@@ -10,7 +10,7 @@
#if 0
static char elsieid[] = "@(#)localtime.c 8.9";
#else
-__RCSID("$NetBSD: localtime.c,v 1.49 2010/12/16 18:38:07 christos Exp $");
+__RCSID("$NetBSD: localtime.c,v 1.50 2010/12/17 23:11:57 christos Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -1412,7 +1412,6 @@
localtime_r(const time_t * __restrict timep, struct tm *tmp)
{
rwlock_rdlock(&lcl_lock);
- rwlock_rdlock(&lcl_lock);
tzset_unlocked();
tmp = localtime_rz(lclptr, timep, tmp);
rwlock_unlock(&lcl_lock);
