Merge pull request #94 from walquis/master

Apply a fix similar to 6b16991 'ps -p', no space before dash-p option ar...
phusion · Feb 4, 2014 · 8118630 · 8118630
2 parents 4bbcd93 + f55f1f5
commit 8118630
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/ext/common/Utils/ProcessMetricsCollector.h b/ext/common/Utils/ProcessMetricsCollector.h
@@ -450,14 +450,16 @@ class ProcessMetricsCollector {
 		if (pidsArg[pidsArg.size() - 1] == ',') {
 			pidsArg.resize(pidsArg.size() - 1);
 		}
+
+		string fmtArg = "-o";
+		#if defined(sun) || defined(__sun)
+			fmtArg.append("pid,ppid,pcpu,rss,vsz,pgid,uid,args");
+		#else
+			fmtArg.append("pid,ppid,%cpu,rss,vsize,pgid,uid,command");
+		#endif
 
 		const char *command[] = {
-			"ps", "-o",
-			#if defined(sun) || defined(__sun)
-				"pid,ppid,pcpu,rss,vsz,pgid,uid,args",
-			#else
-				"pid,ppid,%cpu,rss,vsize,pgid,uid,command",
-			#endif
+			"ps", fmtArg.c_str(),
 			#ifdef PS_SUPPORTS_MULTIPLE_PIDS
 				pidsArg.c_str(),
 			#endif
@@ -469,6 +471,7 @@ class ProcessMetricsCollector {
 			psOutput = runCommandAndCaptureOutput(command);
 		}
 		pidsArg.resize(0);
+		fmtArg.resize(0);
 		ProcessMetricMap result = parsePsOutput<Collection, ConstIterator>(psOutput, pids);
 		psOutput.resize(0);
 		if (canMeasureRealMemory) {