From 87ade132346eb2036ce681f4af7bd9b36a359529 Mon Sep 17 00:00:00 2001 From: Michael Davidsaver Date: Mon, 2 Apr 2018 12:23:41 -0700 Subject: [PATCH] Timer cleanup and hide run() --- src/misc/pv/timer.h | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/misc/pv/timer.h b/src/misc/pv/timer.h index 6b827f9..8d1f802 100644 --- a/src/misc/pv/timer.h +++ b/src/misc/pv/timer.h @@ -66,23 +66,15 @@ private: * @brief Support for delayed or periodic callback execution. * */ -class epicsShareClass Timer : public Runnable { +class epicsShareClass Timer : private Runnable { public: POINTER_DEFINITIONS(Timer); - /** - * Constructor + /** Create a new timer queue * @param threadName name for the timer thread. * @param priority thread priority */ Timer(std::string threadName, ThreadPriority priority); - /** - * Destructor - */ virtual ~Timer(); - /** - * The thread run method. This is called automatically. - */ - virtual void run(); /** * schedule a callback after a delay. * @param timerCallback the timerCallback instance. @@ -119,6 +111,8 @@ public: void dump(std::ostream& o) const; private: + virtual void run(); + // call with mutex held void addElement(TimerCallbackPtr const &timerCallback); TimerCallbackPtr head;