libtransport.git Changeset - 052c4ac633a7

Changeset - 052c4ac633a7

Parent rev.

Child rev.

[Not reviewed]

0 5 0

HanzZ - 14 years ago 2011-09-28 22:41:53
hanzz.k@gmail.com

Use latest swiften optimizations to increase BoostConnection speed

5 files changed with 7 insertions and 7 deletions:

CMakeLists.txt

include/transport/networkplugin.h

include/transport/networkpluginserver.h

src/networkplugin.cpp

src/networkpluginserver.cpp

0 comments (0 inline, 0 general)

CMakeLists.txt

➞

Show inline comments

@@ @@ -105,13 +105,13 @@ if (LOG4CXX_FOUND) @@
 	include_directories(${LOG4CXX_INCLUDE_DIR})
 else()
 	message(FATAL_ERROR "Logging           : no (install log4cxx-devel)")
 endif()
 if(CMAKE_BUILD_TYPE MATCHES Debug)
-	ADD_DEFINITIONS(-O0)
+	ADD_DEFINITIONS(-O3)
 	ADD_DEFINITIONS(-ggdb)
 	ADD_DEFINITIONS(-DDEBUG)
 	ADD_DEFINITIONS(-Wall)
 	ADD_DEFINITIONS(-W)
 	ADD_DEFINITIONS(-Wcast-align)
 	ADD_DEFINITIONS(-Wextra -Wno-sign-compare -Wno-unused-parameter)

include/transport/networkplugin.h

➞

Show inline comments

@@ @@ -231,13 +231,13 @@ class NetworkPlugin { @@
 		void handleVCardPayload(const std::string &payload);
 		void handleBuddyChangedPayload(const std::string &payload);
 		void handleBuddyRemovedPayload(const std::string &payload);
 		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<Swift::SafeByteArray> data);
 		void _handleConnected(bool error);
 		void handleDisconnected();
 		void send(const std::string &data);
 		void sendPong();
 		void sendMemoryUsage();

include/transport/networkpluginserver.h

➞

Show inline comments

@@ @@ -73,13 +73,13 @@ class NetworkPluginServer { @@
 		void handleMessageReceived(NetworkConversation *conv, boost::shared_ptr<Swift::Message> &message);
 	private:
 		void handleNewClientConnection(boost::shared_ptr<Swift::Connection> c);
 		void handleSessionFinished(Backend *c);
-		void handleDataRead(Backend *c, const Swift::SafeByteArray&);
+		void handleDataRead(Backend *c, boost::shared_ptr<Swift::SafeByteArray> data);
 		void handleConnectedPayload(const std::string &payload);
 		void handleDisconnectedPayload(const std::string &payload);
 		void handleBuddyChangedPayload(const std::string &payload);
 		void handleConvMessagePayload(const std::string &payload, bool subject = false);
 		void handleParticipantChangedPayload(const std::string &payload);

src/networkplugin.cpp

➞

Show inline comments

 			break;
 		default:
 			break;
+	}
+}
 void NetworkPlugin::handleDataRead(const Swift::SafeByteArray &data) {
 	m_data.insert(m_data.end(), data.begin(), data.end());
 void NetworkPlugin::handleDataRead(boost::shared_ptr<Swift::SafeByteArray> data) {
 	m_data.insert(m_data.end(), data->begin(), data->end());
 	while (m_data.size() != 0) {
 		unsigned int expected_size;
 		if (m_data.size() >= 4) {
 			expected_size = *((unsigned int*) &m_data[0]);

src/networkpluginserver.cpp

➞

Show inline comments

 // 	if (!user)
 // 		return;
 	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<Swift::SafeByteArray> 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) {
 		// expected_size of wrapper message
 		unsigned int expected_size;

0 comments (0 inline, 0 general)