diff options
Diffstat (limited to 'adb/adb_trace.h')
| -rw-r--r-- | adb/adb_trace.h | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/adb/adb_trace.h b/adb/adb_trace.h index 8a5d9f8..32b6ae4 100644 --- a/adb/adb_trace.h +++ b/adb/adb_trace.h @@ -19,6 +19,8 @@ #if !ADB_HOST #include <android/log.h> +#else +#include <stdio.h> #endif /* define ADB_TRACE to 1 to enable tracing support, or 0 to disable it */ @@ -28,7 +30,7 @@ * forget to update the corresponding 'tags' table in * the adb_trace_init() function implemented in adb.c */ -typedef enum { +enum AdbTrace { TRACE_ADB = 0, /* 0x001 */ TRACE_SOCKETS, TRACE_PACKETS, @@ -41,7 +43,7 @@ typedef enum { TRACE_SERVICES, TRACE_AUTH, TRACE_FDEVENT, -} AdbTrace; +} ; #if ADB_TRACE @@ -73,8 +75,9 @@ void adb_trace_init(void); if (ADB_TRACING) { \ int save_errno = errno; \ adb_mutex_lock(&D_lock); \ - fprintf(stderr, "%s::%s():", \ - __FILE__, __FUNCTION__); \ + fprintf(stderr, "%16s: %5d:%5lu | ", \ + __FUNCTION__, \ + getpid(), adb_thread_id()); \ errno = save_errno; \ fprintf(stderr, __VA_ARGS__ ); \ fflush(stderr); \ @@ -96,15 +99,16 @@ void adb_trace_init(void); } while (0) # define DD(...) \ do { \ - int save_errno = errno; \ - adb_mutex_lock(&D_lock); \ - fprintf(stderr, "%s::%s():", \ - __FILE__, __FUNCTION__); \ - errno = save_errno; \ - fprintf(stderr, __VA_ARGS__ ); \ - fflush(stderr); \ - adb_mutex_unlock(&D_lock); \ - errno = save_errno; \ + int save_errno = errno; \ + adb_mutex_lock(&D_lock); \ + fprintf(stderr, "%16s: %5d:%5lu | ", \ + __FUNCTION__, \ + getpid(), adb_thread_id()); \ + errno = save_errno; \ + fprintf(stderr, __VA_ARGS__ ); \ + fflush(stderr); \ + adb_mutex_unlock(&D_lock); \ + errno = save_errno; \ } while (0) #else # define D(...) \ |