summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYabin Cui <yabinc@google.com>2015-07-13 23:34:11 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-13 23:34:11 +0000
commit5e191823c9d2e9e3309e24d63bc8d8058da3f9f7 (patch)
treea7fdda747da5a0bf36f6839dcb404ada56169ef1
parentb8e5034ab0a3172d61af84842ebd123520c1137f (diff)
parent96f2bc51002a59fb77711a2a38e014cf13ac010c (diff)
downloadextras-5e191823c9d2e9e3309e24d63bc8d8058da3f9f7.tar.gz
am 96f2bc51: am e7da7e9b: Simpleperf: remove abort in child process.
* commit '96f2bc51002a59fb77711a2a38e014cf13ac010c': Simpleperf: remove abort in child process.
-rw-r--r--simpleperf/workload.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/simpleperf/workload.cpp b/simpleperf/workload.cpp
index f8e4edde..999e315a 100644
--- a/simpleperf/workload.cpp
+++ b/simpleperf/workload.cpp
@@ -93,10 +93,11 @@ static void ChildProcessFn(std::vector<std::string>& args, int start_signal_fd,
TEMP_FAILURE_RETRY(write(exec_child_fd, &exec_child_failed, 1));
close(exec_child_fd);
errno = saved_errno;
- PLOG(FATAL) << "execvp(" << argv[0] << ") failed";
+ PLOG(ERROR) << "execvp(" << argv[0] << ") failed";
} else {
- PLOG(FATAL) << "child process failed to receive start_signal, nread = " << nread;
+ PLOG(DEBUG) << "child process failed to receive start_signal, nread = " << nread;
}
+ exit(1);
}
bool Workload::Start() {