d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace gmt_is_set and the gmt_mutex lock with a pthread_once_t variable and

Browse Source 
an init routine run on the first invocation via _once().

MFC after:	1 week
This commit is contained in:
jhb 2009-11-20 19:21:33 +00:00
parent b850b4760d
commit 7ccf9228d7
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/libc/stdtime/localtime.c
View File

@ -235,9 +235,8 @@ static struct state gmtmem;
static char lcl_TZname[TZ_STRLEN_MAX + 1];
static int lcl_is_set;
static int gmt_is_set;
static pthread_once_t gmt_once = PTHREAD_ONCE_INIT;
static pthread_rwlock_t lcl_rwlock = PTHREAD_RWLOCK_INITIALIZER;
static pthread_mutex_t gmt_mutex = PTHREAD_MUTEX_INITIALIZER;
char * tzname[2] = {
wildabbr,
@ -1464,6 +1463,17 @@ struct tm * tmp;
return tmp;
}
static void
gmt_init(void)
{
#ifdef ALL_STATE
gmtptr = (struct state *) malloc(sizeof *gmtptr);
if (gmtptr != NULL)
#endif /* defined ALL_STATE */
gmtload(gmtptr);
}
/*
** gmtsub is to gmtime as localsub is to localtime.
*/
@ -1476,16 +1486,7 @@ struct tm * const tmp;
{
register struct tm * result;
_MUTEX_LOCK(&gmt_mutex);
if (!gmt_is_set) {
#ifdef ALL_STATE
gmtptr = (struct state *) malloc(sizeof *gmtptr);
if (gmtptr != NULL)
#endif /* defined ALL_STATE */
gmtload(gmtptr);
gmt_is_set = TRUE;
}
_MUTEX_UNLOCK(&gmt_mutex);
_once(&gmt_once, gmt_init);
result = timesub(timep, offset, gmtptr, tmp);
#ifdef TM_ZONE
/*