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

use placement new

Browse Source
This commit is contained in:
Jeff Hill
2002-10-23 22:32:39 +00:00
parent 0b66cd3811
commit 1e976b7eed
5 changed files with 80 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/libCom/timer/epicsTimer.cpp
View File

@@ -27,21 +27,10 @@
# pragma warning ( disable:4660 )
#endif
template class tsFreeList < epicsTimerForC, 0x20 >;
template class tsFreeList < epicsTimerQueuePassiveForC, 0x10 >;
template class tsFreeList < epicsTimerQueueActiveForC, 0x10 >;
template class epicsSingleton < tsFreeList < epicsTimerForC, 0x20 > >;
template class epicsSingleton < tsFreeList < epicsTimerQueuePassiveForC, 0x10 > >;
template class epicsSingleton < tsFreeList < epicsTimerQueueActiveForC, 0x10 > >;
#ifdef _MSC_VER
# pragma warning ( pop )
#endif
epicsSingleton < tsFreeList < epicsTimerForC, 0x20 > > epicsTimerForC::pFreeList;
epicsSingleton < tsFreeList < epicsTimerQueuePassiveForC, 0x10 > > epicsTimerQueuePassiveForC::pFreeList;
epicsSingleton < tsFreeList < epicsTimerQueueActiveForC, 0x10 > > epicsTimerQueueActiveForC::pFreeList;
epicsTimer::~epicsTimer () {}
epicsTimerQueueNotify::~epicsTimerQueueNotify () {}
@@ -61,7 +50,9 @@ epicsTimerForC::~epicsTimerForC ()
void epicsTimerForC::destroy ()
{
delete this;
timerQueue & queueTmp ( this->queue );
this->~epicsTimerForC ();
epicsTimerForC::operator delete ( this, queueTmp.timerForCFreeList );
}
epicsTimerNotify::expireStatus epicsTimerForC::expire ( const epicsTime & )
@@ -81,7 +72,9 @@ epicsTimerQueueActiveForC::~epicsTimerQueueActiveForC ()
void epicsTimerQueueActiveForC::release ()
{
pTimerQueueMgrEPICS->release ( *this );
epicsSingleton < timerQueueActiveMgr >::reference pMgr =
timerQueueMgrEPICS;
pMgr->release ( *this );
}
epicsTimerQueuePassiveForC::epicsTimerQueuePassiveForC
@@ -186,8 +179,9 @@ extern "C" epicsTimerQueueId epicsShareAPI
epicsTimerQueueAllocate ( int okToShare, unsigned int threadPriority )
{
try {
epicsTimerQueueActiveForC &tmr =
pTimerQueueMgrEPICS->allocate ( okToShare ? true : false, threadPriority );
epicsSingleton < timerQueueActiveMgr >::reference ref = timerQueueMgrEPICS;
epicsTimerQueueActiveForC & tmr =
ref->allocate ( okToShare ? true : false, threadPriority );
return &tmr;
}
catch ( ... ) {