From 052c4ac633a783f4e654aedf37cb3cae469c02a3 Mon Sep 17 00:00:00 2001 From: HanzZ Date: Wed, 28 Sep 2011 22:41:53 +0200 Subject: [PATCH] Use latest swiften optimizations to increase BoostConnection speed --- CMakeLists.txt | 2 +- include/transport/networkplugin.h | 2 +- include/transport/networkpluginserver.h | 2 +- src/networkplugin.cpp | 4 ++-- src/networkpluginserver.cpp | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cc976737..aa939f41 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -108,7 +108,7 @@ else() endif() if(CMAKE_BUILD_TYPE MATCHES Debug) - ADD_DEFINITIONS(-O0) + ADD_DEFINITIONS(-O3) ADD_DEFINITIONS(-ggdb) ADD_DEFINITIONS(-DDEBUG) ADD_DEFINITIONS(-Wall) diff --git a/include/transport/networkplugin.h b/include/transport/networkplugin.h index 150f4d94..9173714e 100644 --- a/include/transport/networkplugin.h +++ b/include/transport/networkplugin.h @@ -234,7 +234,7 @@ class NetworkPlugin { void handleChatStatePayload(const std::string &payload, Swift::ChatState::ChatStateType type); void handleAttentionPayload(const std::string &payload); void handleFTStartPayload(const std::string &payload); - void handleDataRead(const Swift::SafeByteArray&); + void handleDataRead(boost::shared_ptr data); void _handleConnected(bool error); void handleDisconnected(); diff --git a/include/transport/networkpluginserver.h b/include/transport/networkpluginserver.h index 13e3df75..0c05bcb9 100644 --- a/include/transport/networkpluginserver.h +++ b/include/transport/networkpluginserver.h @@ -76,7 +76,7 @@ class NetworkPluginServer { private: void handleNewClientConnection(boost::shared_ptr c); void handleSessionFinished(Backend *c); - void handleDataRead(Backend *c, const Swift::SafeByteArray&); + void handleDataRead(Backend *c, boost::shared_ptr data); void handleConnectedPayload(const std::string &payload); void handleDisconnectedPayload(const std::string &payload); diff --git a/src/networkplugin.cpp b/src/networkplugin.cpp index f002072e..2aa5ce7a 100644 --- a/src/networkplugin.cpp +++ b/src/networkplugin.cpp @@ -454,8 +454,8 @@ void NetworkPlugin::handleChatStatePayload(const std::string &data, Swift::ChatS } } -void NetworkPlugin::handleDataRead(const Swift::SafeByteArray &data) { - m_data.insert(m_data.end(), data.begin(), data.end()); +void NetworkPlugin::handleDataRead(boost::shared_ptr data) { + m_data.insert(m_data.end(), data->begin(), data->end()); while (m_data.size() != 0) { unsigned int expected_size; diff --git a/src/networkpluginserver.cpp b/src/networkpluginserver.cpp index 840fcc89..43ce5fe2 100644 --- a/src/networkpluginserver.cpp +++ b/src/networkpluginserver.cpp @@ -601,9 +601,9 @@ void NetworkPluginServer::handleFTDataPayload(const std::string &data) { LOG4CXX_INFO(logger, "handleFTDataPayload size=" << payload.data().size()); } -void NetworkPluginServer::handleDataRead(Backend *c, const Swift::SafeByteArray &data) { +void NetworkPluginServer::handleDataRead(Backend *c, boost::shared_ptr data) { // Append data to buffer - c->data.insert(c->data.end(), data.begin(), data.end()); + c->data.insert(c->data.end(), data->begin(), data->end()); // Parse data while there are some while (c->data.size() != 0) {