commit 3da74687e42de7d33a8e75df9bd64374e650f75e
author Nicolas Geoffray <ngeoffray@google.com> Mon Feb 22 22:37:52 2016 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Mon Feb 22 22:37:52 2016 +0000
tree f3bf62678200380dc672647af1da136c562f60b3
parent 6caefd983a800a063b219f1d3ed71b1416cecd70

Revert "Add profman tool: responsible to process profiles"

Needs a profile_assistant_test fix.

Bug: 26719109
Bug: 26563023

This reverts commit 6caefd983a800a063b219f1d3ed71b1416cecd70.

Change-Id: Ibdeb7385737dd7846ed861e0a95f083abb9aa974

runtime/utils.cc

diff --git a/runtime/utils.cc b/runtime/utils.cc
index 13564a6..07f94c0 100644
--- a/runtime/utils.cc
+++ b/runtime/utils.cc
@@ -1392,8 +1392,9 @@
   return filename;
 }
 
-int ExecAndReturnCode(std::vector<std::string>& arg_vector, std::string* error_msg) {
+bool Exec(std::vector<std::string>& arg_vector, std::string* error_msg) {
   const std::string command_line(Join(arg_vector, ' '));
+
   CHECK_GE(arg_vector.size(), 1U) << command_line;
 
   // Convert the args to char pointers.
@@ -1416,6 +1417,7 @@
     setpgid(0, 0);
 
     execv(program, &args[0]);
+
     PLOG(ERROR) << "Failed to execv(" << command_line << ")";
     // _exit to avoid atexit handlers in child.
     _exit(1);
@@ -1423,32 +1425,23 @@
     if (pid == -1) {
       *error_msg = StringPrintf("Failed to execv(%s) because fork failed: %s",
                                 command_line.c_str(), strerror(errno));
-      return -1;
+      return false;
     }
 
     // wait for subprocess to finish
-    int status = -1;
+    int status;
     pid_t got_pid = TEMP_FAILURE_RETRY(waitpid(pid, &status, 0));
     if (got_pid != pid) {
       *error_msg = StringPrintf("Failed after fork for execv(%s) because waitpid failed: "
                                 "wanted %d, got %d: %s",
                                 command_line.c_str(), pid, got_pid, strerror(errno));
-      return -1;
+      return false;
     }
-    if (WIFEXITED(status)) {
-      return WEXITSTATUS(status);
+    if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) {
+      *error_msg = StringPrintf("Failed execv(%s) because non-0 exit status",
+                                command_line.c_str());
+      return false;
     }
-    return -1;
-  }
-}
-
-bool Exec(std::vector<std::string>& arg_vector, std::string* error_msg) {
-  int status = ExecAndReturnCode(arg_vector, error_msg);
-  if (status != 0) {
-    const std::string command_line(Join(arg_vector, ' '));
-    *error_msg = StringPrintf("Failed execv(%s) because non-0 exit status",
-                              command_line.c_str());
-    return false;
   }
   return true;
 }