diff options
| author | Christopher Ferris <cferris@google.com> | 2022-04-21 01:23:12 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-04-21 01:23:12 +0000 |
| commit | 120c7773893d7dde4b68b0bc3f51612290221e12 (patch) | |
| tree | ff52905359cc3119eefdfdfd89ff245124845a77 | |
| parent | da8ac1a7f9adde8f149f3d9ea108ddcd5b6c886c (diff) | |
| parent | cd6b038e799ea13120e9676e0f1b23cdda4223db (diff) | |
| download | extras-120c7773893d7dde4b68b0bc3f51612290221e12.tar.gz | |
Merge "Add support for new unwindstack error codes." am: 30db4a5be2 am: 6fcf9c2387 am: f078c382e6 am: cd6b038e79
Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2068807
Change-Id: Ia19bca0ac57991b3277f1c165400af8c4ee830aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | simpleperf/OfflineUnwinder.cpp | 3 | ||||
| -rw-r--r-- | simpleperf/OfflineUnwinder.h | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/simpleperf/OfflineUnwinder.cpp b/simpleperf/OfflineUnwinder.cpp index f611ef4d..bbc488b4 100644 --- a/simpleperf/OfflineUnwinder.cpp +++ b/simpleperf/OfflineUnwinder.cpp @@ -66,6 +66,9 @@ CHECK_ERROR_CODE(ERROR_INVALID_ELF); CHECK_ERROR_CODE(ERROR_THREAD_DOES_NOT_EXIST); CHECK_ERROR_CODE(ERROR_THREAD_TIMEOUT); CHECK_ERROR_CODE(ERROR_SYSTEM_CALL); +CHECK_ERROR_CODE(ERROR_BAD_ARCH); +CHECK_ERROR_CODE(ERROR_MAPS_PARSE); +CHECK_ERROR_CODE(ERROR_INVALID_PARAMETER); CHECK_ERROR_CODE(ERROR_MAX); // Max frames seen so far is 463, in http://b/110923759. diff --git a/simpleperf/OfflineUnwinder.h b/simpleperf/OfflineUnwinder.h index b6445577..9eb9e8ff 100644 --- a/simpleperf/OfflineUnwinder.h +++ b/simpleperf/OfflineUnwinder.h @@ -39,7 +39,10 @@ enum UnwindStackErrorCode : uint8_t { // not exist. ERROR_THREAD_TIMEOUT, // Timeout trying to unwind a local thread. ERROR_SYSTEM_CALL, // System call failed while unwinding. - ERROR_MAX = ERROR_SYSTEM_CALL, + ERROR_BAD_ARCH, // Arch invalid (none, or mismatched). + ERROR_MAPS_PARSE, // Failed to parse maps data. + ERROR_INVALID_PARAMETER, // Invalid parameter passed to function. + ERROR_MAX = ERROR_INVALID_PARAMETER, }; struct UnwindingResult { |