libtransport.git Changeset - 6aa3e6352021

Changeset - 6aa3e6352021

Parent rev.

Child rev.

[Not reviewed]

0 3 0

Jan Kaluza - 14 years ago 2011-06-28 13:16:23
hanzz.k@gmail.com

Better server performance + preparation for handling multiple resources/clients

3 files changed with 12 insertions and 11 deletions:

include/Swiften/Server/Server.cpp

include/Swiften/Server/ServerStanzaChannel.cpp

include/Swiften/Server/ServerStanzaChannel.h

0 comments (0 inline, 0 general)

include/Swiften/Server/Server.cpp

➞

Show inline comments

 	serverFromClientSession->onDataRead.connect(boost::bind(&Server::handleDataRead, this, _1));
 	serverFromClientSession->onDataWritten.connect(boost::bind(&Server::handleDataWritten, this, _1));
 	dynamic_cast<ServerStanzaChannel *>(stanzaChannel_)->addSession(serverFromClientSession);
 	if (tlsFactory) {
 		serverFromClientSession->addTLSEncryption(tlsFactory, cert);
+	}
@@ @@ -130,8 +128,8 @@ void Server::handleDataWritten(const SafeByteArray& data) { @@
 	onDataWritten(data);
+}
 void Server::handleSessionStarted(boost::shared_ptr<ServerFromClientSession>) {
 // 	onSelfConnected(true);
 void Server::handleSessionStarted(boost::shared_ptr<ServerFromClientSession> session) {
 	dynamic_cast<ServerStanzaChannel *>(stanzaChannel_)->addSession(session);
+}
 void Server::handleSessionFinished(boost::shared_ptr<ServerFromClientSession> session) {

include/Swiften/Server/ServerStanzaChannel.cpp

➞

Show inline comments

@@ @@ -28,7 +28,7 @@ namespace { @@
+}
 void ServerStanzaChannel::addSession(boost::shared_ptr<ServerFromClientSession> session) {
 	sessions.push_back(session);
+	sessions[session->getRemoteJID().toBare().toString()].push_back(session);
 	session->onSessionFinished.connect(boost::bind(&ServerStanzaChannel::handleSessionFinished, this, _1, session));
 	session->onElementReceived.connect(boost::bind(&ServerStanzaChannel::handleElement, this, _1, session));
+}
 void ServerStanzaChannel::removeSession(boost::shared_ptr<ServerFromClientSession> session) {
 	session->onSessionFinished.disconnect(boost::bind(&ServerStanzaChannel::handleSessionFinished, this, _1, session));
 	session->onElementReceived.disconnect(boost::bind(&ServerStanzaChannel::handleElement, this, _1, session));
 	sessions.erase(std::remove(sessions.begin(), sessions.end(), session), sessions.end());
 	std::list<boost::shared_ptr<ServerFromClientSession> > &lst = sessions[session->getRemoteJID().toBare().toString()];
 	lst.erase(std::remove(lst.begin(), lst.end(), session), lst.end());
+}
 void ServerStanzaChannel::sendIQ(boost::shared_ptr<IQ> iq) {
 void ServerStanzaChannel::finishSession(const JID& to, boost::shared_ptr<Element> element) {
 	std::vector<boost::shared_ptr<ServerFromClientSession> > candidateSessions;
 	for (std::list<boost::shared_ptr<ServerFromClientSession> >::const_iterator i = sessions.begin(); i != sessions.end(); ++i) {
+	for (std::list<boost::shared_ptr<ServerFromClientSession> >::const_iterator i = sessions[to.toBare().toString()].begin(); i != sessions[to.toBare().toString()].end(); ++i) {
 		if ((*i)->getRemoteJID().equals(to, JID::WithoutResource)) {
 			(*i)->sendElement(element);
 			candidateSessions.push_back(*i);
 	for (std::vector<boost::shared_ptr<ServerFromClientSession> >::const_iterator i = candidateSessions.begin(); i != candidateSessions.end(); ++i) {
 		(*i)->finishSession();
 		sessions[to.toBare().toString()].remove(*i);
+	}
+}
 	// For a full JID, first try to route to a session with the full JID
 	if (!to.isBare()) {
 		std::list<boost::shared_ptr<ServerFromClientSession> >::const_iterator i = std::find_if(sessions.begin(), sessions.end(), HasJID(to));
 		if (i != sessions.end()) {
 		std::list<boost::shared_ptr<ServerFromClientSession> >::const_iterator i = std::find_if(sessions[stanza->getTo().toBare().toString()].begin(), sessions[stanza->getTo().toBare().toString()].end(), HasJID(to));
 		if (i != sessions[stanza->getTo().toBare().toString()].end()) {
 			(*i)->sendElement(stanza);
 			return;
+		}
 	// Look for candidate sessions
 	to = to.toBare();
 	std::vector<boost::shared_ptr<ServerFromClientSession> > candidateSessions;
 	for (std::list<boost::shared_ptr<ServerFromClientSession> >::const_iterator i = sessions.begin(); i != sessions.end(); ++i) {
+	for (std::list<boost::shared_ptr<ServerFromClientSession> >::const_iterator i = sessions[stanza->getTo().toBare().toString()].begin(); i != sessions[stanza->getTo().toBare().toString()].end(); ++i) {
 		if ((*i)->getRemoteJID().equals(to, JID::WithoutResource)) {
 			candidateSessions.push_back(*i);
 			(*i)->sendElement(stanza);

include/Swiften/Server/ServerStanzaChannel.h

➞

Show inline comments

@@ @@ -45,7 +45,8 @@ namespace Swift { @@
 		private:
 			IDGenerator idGenerator;
 			std::list<boost::shared_ptr<ServerFromClientSession> > sessions;
 			// [JID][resources][ServerFromClientSession]
 			std::map<std::string, std::list<boost::shared_ptr<ServerFromClientSession> > > sessions;
 	};
+}

0 comments (0 inline, 0 general)