epics/epics-base
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Merge 3.15 into 3.16

Browse Source
This commit is contained in:
Andrew Johnson
2018-02-05 12:06:37 -06:00
parent eef6f3afbb 61296b8cff
commit cd8fd8a08f
2 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/ca/client/access.cpp
View File

@ -127,21 +127,10 @@ const char * ca_message_text []
static epicsThreadOnceId caClientContextIdOnce = EPICS_THREAD_ONCE_INIT; static epicsThreadOnceId caClientContextIdOnce = EPICS_THREAD_ONCE_INIT;
extern "C" void ca_client_exit_handler (void *)
{
if ( caClientContextId ) {
epicsThreadPrivateDelete ( caClientContextId );
caClientContextId = 0;
}
}
// runs once only for each process // runs once only for each process
extern "C" void ca_init_client_context ( void * ) extern "C" void ca_init_client_context ( void * )
{ {
caClientContextId = epicsThreadPrivateCreate (); caClientContextId = epicsThreadPrivateCreate ();
if ( caClientContextId ) {
epicsAtExit ( ca_client_exit_handler,0 );
}
} }
/* /*

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

@ -270,7 +270,7 @@ static int generalTimeGetEventPriority(epicsTimeStamp *pDest, int eventNumber,
} }
} }
} else { } else {
if (epicsTimeGreaterThanEqual(pDest, if (epicsTimeGreaterThanEqual(&ts,
&gtPvt.eventTime[eventNumber])) { &gtPvt.eventTime[eventNumber])) {
*pDest = ts; *pDest = ts;
gtPvt.eventTime[eventNumber] = ts; gtPvt.eventTime[eventNumber] = ts;
@ -281,7 +281,6 @@ static int generalTimeGetEventPriority(epicsTimeStamp *pDest, int eventNumber,
key = epicsInterruptLock(); key = epicsInterruptLock();
gtPvt.ErrorCounts++; gtPvt.ErrorCounts++;
epicsInterruptUnlock(key); epicsInterruptUnlock(key);
}
IFDEBUG(10) { IFDEBUG(10) {
char last[40], buff[40]; char last[40], buff[40];
@ -293,6 +292,7 @@ static int generalTimeGetEventPriority(epicsTimeStamp *pDest, int eventNumber,
" %s, using %s instead\n", " %s, using %s instead\n",
ptp->name, buff, last); ptp->name, buff, last);
} }
}
} }
break; break;
} }