From: Yabin Cui <yabinc@google.com>
Date: Mon, 21 Sep 2015 19:28:46 +0000 (-0700)
Subject: resolved conflicts for 6239958b to stage-aosp-master
X-Git-Tag: android-x86-7.1-r1~133^2~54^2~15
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=19c8d5f5;p=android-x86%2Fsystem-extras.git

resolved conflicts for 6239958b to stage-aosp-master

Change-Id: I66d12e9a15b5e6aecd4938b9ce4ac76a0f3863e4
---

19c8d5f55b1ff4f6953eb53019d148adab0459a5
diff --cc simpleperf/workload.cpp
index 6f07cdae,42a5fddd..7e129b38
--- a/simpleperf/workload.cpp
+++ b/simpleperf/workload.cpp
@@@ -108,11 -108,10 +108,11 @@@ static void ChildProcessFn(std::vector<
      TEMP_FAILURE_RETRY(write(exec_child_fd, &exec_child_failed, 1));
      close(exec_child_fd);
      errno = saved_errno;
-     PLOG(ERROR) << "execvp(" << argv[0] << ") failed";
+     PLOG(ERROR) << "child process failed to execvp(" << argv[0] << ")";
    } else {
-     PLOG(DEBUG) << "child process failed to receive start_signal, nread = " << nread;
+     PLOG(ERROR) << "child process failed to receive start_signal, nread = " << nread;
    }
 +  exit(1);
  }
  
  bool Workload::Start() {