libtransport.git Changeset - 330ecc6dd45f

Changeset - 330ecc6dd45f

Parent rev.

Child rev.

[Not reviewed]

0 8 0

Jan Kaluza - 14 years ago 2011-07-18 14:45:30
hanzz.k@gmail.com

Memory stats

8 files changed with 189 insertions and 14 deletions:

include/transport/networkplugin.h

include/transport/networkpluginserver.h

spectrum/src/sample.cfg

spectrum_manager/src/spectrum_manager.cfg

src/admininterface.cpp

129

src/networkplugin.cpp

src/networkpluginserver.cpp

src/pbnetwork.proto

0 comments (0 inline, 0 general)

include/transport/networkplugin.h

➞

Show inline comments

@@ @@ -104,6 +104,7 @@ class NetworkPlugin { @@
 		void send(const std::string &data);
 		void sendPong();
 		void sendMemoryUsage();
 		void pingTimeout();
 		Swift::SafeByteArray m_data;
@@ @@ -114,6 +115,7 @@ class NetworkPlugin { @@
 		boost::shared_ptr<Swift::Connection> m_conn;
 		Swift::Timer::ref m_pingTimer;
 		bool m_pingReceived;
 		double m_init_res;
 };

include/transport/networkpluginserver.h

➞

Show inline comments

@@ @@ -47,6 +47,9 @@ class NetworkPluginServer { @@
 			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);
@@ @@ -78,6 +81,7 @@ class NetworkPluginServer { @@
 		void handleChatStatePayload(const std::string &payload, Swift::ChatState::ChatStateType type);
 		void handleAuthorizationPayload(const std::string &payload);
 		void handleAttentionPayload(const std::string &payload);
 		void handleStatsPayload(Backend *c, const std::string &payload);
 		void handleUserCreated(User *user);
 		void handleRoomJoined(User *user, const std::string &room, const std::string &nickname, const std::string &password);

spectrum/src/sample.cfg

➞

Show inline comments

@@ @@ -13,8 +13,8 @@ admin_password=test @@
 users_per_backend=1
 backend=../../backends/libpurple/spectrum_libpurple_backend
 #backend=../../backends/libircclient-qt/spectrum_libircclient-qt_backend
 #protocol=prpl-jabber
 protocol=prpl-msn
 protocol=prpl-jabber
 #protocol=prpl-msn
 #protocol=prpl-icq
 [logging]

spectrum_manager/src/spectrum_manager.cfg

➞

Show inline comments

 [service]
 admin_username=admin_
 admin_password=test_
 admin_username=admin
 admin_password=test
 [servers]
 #server=localhost
 server=icq.spectrum.im
 server=msn.spectrum.im
@@ \ No newline at end of file @@
 server=localhost
 #server=icq.spectrum.im
 #server=msn.spectrum.im
@@ \ No newline at end of file @@

src/admininterface.cpp

➞

Show inline comments

@@ @@ -28,6 +28,8 @@ @@
 #include "transport/networkpluginserver.h"
 #include "storageresponder.h"
 #include "log4cxx/logger.h"
 #include "memoryusage.h"
 #include <boost/foreach.hpp>
 using namespace log4cxx;
 		int backends = m_server->getBackendCount() - 1;
 		message->setBody(boost::lexical_cast<std::string>(backends));
+	}
 	else if (message->getBody() == "res_memory") {
 		double shared = 0;
 		double rss = 0;
 #ifndef WIN32
 		process_mem_usage(shared, rss);
 #endif
 		const std::list <NetworkPluginServer::Backend *> &backends = m_server->getBackends();
 		BOOST_FOREACH(NetworkPluginServer::Backend * backend, backends) {
 			rss += backend->res;
+		}
 		message->setBody(boost::lexical_cast<std::string>(rss));
+	}
 	else if (message->getBody() == "shr_memory") {
 		double shared = 0;
 		double rss = 0;
 #ifndef WIN32
 		process_mem_usage(shared, rss);
 #endif
 		const std::list <NetworkPluginServer::Backend *> &backends = m_server->getBackends();
 		BOOST_FOREACH(NetworkPluginServer::Backend * backend, backends) {
 			shared += backend->shared;
+		}
 		message->setBody(boost::lexical_cast<std::string>(shared));
+	}
 	else if (message->getBody() == "used_memory") {
 		double shared = 0;
 		double rss = 0;
 #ifndef WIN32
 		process_mem_usage(shared, rss);
 #endif
 		rss -= shared;
 		const std::list <NetworkPluginServer::Backend *> &backends = m_server->getBackends();
 		BOOST_FOREACH(NetworkPluginServer::Backend * backend, backends) {
 			rss += backend->res - backend->shared;
+		}
 		message->setBody(boost::lexical_cast<std::string>(rss));
+	}
 	else if (message->getBody() == "average_memory_per_user") {
 		if (m_userManager->getUserCount() == 0) {
 			message->setBody(boost::lexical_cast<std::string>(0));
+		}
 		else {
 			unsigned long per_user = 0;
 			const std::list <NetworkPluginServer::Backend *> &backends = m_server->getBackends();
 			BOOST_FOREACH(NetworkPluginServer::Backend * backend, backends) {
 				per_user += (backend->res - backend->init_res);
+			}
 			message->setBody(boost::lexical_cast<std::string>(per_user / m_userManager->getUserCount()));
+		}
+	}
 	else if (message->getBody() == "res_memory_per_backend") {
 		std::string lst;
 		int id = 1;
 		const std::list <NetworkPluginServer::Backend *> &backends = m_server->getBackends();
 		BOOST_FOREACH(NetworkPluginServer::Backend * backend, backends) {
 			lst += "Backend " + boost::lexical_cast<std::string>(id) + ": " + boost::lexical_cast<std::string>(backend->res) + "\n";
 			id++;
+		}
 		message->setBody(lst);
+	}
 	else if (message->getBody() == "shr_memory_per_backend") {
 		std::string lst;
 		int id = 1;
 		const std::list <NetworkPluginServer::Backend *> &backends = m_server->getBackends();
 		BOOST_FOREACH(NetworkPluginServer::Backend * backend, backends) {
 			lst += "Backend " + boost::lexical_cast<std::string>(id) + ": " + boost::lexical_cast<std::string>(backend->shared) + "\n";
 			id++;
+		}
 		message->setBody(lst);
+	}
 	else if (message->getBody() == "used_memory_per_backend") {
 		std::string lst;
 		int id = 1;
 		const std::list <NetworkPluginServer::Backend *> &backends = m_server->getBackends();
 		BOOST_FOREACH(NetworkPluginServer::Backend * backend, backends) {
 			lst += "Backend " + boost::lexical_cast<std::string>(id) + ": " + boost::lexical_cast<std::string>(backend->res - backend->shared) + "\n";
 			id++;
+		}
 		message->setBody(lst);
+	}
 	else if (message->getBody() == "average_memory_per_user_per_backend") {
 		std::string lst;
 		int id = 1;
 		const std::list <NetworkPluginServer::Backend *> &backends = m_server->getBackends();
 		BOOST_FOREACH(NetworkPluginServer::Backend * backend, backends) {
 			if (backend->users.size() == 0) {
 				lst += "Backend " + boost::lexical_cast<std::string>(id) + ": 0\n";
+			}
 			else {
 				lst += "Backend " + boost::lexical_cast<std::string>(id) + ": " + boost::lexical_cast<std::string>((backend->init_res - backend->shared) / backend->users.size()) + "\n";
+			}
 			id++;
+		}
 		message->setBody(lst);
+	}
 	else if (message->getBody().find("help") == 0) {
 		std::string help;
 		help += "status - shows instance status\n";
 		help += "online_users - returns list of all online users\n";
 		help += "online_users_count - number of online users\n";
 		help += "online_users_per_backend - shows online users per backends\n";
 		help += "has_online_user <bare_JID> - returns 1 if user is online\n";
 		help += "backends_count - number of active backends\n";
 		help += "reload - Reloads config file\n";
 		help += "General:\n";
 		help += "    status - shows instance status\n";
 		help += "    reload - Reloads config file\n";
 		help += "Users:\n";
 		help += "    online_users - returns list of all online users\n";
 		help += "    online_users_count - number of online users\n";
 		help += "    online_users_per_backend - shows online users per backends\n";
 		help += "    has_online_user <bare_JID> - returns 1 if user is online\n";
 		help += "Backends:\n";
 		help += "    backends_count - number of active backends\n";
 		help += "Memory:\n";
 		help += "    res_memory - Total RESident memory spectrum2 and its backends use in KB\n";
 		help += "    shr_memory - Total SHaRed memory spectrum2 backends share together in KB\n";
 		help += "    used_memory - (res_memory - shr_memory)\n";
 		help += "    average_memory_per_user - (memory_used_without_any_user - res_memory)\n";
 		help += "    res_memory_per_backend - RESident memory used by backends in KB\n";
 		help += "    shr_memory_per_backend - SHaRed memory used by backends in KB\n";
 		help += "    used_memory_per_backend - (res_memory - shr_memory) per backend\n";
 		help += "    average_memory_per_user_per_backend - (memory_used_without_any_user - res_memory) per backend\n";
 		message->setBody(help);
+	}
 	else {

src/networkplugin.cpp

➞

Show inline comments

@@ @@ -31,6 +31,7 @@ @@
 #include "pbnetwork.pb.h"
 #include "log4cxx/logger.h"
 #include "log4cxx/basicconfigurator.h"
 #include "memoryusage.h"
 using namespace log4cxx;
 	m_pingTimer = m_factories->getTimerFactory()->createTimer(30000);
 	m_pingTimer->onTick.connect(boost::bind(&NetworkPlugin::pingTimeout, this));
 	connect();
 	double shared;
 	process_mem_usage(shared, m_init_res);
+}
 NetworkPlugin::~NetworkPlugin() {
@@ @@ -491,6 +495,25 @@ void NetworkPlugin::sendPong() { @@
 	send(message);
 	LOG4CXX_INFO(logger, "PONG");
 	sendMemoryUsage();
+}
 void NetworkPlugin::sendMemoryUsage() {
 	pbnetwork::Stats stats;
 	stats.set_init_res(m_init_res);
 	double res;
 	double shared;
 	process_mem_usage(shared, res);
 	stats.set_res(res);
 	stats.set_shared(shared);
 	std::string message;
 	stats.SerializeToString(&message);
 	WRAP(message, pbnetwork::WrapperMessage_Type_TYPE_STATS);
 	send(message);
+}
 void NetworkPlugin::pingTimeout() {

src/networkpluginserver.cpp

➞

Show inline comments

 	Backend *client = new Backend;
 	client->pongReceived = true;
 	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));
 	conv->handleMessage(msg);
+}
 void NetworkPluginServer::handleStatsPayload(Backend *c, const std::string &data) {
 	pbnetwork::Stats payload;
 	if (payload.ParseFromString(data) == false) {
 		// TODO: ERROR
 		return;
+	}
 	c->res = payload.res();
 	c->init_res = payload.init_res();
 	c->shared = payload.shared();
+}
 void NetworkPluginServer::handleDataRead(Backend *c, const Swift::SafeByteArray &data) {
 	c->data.insert(c->data.end(), data.begin(), data.end());
 	while (c->data.size() != 0) {
 			case pbnetwork::WrapperMessage_Type_TYPE_ATTENTION:
 				handleAttentionPayload(wrapper.payload());
 				break;
 			case pbnetwork::WrapperMessage_Type_TYPE_STATS:
 				handleStatsPayload(c, wrapper.payload());
 				break;
 			default:
 				return;
+		}

src/pbnetwork.proto

➞

Show inline comments

@@ @@ -72,6 +72,12 @@ message Status { @@
 	optional string statusMessage = 4;
+}
 message Stats {
 	required int32 res = 1;
 	required int32 init_res = 2;
 	required int32 shared = 3;
+}
 message WrapperMessage {
 	enum Type {
 		TYPE_CONNECTED 				= 1;
@@ @@ -95,6 +101,7 @@ message WrapperMessage { @@
 		TYPE_BUDDY_TYPED			= 20;
 		TYPE_AUTH_REQUEST			= 21;
 		TYPE_ATTENTION			= 22;
 		TYPE_STATS					= 23;
+	}
 	required Type type = 1;
 	optional bytes payload = 2;

0 comments (0 inline, 0 general)