diff options
author | Tri Vo <trong@google.com> | 2021-01-16 01:50:44 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-16 01:50:44 +0000 |
commit | 47a6bf821a4a23f1988caff27784f675f130c89e (patch) | |
tree | bf56d5e16573f5a6aaef71305ccece0b92204e59 /trusty/coverage/coverage.cpp | |
parent | 5e097f3912548e6e824b31a0aa5ad7b085bf7acf (diff) | |
parent | 00c2c98a90a01e29507118c196945e483074ae27 (diff) |
Merge changes I06a7b475,Ic7a30b75,Ib22cf72b am: e865d88531 am: 00c2c98a90
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1552017
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I90f225a98aaaed65618e03a34d04a3f26fd7285d
Diffstat (limited to 'trusty/coverage/coverage.cpp')
-rw-r--r-- | trusty/coverage/coverage.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/trusty/coverage/coverage.cpp b/trusty/coverage/coverage.cpp index 185abe549..5eccdc503 100644 --- a/trusty/coverage/coverage.cpp +++ b/trusty/coverage/coverage.cpp @@ -39,6 +39,7 @@ namespace coverage { using android::base::ErrnoError; using android::base::Error; using std::string; +using std::to_string; using std::unique_ptr; static inline uintptr_t RoundPageUp(uintptr_t val) { @@ -54,11 +55,11 @@ CoverageRecord::CoverageRecord(string tipc_dev, struct uuid* uuid) shm_(NULL), shm_len_(0) {} -CoverageRecord::CoverageRecord(string tipc_dev, struct uuid* uuid, string sancov_filename) +CoverageRecord::CoverageRecord(string tipc_dev, struct uuid* uuid, string module_name) : tipc_dev_(std::move(tipc_dev)), coverage_srv_fd_(-1), uuid_(*uuid), - sancov_filename_(sancov_filename), + sancov_filename_(module_name + "." + to_string(getpid()) + ".sancov"), record_len_(0), shm_(NULL), shm_len_(0) {} |