diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2022-11-23 05:55:20 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-11-23 05:55:20 +0000 |
commit | a5745d7981b7ecf259d10d0e2ed1567fdc348e8e (patch) | |
tree | 963ff30204aa75d49afd4ab80365ce5ab54744b7 /lib/trace-cmd/trace-input.c | |
parent | 509b998dcaab9cb81db7efdc4c3364ff078c7672 (diff) | |
parent | 21202940d0461240578ac1c79ce52189021f8284 (diff) | |
download | trace-cmd-a5745d7981b7ecf259d10d0e2ed1567fdc348e8e.tar.gz |
Merge "ANDROID: tracecmd: Fix temp file paths" am: 21202940d0main-16k
Original change: https://android-review.googlesource.com/c/platform/external/trace-cmd/+/2313384
Change-Id: I160bf0e73c4c43c0988510947624c7b5f2b0f011
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'lib/trace-cmd/trace-input.c')
-rw-r--r-- | lib/trace-cmd/trace-input.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/lib/trace-cmd/trace-input.c b/lib/trace-cmd/trace-input.c index 442b1c5a..8ffdf04b 100644 --- a/lib/trace-cmd/trace-input.c +++ b/lib/trace-cmd/trace-input.c @@ -67,14 +67,24 @@ struct zchunk_cache { struct cpu_zdata { /* uncompressed cpu data */ int fd; +#ifdef __ANDROID__ + char file[37]; /* strlen(COMPR_TEMP_FILE) */ +#else /* !__ANDROID__ */ char file[26]; /* strlen(COMPR_TEMP_FILE) */ +#endif /* __ANDROID__ */ + unsigned int count; unsigned int last_chunk; struct list_head cache; struct tracecmd_compress_chunk *chunks; }; +#ifdef __ANDROID__ +#define COMPR_TEMP_FILE "/data/local/tmp/trace_cpu_dataXXXXXX" +#else /* !__ANDROID__ */ #define COMPR_TEMP_FILE "/tmp/trace_cpu_dataXXXXXX" +#endif /* __ANDROID__ */ + struct cpu_data { /* the first two never change */ unsigned long long file_offset; |