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

libCom: actually use libComAPI.h in libCom

Browse Source
This commit is contained in:
Michael Davidsaver
2020-05-20 13:38:09 -07:00
parent b2750bbe93
commit 799e72b1e3
250 changed files with 1286 additions and 1434 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
modules/libcom/src/timer/epicsTimer.cpp
View File

@@ -15,7 +15,6 @@
#include <string>
#include <stdexcept>
#define epicsExportSharedSymbols
#include "epicsMath.h"
#include "epicsTimer.h"
#include "epicsGuard.h"
@@ -109,7 +108,7 @@ void epicsTimerQueuePassiveForC::destroy ()
delete this;
}
epicsShareFunc epicsTimerNotify::expireStatus::expireStatus ( restart_t restart ) :
LIBCOM_API epicsTimerNotify::expireStatus::expireStatus ( restart_t restart ) :
delay ( - DBL_MAX )
{
if ( restart != noRestart ) {
@@ -118,7 +117,7 @@ epicsShareFunc epicsTimerNotify::expireStatus::expireStatus ( restart_t restart
}
}
epicsShareFunc epicsTimerNotify::expireStatus::expireStatus
LIBCOM_API epicsTimerNotify::expireStatus::expireStatus
( restart_t restartIn, const double & expireDelaySec ) :
delay ( expireDelaySec )
{
@@ -132,12 +131,12 @@ epicsShareFunc epicsTimerNotify::expireStatus::expireStatus
}
}
epicsShareFunc bool epicsTimerNotify::expireStatus::restart () const
LIBCOM_API bool epicsTimerNotify::expireStatus::restart () const
{
return this->delay >= 0.0 && finite(this->delay);
}
epicsShareFunc double epicsTimerNotify::expireStatus::expirationDelay () const
LIBCOM_API double epicsTimerNotify::expireStatus::expirationDelay () const
{
if ( this->delay < 0.0 || !finite(this->delay) ) {
throw std::logic_error
@@ -146,7 +145,7 @@ epicsShareFunc double epicsTimerNotify::expireStatus::expirationDelay () const
return this->delay;
}
extern "C" epicsTimerQueuePassiveId epicsShareAPI
extern "C" epicsTimerQueuePassiveId epicsStdCall
epicsTimerQueuePassiveCreate (
epicsTimerQueueNotifyReschedule pRescheduleCallbackIn,
epicsTimerQueueNotifyQuantum pSleepQuantumCallbackIn,
@@ -163,13 +162,13 @@ extern "C" epicsTimerQueuePassiveId epicsShareAPI
}
}
extern "C" void epicsShareAPI
extern "C" void epicsStdCall
epicsTimerQueuePassiveDestroy ( epicsTimerQueuePassiveId pQueue )
{
pQueue->destroy ();
}
extern "C" double epicsShareAPI
extern "C" double epicsStdCall
epicsTimerQueuePassiveProcess ( epicsTimerQueuePassiveId pQueue )
{
try {
@@ -180,7 +179,7 @@ extern "C" double epicsShareAPI
}
}
extern "C" epicsTimerId epicsShareAPI epicsTimerQueuePassiveCreateTimer (
extern "C" epicsTimerId epicsStdCall epicsTimerQueuePassiveCreateTimer (
epicsTimerQueuePassiveId pQueue, epicsTimerCallback pCallback, void *pArg )
{
try {
@@ -191,19 +190,19 @@ extern "C" epicsTimerId epicsShareAPI epicsTimerQueuePassiveCreateTimer (
}
}
extern "C" epicsShareFunc void epicsShareAPI epicsTimerQueuePassiveDestroyTimer (
extern "C" LIBCOM_API void epicsStdCall epicsTimerQueuePassiveDestroyTimer (
epicsTimerQueuePassiveId /* pQueue */, epicsTimerId pTmr )
{
pTmr->destroy ();
}
extern "C" void epicsShareAPI epicsTimerQueuePassiveShow (
extern "C" void epicsStdCall epicsTimerQueuePassiveShow (
epicsTimerQueuePassiveId pQueue, unsigned int level )
{
pQueue->show ( level );
}
extern "C" epicsTimerQueueId epicsShareAPI
extern "C" epicsTimerQueueId epicsStdCall
epicsTimerQueueAllocate ( int okToShare, unsigned int threadPriority )
{
try {
@@ -218,12 +217,12 @@ extern "C" epicsTimerQueueId epicsShareAPI
}
}
extern "C" void epicsShareAPI epicsTimerQueueRelease ( epicsTimerQueueId pQueue )
extern "C" void epicsStdCall epicsTimerQueueRelease ( epicsTimerQueueId pQueue )
{
pQueue->release ();
}
extern "C" epicsTimerId epicsShareAPI epicsTimerQueueCreateTimer (
extern "C" epicsTimerId epicsStdCall epicsTimerQueueCreateTimer (
epicsTimerQueueId pQueue, epicsTimerCallback pCallback, void *pArg )
{
try {
@@ -234,41 +233,41 @@ extern "C" epicsTimerId epicsShareAPI epicsTimerQueueCreateTimer (
}
}
extern "C" void epicsShareAPI epicsTimerQueueShow (
extern "C" void epicsStdCall epicsTimerQueueShow (
epicsTimerQueueId pQueue, unsigned int level )
{
pQueue->show ( level );
}
extern "C" void epicsShareAPI epicsTimerQueueDestroyTimer (
extern "C" void epicsStdCall epicsTimerQueueDestroyTimer (
epicsTimerQueueId /* pQueue */, epicsTimerId pTmr )
{
pTmr->destroy ();
}
extern "C" void epicsShareAPI epicsTimerStartTime (
extern "C" void epicsStdCall epicsTimerStartTime (
epicsTimerId pTmr, const epicsTimeStamp *pTime )
{
pTmr->start ( *pTmr, *pTime );
}
extern "C" void epicsShareAPI epicsTimerStartDelay (
extern "C" void epicsStdCall epicsTimerStartDelay (
epicsTimerId pTmr, double delaySeconds )
{
pTmr->start ( *pTmr, delaySeconds );
}
extern "C" void epicsShareAPI epicsTimerCancel ( epicsTimerId pTmr )
extern "C" void epicsStdCall epicsTimerCancel ( epicsTimerId pTmr )
{
pTmr->cancel ();
}
extern "C" double epicsShareAPI epicsTimerGetExpireDelay ( epicsTimerId pTmr )
extern "C" double epicsStdCall epicsTimerGetExpireDelay ( epicsTimerId pTmr )
{
return pTmr->getExpireDelay ();
}
extern "C" void epicsShareAPI epicsTimerShow (
extern "C" void epicsStdCall epicsTimerShow (
epicsTimerId pTmr, unsigned int level )
{
pTmr->timer::show ( level );