summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2009-11-10 21:04:55 (GMT)
committerRemko Tronçon <git@el-tramo.be>2009-11-10 21:04:55 (GMT)
commit66ced3654ad295478b33d3e4f1716f66ab4048b5 (patch)
tree8783f2a3c51b51ab83a567c9064c5f65aadee188 /Swiften/EventLoop
parent3914231a023e36881c2a760a3d8973ffdd2a18ad (diff)
downloadswift-66ced3654ad295478b33d3e4f1716f66ab4048b5.zip
swift-66ced3654ad295478b33d3e4f1716f66ab4048b5.tar.bz2
Even more Client refactoring.
Diffstat (limited to 'Swiften/EventLoop')
-rw-r--r--Swiften/EventLoop/SimpleEventLoop.cpp6
-rw-r--r--Swiften/EventLoop/SimpleEventLoop.h5
2 files changed, 8 insertions, 3 deletions
diff --git a/Swiften/EventLoop/SimpleEventLoop.cpp b/Swiften/EventLoop/SimpleEventLoop.cpp
index 8191747..7c46ed3 100644
--- a/Swiften/EventLoop/SimpleEventLoop.cpp
+++ b/Swiften/EventLoop/SimpleEventLoop.cpp
@@ -9,12 +9,18 @@ namespace Swift {
void nop() {}
SimpleEventLoop::SimpleEventLoop() : isRunning_(true) {
}
+SimpleEventLoop::~SimpleEventLoop() {
+ if (!events_.empty()) {
+ std::cerr << "Warning: Pending events in SimpleEventLoop at destruction time" << std::endl;
+ }
+}
+
void SimpleEventLoop::run() {
while (isRunning_) {
std::vector<Event> events;
{
boost::unique_lock<boost::mutex> lock(eventsMutex_);
while (events_.size() == 0) {
diff --git a/Swiften/EventLoop/SimpleEventLoop.h b/Swiften/EventLoop/SimpleEventLoop.h
index 01afdb2..bd0a07f 100644
--- a/Swiften/EventLoop/SimpleEventLoop.h
+++ b/Swiften/EventLoop/SimpleEventLoop.h
@@ -1,20 +1,20 @@
-#ifndef SWIFTEN_SimpleEventLoop_H
-#define SWIFTEN_SimpleEventLoop_H
+#pragma once
#include <vector>
#include <boost/function.hpp>
#include <boost/thread/mutex.hpp>
#include <boost/thread/condition_variable.hpp>
#include "Swiften/EventLoop/EventLoop.h"
namespace Swift {
class SimpleEventLoop : public EventLoop {
public:
SimpleEventLoop();
+ ~SimpleEventLoop();
void run();
void stop();
virtual void post(const Event& event);
@@ -25,7 +25,6 @@ namespace Swift {
bool isRunning_;
std::vector<Event> events_;
boost::mutex eventsMutex_;
boost::condition_variable eventsAvailable_;
};
}
-#endif