[rhmessaging-commits] rhmessaging commits: r4251 - store/trunk/cpp/lib.

[rhmessaging-commits at lists.jboss.org]

Author: aconway
Date: 2010-09-02 15:35:39 -0400 (Thu, 02 Sep 2010)
New Revision: 4251

Modified:
   store/trunk/cpp/lib/JournalImpl.cpp
   store/trunk/cpp/lib/JournalImpl.h
Log:
Include queue name in journal timer late/overrun warning messages.


Modified: store/trunk/cpp/lib/JournalImpl.cpp
===================================================================
--- store/trunk/cpp/lib/JournalImpl.cpp	2010-09-02 14:59:17 UTC (rev 4250)
+++ store/trunk/cpp/lib/JournalImpl.cpp	2010-09-02 19:35:39 UTC (rev 4251)
@@ -41,8 +41,14 @@
 using qpid::management::ManagementAgent;
 namespace _qmf = qmf::com::redhat::rhm::store;
 
+InactivityFireEvent::InactivityFireEvent(JournalImpl* p, const qpid::sys::Duration timeout):
+    qpid::sys::TimerTask(timeout, "JournalInactive:"+p->id()), _parent(p) {}
+
 void InactivityFireEvent::fire() { qpid::sys::Mutex::ScopedLock sl(_ife_lock); if (_parent) _parent->flushFire(); }
 
+GetEventsFireEvent::GetEventsFireEvent(JournalImpl* p, const qpid::sys::Duration timeout):
+    qpid::sys::TimerTask(timeout, "JournalGetEvents:"+p->id()), _parent(p) {}
+
 void GetEventsFireEvent::fire() { qpid::sys::Mutex::ScopedLock sl(_gefe_lock); if (_parent) _parent->getEventsFire(); }
 
 JournalImpl::JournalImpl(qpid::sys::Timer& timer_,

Modified: store/trunk/cpp/lib/JournalImpl.h
===================================================================
--- store/trunk/cpp/lib/JournalImpl.h	2010-09-02 14:59:17 UTC (rev 4250)
+++ store/trunk/cpp/lib/JournalImpl.h	2010-09-02 19:35:39 UTC (rev 4251)
@@ -52,8 +52,7 @@
     qpid::sys::Mutex _ife_lock;
 
   public:
-    InactivityFireEvent(JournalImpl* p, const qpid::sys::Duration timeout):
-        qpid::sys::TimerTask(timeout,"JournalInactive"), _parent(p) {}
+    InactivityFireEvent(JournalImpl* p, const qpid::sys::Duration timeout);
     virtual ~InactivityFireEvent() {}
     void fire();
     inline void cancel() { qpid::sys::Mutex::ScopedLock sl(_ife_lock); _parent = 0; }
@@ -65,8 +64,7 @@
     qpid::sys::Mutex _gefe_lock;
 
   public:
-    GetEventsFireEvent(JournalImpl* p, const qpid::sys::Duration timeout):
-        qpid::sys::TimerTask(timeout,"JournalGetEvents"), _parent(p) {}
+    GetEventsFireEvent(JournalImpl* p, const qpid::sys::Duration timeout);
     virtual ~GetEventsFireEvent() {}
     void fire();
     inline void cancel() { qpid::sys::Mutex::ScopedLock sl(_gefe_lock); _parent = 0; }