summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'Swiften/Network/BoostTimer.h')
-rw-r--r--Swiften/Network/BoostTimer.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/Swiften/Network/BoostTimer.h b/Swiften/Network/BoostTimer.h
index 1562887..a246b75 100644
--- a/Swiften/Network/BoostTimer.h
+++ b/Swiften/Network/BoostTimer.h
@@ -3,27 +3,31 @@
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
-#include <boost/asio/io_service.hpp>
#include <boost/asio/deadline_timer.hpp>
+#include <boost/asio/io_service.hpp>
#include <boost/enable_shared_from_this.hpp>
+#include <boost/scoped_ptr.hpp>
+#include <boost/thread/mutex.hpp>
#include <Swiften/Base/API.h>
#include <Swiften/EventLoop/EventOwner.h>
#include <Swiften/Network/Timer.h>
namespace Swift {
class EventLoop;
class SWIFTEN_API BoostTimer : public Timer, public EventOwner, public boost::enable_shared_from_this<BoostTimer> {
public:
typedef boost::shared_ptr<BoostTimer> ref;
+ virtual ~BoostTimer();
+
static ref create(int milliseconds, boost::shared_ptr<boost::asio::io_service> service, EventLoop* eventLoop) {
return ref(new BoostTimer(milliseconds, service, eventLoop));
}
virtual void start();
virtual void stop();
@@ -33,10 +37,11 @@ namespace Swift {
void handleTimerTick(const boost::system::error_code& error);
private:
int timeout;
boost::shared_ptr<boost::asio::io_service> ioService;
- boost::asio::deadline_timer timer;
+ boost::scoped_ptr<boost::asio::deadline_timer> timer;
+ boost::mutex timerMutex;
EventLoop* eventLoop;
};
}