libtransport.git Changeset - 2caa10e82702

Changeset - 2caa10e82702

Parent rev.

Child rev.

[Not reviewed]

0 2 0

Jan Kaluza - 13 years ago 2012-08-06 15:37:39
hanzz.k@gmail.com

set MALLOC_CHECK_=2 in spectrum2 main process

2 files changed with 6 insertions and 0 deletions:

spectrum/src/main.cpp

spectrum_manager/src/main.cpp

0 comments (0 inline, 0 general)

spectrum/src/main.cpp

➞

Show inline comments

 	/* Change the current working directory.  This prevents the current
 		directory from being locked; hence not being able to remove it. */
 	if ((chdir(cwd)) < 0) {
 		exit(1);
+	}
 	if (freopen( "/dev/null", "r", stdin) == NULL) {
 		std::cout << "EE cannot open /dev/null. Exiting\n";
 		exit(1);
+	}
+}
 #endif
 int main(int argc, char **argv)
+{
 	Config config(argc, argv);
 	boost::program_options::variables_map vm;
 	bool no_daemon = false;
 	std::string config_file;
 	std::string jid;
 	setlocale(LC_ALL, "");
 	putenv("MALLOC_CHECK_=2");
 	putenv("MALLOC_PERTURB_=B");
 #ifndef WIN32
 	if (signal(SIGINT, spectrum_sigint_handler) == SIG_ERR) {
 		std::cout << "SIGINT handler can't be set\n";
 		return -1;
+	}
 	if (signal(SIGTERM, spectrum_sigterm_handler) == SIG_ERR) {
 		std::cout << "SIGTERM handler can't be set\n";
 		return -1;
+	}
 #endif
 	boost::program_options::options_description desc(std::string("Spectrum version: ") + SPECTRUM_VERSION + "\nUsage: spectrum [OPTIONS] <config_file.cfg>\nAllowed options");
 	desc.add_options()
 		("help,h", "help")
 		("no-daemonize,n", "Do not run spectrum as daemon")
 		("no-debug,d", "Create coredumps on crash")
 		("jid,j", boost::program_options::value<std::string>(&jid)->default_value(""), "Specify JID of transport manually")
 		("config", boost::program_options::value<std::string>(&config_file)->default_value(""), "Config file")
 		("version,v", "Shows Spectrum version")
+		;
 	try
+	{
 		boost::program_options::positional_options_description p;

spectrum_manager/src/main.cpp

➞

Show inline comments

 #include "managerconfig.h"
 #include "transport/config.h"
 #include "transport/protocol.pb.h"
 #include "Swiften/Swiften.h"
 #include "Swiften/EventLoop/SimpleEventLoop.h"
 #include <boost/foreach.hpp>
 #include <iostream>
 #include <fstream>
 #include <iterator>
 #include <algorithm>
 #include <boost/filesystem.hpp>
 #include <cstdlib>
 #include "signal.h"
 #include "sys/wait.h"
 #define WRAP(MESSAGE, TYPE) 	pbnetwork::WrapperMessage wrap; \
 	wrap.set_type(TYPE); \
 	wrap.set_payload(MESSAGE); \
 	wrap.SerializeToString(&MESSAGE);
 using namespace Transport;
 using namespace boost::filesystem;
 using namespace boost;
 std::string _data;
 static std::string searchForBinary(const std::string &binary) {
 	std::vector<std::string> path_list;
 	char * env_path = getenv("PATH");
 	if (env_path != NULL) {
 		std::string buffer = "";
 		for (int s = 0; s < strlen(env_path); s++) {
@@ @@ -547,48 +548,51 @@ int main(int argc, char **argv) @@
 			return 1;
+		}
+	}
 	catch (std::runtime_error& e)
+	{
 		std::cout << desc << "\n";
 		return 2;
+	}
 	catch (...)
+	{
 		std::cout << desc << "\n";
 		return 3;
+	}
 	if (!config.load(config_file)) {
 		std::cerr << "Can't load configuration file.\n";
 		return 4;
+	}
 	if (command.empty()) {
 		std::cout << desc << "\n";
 		return 1;
+	}
 	putenv("MALLOC_CHECK_=2");
 	putenv("MALLOC_PERTURB_=B");
 	if (command[0] == "start") {
 		start_instances(&config);
+	}
 	else if (command[0] == "stop") {
 		stop_instances(&config);
+	}
 	else if (command[0] == "status") {
 		return show_status(&config);
+	}
 	else if (command[0] == "list") {
 		show_list(&config);
+	}
 	else {
 		if (command.size() < 2) {
 			std::cout << desc << "\n";
 			return 11;
+		}
 		Swift::SimpleEventLoop eventLoop;
 		Swift::BoostNetworkFactories networkFactories(&eventLoop);
 		std::string jid = command[0];
 		command.erase(command.begin());
 		std::string cmd = boost::algorithm::join(command, " ");

0 comments (0 inline, 0 general)