commit 024160850fbbf28368eae951beb4c72e2ce8fce6
author Calin Juravle <calin@google.com> Tue Feb 23 12:00:03 2016 +0000
committer Mathieu Chartier <mathieuc@google.com> Tue Feb 23 18:41:18 2016 -0800
tree 7f4efde22670fd105315db00897fd81f63ba650b
parent 7ead0c009c64f1e10aa39e44ea10383dd859d332

Revert "Revert "Add profman tool: responsible to process profiles""

This reverts commit 3da74687e42de7d33a8e75df9bd64374e650f75e.

(cherry picked from commit 2e2db786b8fbaa4dceb37603a4296b0b2aea4e9e)

Change-Id: I38086cc9de939bad33bcd13b1677e1626af61c29

runtime/utils.h

diff --git a/runtime/utils.h b/runtime/utils.h
index 79e4da1..83ac0b8 100644
--- a/runtime/utils.h
+++ b/runtime/utils.h
@@ -292,6 +292,7 @@
 
 // Wrapper on fork/execv to run a command in a subprocess.
 bool Exec(std::vector<std::string>& arg_vector, std::string* error_msg);
+int ExecAndReturnCode(std::vector<std::string>& arg_vector, std::string* error_msg);
 
 // Returns true if the file exists.
 bool FileExists(const std::string& filename);
@@ -348,7 +349,7 @@
                             UsageFn Usage,
                             bool is_long_option = true) {
   std::string option_prefix = option_name + (is_long_option ? "=" : "");
-  DCHECK(option.starts_with(option_prefix));
+  DCHECK(option.starts_with(option_prefix)) << option << " " << option_prefix;
   const char* value_string = option.substr(option_prefix.size()).data();
   int64_t parsed_integer_value = 0;
   if (!ParseInt(value_string, &parsed_integer_value)) {