epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Fix up initialization. Must allow recursive calls.

Browse Source
This commit is contained in:
W. Eric Norum
2008-05-08 18:14:58 +00:00
parent 2a34e2e464
commit 893b8b6982
1 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/libCom/osi/epicsGeneralTime.c
View File

@@ -91,17 +91,30 @@ static void generalTime_InitOnce(void)
ellInit(&(pgeneralTimePvt->tep_list));
pgeneralTimePvt->tep_list_sem = epicsMutexMustCreate();
/* Initialise the "last-resort" provider on a per-architecture basis */
osdTimeInit();
}
/*
* This initialization is tricky.
* It has to allow recursive calls since osdTimeInit() may cause
* this routine to be reinvoked.
*/
void generalTime_Init(void)
{
/* We must only initialise generalTime once */
static epicsThreadOnceId onceId = EPICS_THREAD_ONCE_INIT;
static int osdTimeInitDone;
epicsThreadOnce(&onceId, (EPICSTHREADFUNC)generalTime_InitOnce, NULL);
if (osdTimeInitDone <= 0) {
epicsThreadOnce(&onceId, (EPICSTHREADFUNC)generalTime_InitOnce, NULL);
epicsMutexLock(pgeneralTimePvt->tcp_list_sem);
if (osdTimeInitDone == 0) {
osdTimeInitDone = -1;
/* Initialise the per-architecture time provider(s) */
osdTimeInit();
osdTimeInitDone = 1;
}
epicsMutexUnlock(pgeneralTimePvt->tcp_list_sem);
}
}
int epicsTimeGetCurrent(epicsTimeStamp *pDest)
@@ -178,7 +191,7 @@ static int generalTimeGetEventPriority(epicsTimeStamp *pDest,int eventNumber
{
int key;
TIME_EVENT_PROVIDER * ptep;
int status = epicsTimeERROR;
int status = epicsTimeERROR;
generalTime_Init();