qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From astitc...@apache.org
Subject svn commit: r802160 - in /qpid/trunk/qpid/cpp/src: CMakeLists.txt Makefile.am qpid/broker/BrokerSingleton.cpp qpid/broker/BrokerSingleton.h qpid/broker/Timer.cpp qpid/broker/Timer.h qpid/sys/Timer.cpp qpid/sys/Timer.h tests/TimerTest.cpp
Date Fri, 07 Aug 2009 19:45:57 GMT
Author: astitcher
Date: Fri Aug  7 19:45:56 2009
New Revision: 802160

URL: http://svn.apache.org/viewvc?rev=802160&view=rev
Log:
Removed unused files
Removed unused functions from Timer
Switched TimerTest to sys::Timer

Removed:
    qpid/trunk/qpid/cpp/src/qpid/broker/BrokerSingleton.cpp
    qpid/trunk/qpid/cpp/src/qpid/broker/BrokerSingleton.h
    qpid/trunk/qpid/cpp/src/qpid/broker/Timer.cpp
    qpid/trunk/qpid/cpp/src/qpid/broker/Timer.h
Modified:
    qpid/trunk/qpid/cpp/src/CMakeLists.txt
    qpid/trunk/qpid/cpp/src/Makefile.am
    qpid/trunk/qpid/cpp/src/qpid/sys/Timer.cpp
    qpid/trunk/qpid/cpp/src/qpid/sys/Timer.h
    qpid/trunk/qpid/cpp/src/tests/TimerTest.cpp

Modified: qpid/trunk/qpid/cpp/src/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/CMakeLists.txt?rev=802160&r1=802159&r2=802160&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/src/CMakeLists.txt Fri Aug  7 19:45:56 2009
@@ -533,7 +533,6 @@
      qpid/amqp_0_10/Connection.h
      qpid/amqp_0_10/Connection.cpp
      qpid/broker/Broker.cpp
-     qpid/broker/BrokerSingleton.cpp
      qpid/broker/Exchange.cpp
      qpid/broker/ExpiryPolicy.cpp
      qpid/broker/Queue.cpp
@@ -586,7 +585,6 @@
      qpid/broker/SessionHandler.h
      qpid/broker/SessionHandler.cpp
      qpid/broker/System.cpp
-     qpid/broker/Timer.cpp
      qpid/broker/TopicExchange.cpp
      qpid/broker/TxAccept.cpp
      qpid/broker/TxBuffer.cpp

Modified: qpid/trunk/qpid/cpp/src/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/Makefile.am?rev=802160&r1=802159&r2=802160&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/src/Makefile.am Fri Aug  7 19:45:56 2009
@@ -479,8 +479,6 @@
   qpid/broker/Broker.cpp \
   qpid/broker/Broker.h \
   qpid/broker/BrokerImportExport.h \
-  qpid/broker/BrokerSingleton.cpp \
-  qpid/broker/BrokerSingleton.h \
   qpid/broker/Connection.cpp \
   qpid/broker/Connection.h \
   qpid/broker/ConnectionFactory.cpp \
@@ -603,8 +601,6 @@
   qpid/broker/SignalHandler.h \
   qpid/broker/System.cpp \
   qpid/broker/System.h \
-  qpid/broker/Timer.cpp \
-  qpid/broker/Timer.h \
   qpid/broker/TopicExchange.cpp \
   qpid/broker/TopicExchange.h \
   qpid/broker/TransactionalStore.h \

Modified: qpid/trunk/qpid/cpp/src/qpid/sys/Timer.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/Timer.cpp?rev=802160&r1=802159&r2=802160&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/Timer.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/Timer.cpp Fri Aug  7 19:45:56 2009
@@ -67,13 +67,11 @@
 
 // Only allow tasks to be delayed
 void TimerTask::restart() { nextFireTime = max(nextFireTime, AbsTime(AbsTime::now(), period));
}
-void TimerTask::delayTill(AbsTime time) { period = 0; nextFireTime = max(nextFireTime, time);
}
 
 void TimerTask::cancel() {
     ScopedLock<Mutex> l(callbackLock);
     cancelled = true;
 }
-bool TimerTask::isCancelled() const { return cancelled; }
 
 Timer::Timer() :
     active(false) 

Modified: qpid/trunk/qpid/cpp/src/qpid/sys/Timer.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/Timer.h?rev=802160&r1=802159&r2=802160&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/Timer.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/Timer.h Fri Aug  7 19:45:56 2009
@@ -58,9 +58,7 @@
 
     QPID_COMMON_EXTERN void setupNextFire();
     QPID_COMMON_EXTERN void restart();
-    QPID_COMMON_EXTERN void delayTill(AbsTime fireTime);
     QPID_COMMON_EXTERN void cancel();
-    QPID_COMMON_EXTERN bool isCancelled() const;
 
 protected:
     // Must be overridden with callback

Modified: qpid/trunk/qpid/cpp/src/tests/TimerTest.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/TimerTest.cpp?rev=802160&r1=802159&r2=802160&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/TimerTest.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/TimerTest.cpp Fri Aug  7 19:45:56 2009
@@ -19,7 +19,7 @@
  * under the License.
  *
  */
-#include "qpid/broker/Timer.h"
+#include "qpid/sys/Timer.h"
 #include "qpid/sys/Monitor.h"
 #include "unit_test.h"
 #include <math.h>
@@ -28,7 +28,6 @@
 #include <boost/format.hpp>
 #include <boost/lexical_cast.hpp>
 
-using namespace qpid::broker;
 using namespace qpid::sys;
 using boost::intrusive_ptr;
 using boost::dynamic_pointer_cast;



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org


Mime
View raw message