libtransport.git Changeset - 3a76b3435abb

Changeset - 3a76b3435abb

Parent rev.

Child rev.

[Not reviewed]

0 2 0

Jan Kaluza - 14 years ago 2011-08-02 12:38:40
hanzz.k@gmail.com

Better spawning

2 files changed with 10 insertions and 48 deletions:

src/CMakeLists.txt

src/networkpluginserver.cpp

0 comments (0 inline, 0 general)

src/CMakeLists.txt

➞

Show inline comments

@@ @@ -12,7 +12,7 @@ endif() @@
 ADD_LIBRARY(transport SHARED ${HEADERS} ${SRC} ${SWIFTEN_SRC} ${PROTOBUF_SRC} ${PROTOBUF_HDRS})
 ADD_DEFINITIONS(-fPIC)
 TARGET_LINK_LIBRARIES(transport ${Boost_LIBRARIES} ${SQLITE3_LIBRARIES} ${SWIFTEN_LIBRARY} ${PROTOBUF_LIBRARIES} ${LOG4CXX_LIBRARIES})
+TARGET_LINK_LIBRARIES(transport ${Boost_LIBRARIES} ${SQLITE3_LIBRARIES} ${SWIFTEN_LIBRARY} ${PROTOBUF_LIBRARIES} ${LOG4CXX_LIBRARIES} -lpopt)
 SET_TARGET_PROPERTIES(transport PROPERTIES
       VERSION ${TRANSPORT_VERSION} SOVERSION ${TRANSPORT_VERSION}

src/networkpluginserver.cpp

➞

Show inline comments

@@ @@ -41,6 +41,7 @@ @@
 #include "sys/wait.h"
 #include "sys/signal.h"
 #include "log4cxx/logger.h"
 #include "popt.h"
 using namespace log4cxx;
@@ @@ -92,63 +93,24 @@ class NetworkFactory : public Factory { @@
 	wrap.set_payload(MESSAGE); \
 	wrap.SerializeToString(&MESSAGE);
 static std::vector<std::string> &split(const std::string &s, char delim, std::vector<std::string> &elems) {
     std::stringstream ss(s);
     std::string item;
     while(std::getline(ss, item, delim)) {
         elems.push_back(item);
+    }
     return elems;
+}
 static std::vector<std::string> split(const std::string &s, char delim) {
     std::vector<std::string> elems;
     return split(s, delim, elems);
+}
 static pid_t exec_(std::string path, const char *host, const char *port, const char *config) {
 	path += std::string(" --host ") + host + " --port " + port + " " + config;
 	LOG4CXX_INFO(logger, "Starting new backend " << path);
 	std::vector<std::string> cmd = split(path, ' ');
 	char **argv = (char **) malloc(sizeof(char *) * (cmd.size() + 6));
 	int i = 0;
 	BOOST_FOREACH(std::string c, cmd) {
 		argv[i] = (char *) malloc(c.size() + 1);
 		strcpy(argv[i++], c.c_str());
 // 		std::cout << i << "\n";
+	}
 	argv[i] = (char *) malloc(100);
 	strcpy(argv[i++], "--host");
 	argv[i] = (char *) malloc(100);
 	strcpy(argv[i++], host);
 	argv[i] = (char *) malloc(100);
 	strcpy(argv[i++], "--port");
 	argv[i] = (char *) malloc(100);
 	strcpy(argv[i++], port);
 	argv[i] = (char *) malloc(100);
 	strcpy(argv[i++], config);
 	argv[i] = 0;
 	char *p = (char *) malloc(path.size() + 1);
 	strcpy(p, path.c_str());
 	int argc;
 	char **argv;
 	poptParseArgvString(p, &argc, (const char ***) &argv);
 // 	char *argv[] = {(char*)script_name, '\0'};
 	pid_t pid = fork();
 	if ( pid == 0 ) {
 		// child process
-		exit(execv(cmd[0].c_str(), argv));
+		exit(execv(argv[0], argv));
 	} else if ( pid < 0 ) {
 		// fork failed
+	}
 	i = 0;
 	while (argv[i] != 0) {
 		free(argv[i++]);
+	}
 	free(argv);
 	free(p);
 	return pid;
+}

0 comments (0 inline, 0 general)