diff options
| author | 2019-01-16 22:25:49 -0800 | |
|---|---|---|
| committer | 2019-01-16 22:25:49 -0800 | |
| commit | d231c6ad8ebb1bd6d2acd7058d4c73d23ea0a66e (patch) | |
| tree | 790dca3610d237480815abead3365ffe20b7673f | |
| parent | 691285b01d7a1328492c608c997521c048461be4 (diff) | |
| parent | b882410806003880c8cbae32d462adb951faa48d (diff) | |
Merge "NFC: Switch ATRACE_BUFFER_INDEX to be a more friendly macro statement." am: 9c45a2f391 am: 527710b285
am: b882410806
Change-Id: I0482ba483d9e05dd97abf25c013f930f9146b2f9
| -rw-r--r-- | libs/gui/include/gui/BufferQueueCore.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/libs/gui/include/gui/BufferQueueCore.h b/libs/gui/include/gui/BufferQueueCore.h index 537c957746..b377a412bc 100644 --- a/libs/gui/include/gui/BufferQueueCore.h +++ b/libs/gui/include/gui/BufferQueueCore.h @@ -40,13 +40,14 @@ #define BQ_LOGW(x, ...) ALOGW("[%s] " x, mConsumerName.string(), ##__VA_ARGS__) #define BQ_LOGE(x, ...) ALOGE("[%s] " x, mConsumerName.string(), ##__VA_ARGS__) -#define ATRACE_BUFFER_INDEX(index) \ - if (ATRACE_ENABLED()) { \ - char ___traceBuf[1024]; \ - snprintf(___traceBuf, 1024, "%s: %d", \ - mCore->mConsumerName.string(), (index)); \ - android::ScopedTrace ___bufTracer(ATRACE_TAG, ___traceBuf); \ - } +#define ATRACE_BUFFER_INDEX(index) \ + do { \ + if (ATRACE_ENABLED()) { \ + char ___traceBuf[1024]; \ + snprintf(___traceBuf, 1024, "%s: %d", mCore->mConsumerName.string(), (index)); \ + android::ScopedTrace ___bufTracer(ATRACE_TAG, ___traceBuf); \ + } \ + } while (false) namespace android { |