libtransport.git Changeset - 14ff0a11d657

Changeset - 14ff0a11d657

Parent rev.

Child rev.

[Not reviewed]

0 8 0

HanzZ - 14 years ago 2011-10-11 19:27:22
hanzz.k@gmail.com

working service.eventloop=libev config to run libpurple with eventloop

8 files changed with 40 insertions and 18 deletions:

CMakeLists.txt

backends/libpurple/geventloop.cpp

backends/libpurple/geventloop.h

backends/libpurple/main.cpp

backends/libpurple/spectrumeventloop.cpp

backends/libpurple/spectrumeventloop.h

cmake_modules/eventConfig.cmake

include/Swiften/Network/DummyNetworkFactories.h

0 comments (0 inline, 0 general)

CMakeLists.txt

➞

Show inline comments

@@ @@ -31,24 +31,27 @@ set(Boost_DIR "${CMAKE_SOURCE_DIR}/cmake_modules") @@
 find_package(Boost COMPONENTS date_time system filesystem regex thread signals REQUIRED)
 message( STATUS "Found Boost: ${Boost_LIBRARIES}, ${Boost_INCLUDE_DIR}")
 set(Protobuf_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
 find_package(Protobuf REQUIRED)
 set(IRCClientQt_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
 find_package(IRCClientQt)
 set(log4cxx_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
 find_package(log4cxx)
 set(event_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
 find_package(event)
 find_package(Doxygen)
 INCLUDE(FindQt4)
 FIND_PACKAGE(Qt4 COMPONENTS QtCore)
 # ADD_DEFINITIONS(${SWIFTEN_CFLAGS})
 ADD_DEFINITIONS(-DSUPPORT_LEGACY_CAPS)
 ADD_DEFINITIONS(-DBOOST_FILESYSTEM_VERSION=2)
 message("  Supported features")
 message("-----------------------")
 if (SQLITE3_FOUND)
@@ @@ -73,24 +76,32 @@ if (PROTOBUF_FOUND) @@
 	ADD_DEFINITIONS(-DWITH_PROTOBUF)
 	include_directories(${PROTOBUF_INCLUDE_DIRS})
 	message("Network plugins   : yes")
 	if(PURPLE_LIBRARY AND PURPLE_INCLUDE_DIR)
 		message("Libpurple plugin  : yes")
 		include_directories(${PURPLE_INCLUDE_DIR})
 		include_directories(${GLIB2_INCLUDE_DIR})
 	else()
 		message("Libpurple plugin  : no (install libpurple)")
 	endif()
 	if (HAVE_EVENT)
 		ADD_DEFINITIONS(-DWITH_LIBEVENT)
 		include_directories(${EVENT_INCLUDE_DIRS})
 		message("  libev eventloop : yes")
 	else()
 		message("  libev eventloop : no (install libev-devel)")
 	endif()
 	if(IRC_FOUND)
 		ADD_DEFINITIONS(-DIRC_SHARED)
 		message("IRC plugin        : yes")
 		include_directories(${IRC_INCLUDE_DIR})
 		include(${QT_USE_FILE})
 	else()
 		message("IRC plugin        : no (install libircclient-qt and libprotobuf-dev)")
 	endif()
 	message("Frotz plugin      : yes")
 else()

backends/libpurple/geventloop.cpp

➞

Show inline comments

@@ @@ -230,20 +230,25 @@ static PurpleEventLoopUiOps libEventLoopOps = @@
 // 	g_timeout_add_seconds,
 // #else
 	NULL,
 // #endif
 	NULL,
 	NULL,
 	NULL
 };
 #endif /* WITH_LIBEVENT*/
 PurpleEventLoopUiOps * getEventLoopUiOps(void){
 	return &eventLoopOps;
 PurpleEventLoopUiOps * getEventLoopUiOps(bool libev){
 #ifdef WITH_LIBEVENT
 	std::cout << "EPOLL\n";
 	events = g_hash_table_new_full(g_int_hash, g_int_equal, g_free, NULL);
 	return &libEventLoopOps;
 	if (libev) {
 		event_init();
 		events = g_hash_table_new_full(g_int_hash, g_int_equal, g_free, NULL);
 		return &libEventLoopOps;
+	}
 	else {
 		return &eventLoopOps;
+	}
 #endif
 	return &eventLoopOps;
+}

backends/libpurple/geventloop.h

➞

Show inline comments

@@ @@ -19,15 +19,15 @@ @@
  */
 #ifndef _HI_EVENTLOOP_H
 #define _HI_EVENTLOOP_H
 #include <glib.h>
 #include "purple.h"
 #include "eventloop.h"
 #define READ_COND  (G_IO_IN | G_IO_HUP | G_IO_ERR)
 #define WRITE_COND (G_IO_OUT | G_IO_HUP | G_IO_ERR | G_IO_NVAL)
-PurpleEventLoopUiOps * getEventLoopUiOps(void);
+PurpleEventLoopUiOps * getEventLoopUiOps(bool libev);
 #endif

backends/libpurple/main.cpp

➞

Show inline comments

 static bool initPurple(Config &cfg) {
 	bool ret;
 	purple_util_set_user_dir("./");
 	remove("./accounts.xml");
 	remove("./blist.xml");
 // 	if (m_configuration.logAreas & LOG_AREA_PURPLE)
 		purple_debug_set_ui_ops(&debugUiOps);
 		purple_debug_set_verbose(true);
 	purple_core_set_ui_ops(&coreUiOps);
 	purple_eventloop_set_ui_ops(getEventLoopUiOps());
 	std::map<std::string, std::string> unregistered = cfg.getUnregistered();
 	if (unregistered.find("service.eventloop") != unregistered.end()) {
 		purple_eventloop_set_ui_ops(getEventLoopUiOps(unregistered["service.eventloop"] == "libev"));
+	}
 	ret = purple_core_init("spectrum");
 	if (ret) {
 		static int blist_handle;
 		static int conversation_handle;
 		purple_set_blist(purple_blist_new());
 		purple_blist_load();
 		purple_prefs_load();
 		/* Good default preferences */
@@ @@ -1735,19 +1738,20 @@ int main(int argc, char **argv) { @@
 		else {
 			log4cxx::helpers::Properties p;
 			log4cxx::helpers::FileInputStream *istream = new log4cxx::helpers::FileInputStream(CONFIG_STRING(&config, "logging.backend_config"));
 			p.load(istream);
 			p.setProperty("pid", boost::lexical_cast<std::string>(getpid()));
 			p.setProperty("jid", CONFIG_STRING(&config, "service.jid"));
 			log4cxx::PropertyConfigurator::configure(p);
+		}
 		initPurple(config);
 		SpectrumEventLoop eventLoop;
 		std::map<std::string, std::string> unregistered = config.getUnregistered();
 		SpectrumEventLoop eventLoop(unregistered["service.eventloop"] == "libev");
 		np = new SpectrumNetworkPlugin(&config, &eventLoop, host, port);
 		eventLoop.run();
+	}
 	g_option_context_free(context);
+}

backends/libpurple/spectrumeventloop.cpp

➞

Show inline comments

 using namespace Swift;
 static SpectrumEventLoop *loop;
 // Fires the event's callback and frees the event
 static gboolean processEvent(void *data) {
 	Event *ev = (Event *) data;
 	LOG4CXX_INFO(logger, "got event in main thread " << ev);
 	loop->handle(ev);
 	return FALSE;
+}
 SpectrumEventLoop::SpectrumEventLoop() : m_isRunning(false) {
+SpectrumEventLoop::SpectrumEventLoop(bool libev) : m_isRunning(false) {
 	m_loop = NULL;
 	loop = this;
 	if (true) {
 		m_loop = g_main_loop_new(NULL, FALSE);
+	}
 #ifdef WITH_LIBEVENT
 	else {
 		/*struct event_base *base = (struct event_base *)*/
 		event_init();
 	if (!libev) {
 		m_loop = g_main_loop_new(NULL, FALSE);
+	}
 	return;
 #endif
 	m_loop = g_main_loop_new(NULL, FALSE);
+}
 SpectrumEventLoop::~SpectrumEventLoop() {
 	stop();
+}
 void SpectrumEventLoop::run() {
 	m_isRunning = true;
 	if (m_loop) {
 		g_main_loop_run(m_loop);
+	}
 #ifdef WITH_LIBEVENT

backends/libpurple/spectrumeventloop.h

➞

Show inline comments

@@ @@ -20,25 +20,25 @@ @@
 #ifndef SPECTRUM_EVENT_LOOP_H
 #define SPECTRUM_EVENT_LOOP_H
 #include <vector>
 #include "Swiften/EventLoop/EventLoop.h"
 #include "glib.h"
 // Event loop implementation for Spectrum
 class SpectrumEventLoop : public Swift::EventLoop {
 	public:
 		// Creates event loop according to CONFIG().eventloop settings.
 		SpectrumEventLoop();
+		SpectrumEventLoop(bool libev);
 		~SpectrumEventLoop();
 		// Executes the eventloop.
 		void run();
 		// Stops tht eventloop.
 		void stop();
 		void handle(Swift::Event *event);
 		// Posts new Swift::Event to main thread.
 		virtual void post(const Swift::Event& event);

cmake_modules/eventConfig.cmake

➞

Show inline comments

-FIND_PATH(EVENT_INCLUDE_DIRS libev/event.h)
+FIND_PATH(EVENT_INCLUDE_DIRS event.h PATH_SUFFIXES libev)
 SET(EVENT_NAMES ${EVENT_NAMES} ev libev)
 FIND_LIBRARY(EVENT_LIBRARIES NAMES ${EVENT_NAMES} PATH)
 IF(EVENT_INCLUDE_DIRS AND EVENT_LIBRARIES)
 SET(HAVE_EVENT TRUE)
 file(APPEND src/transport_config.h "#define WITH_LIBEVENT 1\n")
 ELSE(EVENT_INCLUDE_DIRS AND EVENT_LIBRARIES)
 SET (EVENT_INCLUDE_DIRS "")
 SET (EVENT_LIBRARIES "")
 ENDIF(EVENT_INCLUDE_DIRS AND EVENT_LIBRARIES)
 IF(HAVE_EVENT)
 MESSAGE(STATUS "Found Event: ${EVENT_LIBRARIES}")
+MESSAGE(STATUS "Found Event: ${EVENT_LIBRARIES} ${EVENT_INCLUDE_DIRS}")
 ENDIF(HAVE_EVENT)

include/Swiften/Network/DummyNetworkFactories.h

➞

Show inline comments

@@ @@ -27,19 +27,23 @@ namespace Swift { @@
 			DomainNameResolver* getDomainNameResolver() const {
 				return domainNameResolver;
+			}
 			ConnectionServerFactory* getConnectionServerFactory() const {
 				return connectionServerFactory;
+			}
 			virtual Swift::NATTraverser* getNATTraverser() const {
 				return 0;
+			}
 			Swift::XMLParserFactory* getXMLParserFactory() const {
 				return 0;
+			}
 		private:
 			TimerFactory* timerFactory;
 			ConnectionFactory* connectionFactory;
 			DomainNameResolver* domainNameResolver;
 			ConnectionServerFactory* connectionServerFactory;
 	};
+}

0 comments (0 inline, 0 general)