Generic socket support

2 files changed, 0 insertions, 241 deletions

diff --git a/src/uscxml/concurrency/eventqueue/DelayedEventQueue.cpp b/src/uscxml/concurrency/eventqueue/DelayedEventQueue.cpp
deleted file mode 100644
index 642c4a0..0000000
--- a/src/uscxml/concurrency/eventqueue/DelayedEventQueue.cpp
+++ /dev/null
@@ -1,156 +0,0 @@
-/**
- *  @file
- *  @author     2012-2013 Stefan Radomski (stefan.radomski@cs.tu-darmstadt.de)
- *  @copyright  Simplified BSD
- *
- *  @cond
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the FreeBSD license as published by the FreeBSD
- *  project.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- *  You should have received a copy of the FreeBSD license along with this
- *  program. If not, see <http://www.opensource.org/licenses/bsd-license>.
- *  @endcond
- */
-
-#include "DelayedEventQueue.h"
-#include "uscxml/messages/Event.h"
-
-#include <glog/logging.h>
-
-#include <event2/event.h>
-#include "event2/thread.h"
-
-namespace uscxml {
-
-DelayedEventQueue::DelayedEventQueue() {
-#ifndef _WIN32
-	evthread_use_pthreads();
-#else
-	evthread_use_windows_threads();
-#endif
-	_eventLoop = event_base_new();
-	_thread = NULL;
-	_isStarted = false;
-}
-
-DelayedEventQueue::~DelayedEventQueue() {
-//    std::cout << "Deleting DelayedEventQueue" << std::endl;
-	stop();
-	if (_thread && _isStarted)
-		_thread->join();
-	if(_eventLoop)
-		event_base_free(_eventLoop);
-}
-
-void DelayedEventQueue::run(void* instance) {
-	DelayedEventQueue* INSTANCE = (DelayedEventQueue*)instance;
-	int result;
-	while(INSTANCE->_isStarted) {
-// #ifndef EVLOOP_NO_EXIT_ON_EMPTY
-//    result = event_base_dispatch(INSTANCE->_eventLoop);
-// #else
-		result = event_base_loop(INSTANCE->_eventLoop, EVLOOP_NO_EXIT_ON_EMPTY);
-//#endif
-		(void)result;
-	}
-}
-
-void DelayedEventQueue::addEvent(std::string eventId, int fd, short opMask, void (*callback)(void*, const std::string eventId), void* userData, bool persist) {
-	if(_callbackData.find(eventId) != _callbackData.end()) {
-		cancelEvent(eventId);
-	}
-
-	if (persist)
-		opMask |= EV_PERSIST;
-
-	struct event* event = event_new(_eventLoop, fd, opMask, DelayedEventQueue::fileCallback, &_callbackData[eventId]);
-
-	_callbackData[eventId].eventId = eventId;
-	_callbackData[eventId].userData = userData;
-	_callbackData[eventId].eventQueue = this;
-	_callbackData[eventId].callback = callback;
-	_callbackData[eventId].event = event;
-	_callbackData[eventId].persist = false;
-
-	event_add(event, NULL);
-
-}
-
-void DelayedEventQueue::addEvent(std::string eventId, void (*callback)(void*, const std::string eventId), uint32_t delayMs, void* userData, bool persist) {
-	if(_callbackData.find(eventId) != _callbackData.end()) {
-		cancelEvent(eventId);
-	}
-
-	struct timeval delay = {delayMs / 1000, (delayMs % 1000) * 1000};
-	struct event* event = event_new(_eventLoop, -1, (persist ? EV_PERSIST : 0), DelayedEventQueue::timerCallback, &_callbackData[eventId]);
-
-	_callbackData[eventId].eventId = eventId;
-	_callbackData[eventId].userData = userData;
-	_callbackData[eventId].eventQueue = this;
-	_callbackData[eventId].callback = callback;
-	_callbackData[eventId].event = event;
-	_callbackData[eventId].persist = persist;
-
-	event_add(event, &delay);
-}
-
-void DelayedEventQueue::cancelEvent(std::string eventId) {
-	tthread::lock_guard<tthread::recursive_mutex> lock(_mutex);
-
-	if(_callbackData.find(eventId) != _callbackData.end()) {
-		event_del(_callbackData[eventId].event);
-		event_free(_callbackData[eventId].event);
-		_callbackData.erase(eventId);
-	}
-}
-
-void DelayedEventQueue::start() {
-	_isStarted = true;
-	_thread = new tthread::thread(DelayedEventQueue::run, this);
-}
-
-void DelayedEventQueue::stop() {
-	if (_isStarted) {
-		_isStarted = false;
-		event_base_loopbreak(_eventLoop);
-	}
-	if (_thread) {
-		_thread->join();
-		delete _thread;
-	}
-}
-
-void DelayedEventQueue::dummyCallback(evutil_socket_t fd, short what, void *arg) {
-}
-
-void DelayedEventQueue::fileCallback(evutil_socket_t fd, short what, void *arg) {
-	struct callbackData *data = (struct callbackData*)arg;
-	tthread::lock_guard<tthread::recursive_mutex> lock(data->eventQueue->_mutex);
-	std::string eventId = data->eventId; // copy eventId
-	data->callback(data->userData, eventId);
-}
-
-void DelayedEventQueue::timerCallback(evutil_socket_t fd, short what, void *arg) {
-	struct callbackData *data = (struct callbackData*)arg;
-	tthread::lock_guard<tthread::recursive_mutex> lock(data->eventQueue->_mutex);
-
-	std::string eventId = data->eventId; // copy eventId
-	try {
-		data->callback(data->userData, eventId);
-	} catch (Event e) {
-		LOG(ERROR) << "Exception thrown when executing delayed event:" << std::endl << e << std::endl;
-	} catch (...) {
-		LOG(ERROR) << "Exception thrown when executing delayed event" << std::endl;
-	}
-	if (!data->persist) {
-		event_free(data->event);
-		data->eventQueue->_callbackData.erase(data->eventId);
-	}
-}
-
-}
\ No newline at end of file
diff --git a/src/uscxml/concurrency/eventqueue/DelayedEventQueue.h b/src/uscxml/concurrency/eventqueue/DelayedEventQueue.h
deleted file mode 100644
index 2248c47..0000000
--- a/src/uscxml/concurrency/eventqueue/DelayedEventQueue.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/**
- *  @file
- *  @author     2012-2013 Stefan Radomski (stefan.radomski@cs.tu-darmstadt.de)
- *  @copyright  Simplified BSD
- *
- *  @cond
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the FreeBSD license as published by the FreeBSD
- *  project.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- *  You should have received a copy of the FreeBSD license along with this
- *  program. If not, see <http://www.opensource.org/licenses/bsd-license>.
- *  @endcond
- */
-
-#ifndef DELAYEDEVENTQUEUE_H_JA6WRBVP
-#define DELAYEDEVENTQUEUE_H_JA6WRBVP
-
-#include "uscxml/concurrency/tinythread.h"
-
-
-#include "uscxml/Common.h"
-#include "event2/util.h"                // for evutil_socket_t
-#include <event2/event.h>
-
-#include <inttypes.h>
-
-#include <map>
-#include <string>
-
-namespace uscxml {
-
-class USCXML_API DelayedEventQueue {
-public:
-
-	enum OpMask {
-		DEQ_READ = EV_READ,
-		DEQ_WRITE = EV_WRITE,
-		DEQ_SIGNAL = EV_SIGNAL
-	};
-
-	struct callbackData {
-		void *userData;
-		void (*callback)(void*, const std::string eventId);
-		std::string eventId;
-		bool persist;
-		struct event *event;
-		DelayedEventQueue* eventQueue;
-	};
-
-	DelayedEventQueue();
-	virtual ~DelayedEventQueue();
-
-	void addEvent(std::string eventId, int fd, short opMask, void (*callback)(void*, const std::string eventId), void* userData, bool persist = true);
-	void addEvent(std::string eventId, void (*callback)(void*, const std::string eventId), uint32_t delayMs, void* userData, bool persist = false);
-	void cancelEvent(std::string eventId);
-
-	void start();
-	void stop();
-	static void run(void*);
-
-	bool isEmpty() {
-		return _callbackData.empty();
-	}
-
-	static void timerCallback(evutil_socket_t fd, short what, void *arg);
-	static void fileCallback(evutil_socket_t fd, short what, void *arg);
-	static void dummyCallback(evutil_socket_t fd, short what, void *arg);
-
-	bool _isStarted;
-	tthread::thread* _thread;
-	tthread::recursive_mutex _mutex;
-
-	std::map<std::string, callbackData> _callbackData;
-	struct event_base* _eventLoop;
-};
-
-}
-
-
-#endif /* end of include guard: DELAYEDEVENTQUEUE_H_JA6WRBVP */