From 2a4cbd456e780cc91decd87a44a6207b24dbd59d Mon Sep 17 00:00:00 2001 From: Jeff Hill Date: Thu, 15 Feb 2001 22:49:43 +0000 Subject: [PATCH] dont nanny queues --- src/libCom/timer/epicsTimerPrivate.h | 1 - src/libCom/timer/timerQueueThreadedMgr.cpp | 14 -------------- 2 files changed, 15 deletions(-) diff --git a/src/libCom/timer/epicsTimerPrivate.h b/src/libCom/timer/epicsTimerPrivate.h index 6be57c3fc..318cb3b9c 100644 --- a/src/libCom/timer/epicsTimerPrivate.h +++ b/src/libCom/timer/epicsTimerPrivate.h @@ -137,7 +137,6 @@ public: private: epicsMutex mutex; tsDLList < timerQueueThreaded > sharedQueueList; - tsDLList < timerQueueThreaded > privateQueueList; }; inline void * timer::operator new ( size_t size ) diff --git a/src/libCom/timer/timerQueueThreadedMgr.cpp b/src/libCom/timer/timerQueueThreadedMgr.cpp index 2f6181c47..916d7de74 100644 --- a/src/libCom/timer/timerQueueThreadedMgr.cpp +++ b/src/libCom/timer/timerQueueThreadedMgr.cpp @@ -36,14 +36,6 @@ timerQueueThreadedMgr::~timerQueueThreadedMgr () { epicsAutoMutex locker ( this->mutex ); - while ( timerQueueThreaded * pQ = this->sharedQueueList.get () ) { - timerQueueThreadedMgrPrivate *pPriv = pQ; - delete pPriv; - } - while ( timerQueueThreaded * pQ = this->privateQueueList.get () ) { - timerQueueThreadedMgrPrivate *pPriv = pQ; - delete pPriv; - } } timerQueueThreaded & timerQueueThreadedMgr::create ( @@ -68,9 +60,6 @@ timerQueueThreaded & timerQueueThreadedMgr::create ( if ( okToShare ) { this->sharedQueueList.add ( *pQueue ); } - else { - this->privateQueueList.add ( *pQueue ); - } return *pQueue; } @@ -83,9 +72,6 @@ void timerQueueThreadedMgr::release ( timerQueueThreaded &queue ) if ( queue.sharingOK () ) { this->sharedQueueList.remove ( queue ); } - else { - this->privateQueueList.remove ( queue ); - } timerQueueThreadedMgrPrivate *pPriv = &queue; delete pPriv; }