libtransport.git Changeset - 090a7e5e230b

Changeset - 090a7e5e230b

Parent rev.

Child rev.

[Not reviewed]

0 4 0

Jan Kaluza - 14 years ago 2011-07-20 08:17:55
hanzz.k@gmail.com

Fixed crazy backends spawning when one backend stopped sending PONGs

4 files changed with 19 insertions and 24 deletions:

include/transport/networkpluginserver.h

include/transport/usermanager.h

src/networkpluginserver.cpp

src/usermanager.cpp

0 comments (0 inline, 0 general)

include/transport/networkpluginserver.h

➞

Show inline comments

@@ @@ -34,25 +34,25 @@ class UserManager; @@
 class User;
 class Component;
 class Buddy;
 class LocalBuddy;
 class Config;
 class NetworkConversation;
 class VCardResponder;
 class RosterResponder;
 class NetworkPluginServer {
 	public:
 		struct Backend {
-			bool pongReceived;
+			int pongReceived;
 			std::list<User *> users;
 			Swift::SafeByteArray data;
 			boost::shared_ptr<Swift::Connection> connection;
 			unsigned long res;
 			unsigned long init_res;
 			unsigned long shared;
 		};
 		NetworkPluginServer(Component *component, Config *config, UserManager *userManager);
 		virtual ~NetworkPluginServer();

include/transport/usermanager.h

➞

Show inline comments

@@ @@ -80,25 +80,25 @@ class UserManager { @@
 		UserRegistry *getUserRegistry() {
 			return m_userRegistry;
+		}
 		void connectUser(const Swift::JID &user);
 	private:
 		void handlePresence(Swift::Presence::ref presence);
 		void handleMessageReceived(Swift::Message::ref message);
 		void handleGeneralPresenceReceived(Swift::Presence::ref presence);
 		void handleProbePresence(Swift::Presence::ref presence);
 		void handleSubscription(Swift::Presence::ref presence);
-		void handleRemoveTimeout(User *user);
+		void handleRemoveTimeout(const std::string jid);
 // 		void handleDiscoInfoResponse(boost::shared_ptr<Swift::DiscoInfo> info, Swift::ErrorPayload::ref error, const Swift::JID& jid);
 		void addUser(User *user);
 		long m_onlineBuddies;
 		User *m_cachedUser;
 		std::map<std::string, User *> m_users;
 		Component *m_component;
 		StorageBackend *m_storageBackend;
 		StorageResponder *m_storageResponder;
 		UserRegistry *m_userRegistry;
 		Swift::Timer::ref m_removeTimer;
 		friend class RosterResponder;

src/networkpluginserver.cpp

➞

Show inline comments

 	buddy->setStatus(Swift::StatusShow((Swift::StatusShow::Type) payload.status()), payload.statusmessage());
 	buddy->setIconHash(payload.iconhash());
+}
 NetworkPluginServer::NetworkPluginServer(Component *component, Config *config, UserManager *userManager) {
 	m_userManager = userManager;
 	m_config = config;
 	m_component = component;
 	m_component->m_factory = new NetworkFactory(this);
 	m_userManager->onUserCreated.connect(boost::bind(&NetworkPluginServer::handleUserCreated, this, _1));
 	m_userManager->onUserDestroyed.connect(boost::bind(&NetworkPluginServer::handleUserDestroyed, this, _1));
-	m_pingTimer = component->getNetworkFactories()->getTimerFactory()->createTimer(10000);
+	m_pingTimer = component->getNetworkFactories()->getTimerFactory()->createTimer(20000);
 	m_pingTimer->onTick.connect(boost::bind(&NetworkPluginServer::pingTimeout, this));
 	m_pingTimer->start();
 	m_vcardResponder = new VCardResponder(component->getIQRouter(), userManager);
 	m_vcardResponder->onVCardRequired.connect(boost::bind(&NetworkPluginServer::handleVCardRequired, this, _1, _2, _3));
 	m_vcardResponder->onVCardUpdated.connect(boost::bind(&NetworkPluginServer::handleVCardUpdated, this, _1, _2));
 	m_vcardResponder->start();
 	m_rosterResponder = new RosterResponder(component->getIQRouter(), userManager);
 	m_rosterResponder->onBuddyAdded.connect(boost::bind(&NetworkPluginServer::handleBuddyAdded, this, _1, _2));
 	m_rosterResponder->onBuddyRemoved.connect(boost::bind(&NetworkPluginServer::handleBuddyRemoved, this, _1));
 	m_rosterResponder->onBuddyUpdated.connect(boost::bind(&NetworkPluginServer::handleBuddyUpdated, this, _1, _2));
 NetworkPluginServer::~NetworkPluginServer() {
 	m_pingTimer->stop();
 	m_server->stop();
 	m_server.reset();
 	delete m_component->m_factory;
 	delete m_vcardResponder;
 	delete m_rosterResponder;
+}
 void NetworkPluginServer::handleNewClientConnection(boost::shared_ptr<Swift::Connection> c) {
 	Backend *client = new Backend;
-	client->pongReceived = true;
+	client->pongReceived = -1;
 	client->connection = c;
 	client->res = 0;
 	client->init_res = 0;
 	client->shared = 0;
 	LOG4CXX_INFO(logger, "New backend " << client << " connected. Current backend count=" << (m_clients.size() + 1));
 	if (m_clients.size() == 0) {
 		// first backend connected, start the server, we're ready.
 		m_component->start();
+	}
 	m_clients.push_back(client);
 	c->onDisconnected.connect(boost::bind(&NetworkPluginServer::handleSessionFinished, this, client));
 	c->onDataRead.connect(boost::bind(&NetworkPluginServer::handleDataRead, this, client, _1));
 	sendPing(client);
 	client->pongReceived = -1;
 	// some users are in queue waiting for this backend
 	while(!m_waitingUsers.empty()) {
 		// There's no new backend, so stop associating users and wait for new backend,
 		// which has been already spawned in getFreeClient() call.
 		if (getFreeClient() == NULL)
 			break;
 		User *u = m_waitingUsers.front();
 		m_waitingUsers.pop_front();
 		LOG4CXX_INFO(logger, "Associating " << u->getJID().toString() << " with this backend");
+	}
+}
 void NetworkPluginServer::send(boost::shared_ptr<Swift::Connection> &c, const std::string &data) {
 	char header[4];
 	*((int*)(header)) = htonl(data.size());
 	c->write(Swift::createSafeByteArray(std::string(header, 4) + data));
+}
 void NetworkPluginServer::pingTimeout() {
 	// check ping responses
 	for (std::list<Backend *>::const_iterator it = m_clients.begin(); it != m_clients.end(); it++) {
 		if ((*it)->pongReceived) {
+		if ((*it)->pongReceived || (*it)->pongReceived == -1) {
 			sendPing((*it));
+		}
 		else {
 			exec_(CONFIG_STRING(m_config, "service.backend").c_str(), CONFIG_STRING(m_config, "service.backend_host").c_str(), CONFIG_STRING(m_config, "service.backend_port").c_str(), m_config->getConfigFile().c_str());
 			LOG4CXX_INFO(logger, "Disconnecting backend " << (*it) << ". PING response not received.");
 			(*it)->connection->disconnect();
 			(*it)->connection.reset();
+		}
+	}
 	m_pingTimer->start();
+}
 void NetworkPluginServer::handleUserCreated(User *user) {
 	Backend *c = getFreeClient();
 	if (!c) {
 		LOG4CXX_INFO(logger, "There is no backend to handle user " << user->getJID().toString() << ". Adding him to queue.");
 		m_waitingUsers.push_back(user);
 		return;
+	}
@@ @@ -895,37 +899,25 @@ void NetworkPluginServer::sendPing(Backend *c) { @@
 	send(c->connection, message);
 	c->pongReceived = false;
 // 	LOG4CXX_INFO(logger, "PING to " << c);
+}
 NetworkPluginServer::Backend *NetworkPluginServer::getFreeClient() {
 	NetworkPluginServer::Backend *c = NULL;
 	bool spawnNew = false;
 	for (std::list<Backend *>::const_iterator it = m_clients.begin(); it != m_clients.end(); it++) {
 		// This backend is free.
 		if ((*it)->users.size() < CONFIG_INT(m_config, "service.users_per_backend")) {
 			// After this user, this backend could be full, so we have to spawn new one...
 			if ((*it)->users.size() + 1 >= CONFIG_INT(m_config, "service.users_per_backend")) {
 				spawnNew = true;
+			}
 			if (c == NULL) {
 				c = *it;
+			}
 			else {
 				if ((*it)->users.size() + 1 != CONFIG_INT(m_config, "service.users_per_backend")) {
 					spawnNew = false;
 					break;
+				}
+			}
 			c = *it;
 			break;
+		}
+	}
-	if (spawnNew || c == NULL) {
 	if (c == NULL) {
 		exec_(CONFIG_STRING(m_config, "service.backend").c_str(), CONFIG_STRING(m_config, "service.backend_host").c_str(), CONFIG_STRING(m_config, "service.backend_port").c_str(), m_config->getConfigFile().c_str());
+	}
 	return c;
+}
+}

src/usermanager.cpp

➞

Show inline comments

 	user->handlePresence(presence);
 	bool isMUC = presence->getPayload<Swift::MUCPayload>() != NULL || *presence->getTo().getNode().c_str() == '#';
 	if (isMUC)
 		return;
 	if (presence->getType() == Swift::Presence::Unavailable) {
 		if (user) {
 			Swift::Presence::ref highest = m_component->getPresenceOracle()->getHighestPriorityPresence(presence->getFrom().toBare());
 			// There's no presence for this user, so disconnect
 			if (!highest || (highest && highest->getType() == Swift::Presence::Unavailable)) {
 				m_removeTimer->onTick.connect(boost::bind(&UserManager::handleRemoveTimeout, this, user));
+				m_removeTimer->onTick.connect(boost::bind(&UserManager::handleRemoveTimeout, this, user->getJID().toBare().toString()));
 				m_removeTimer->start();
+			}
+		}
 		// TODO: HANDLE MUC SOMEHOW
 // 		else if (user && Transport::instance()->protocol()->tempAccountsAllowed() && !((User *) user)->hasOpenedMUC()) {
 // 			Transport::instance()->userManager()->removeUser(user);
 // 		}
+	}
+}
 void UserManager::handleRemoveTimeout(User *user) {
 	removeUser(user);
 void UserManager::handleRemoveTimeout(const std::string jid) {
 	User *user = getUser(jid);
 	if (user) {
 		removeUser(user);
+	}
+}
 void UserManager::handleMessageReceived(Swift::Message::ref message) {
 	User *user = getUser(message->getFrom().toBare().toString());
 	if (!user ){
 		return;
+	}
 	user->getConversationManager()->handleMessageReceived(message);
+}
 void UserManager::handleGeneralPresenceReceived(Swift::Presence::ref presence) {

0 comments (0 inline, 0 general)