lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

perf intel-pt: Make logging slightly more efficient

Browse Source 
Logging is only used for debugging. Use macros to save calling into the
functions only to return immediately when logging is not enabled.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Link: http://lkml.kernel.org/r/1443186956-18718-5-git-send-email-adrian.hunter@intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Adrian Hunter
2015-09-25 16:15:35 +03:00
committed by Arnaldo Carvalho de Melo
parent 9992c2d50a
commit 116f349c5b
2 changed files with 43 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
tools/perf/util/intel-pt-decoder/intel-pt-log.c
View File

@@ -29,18 +29,18 @@
static FILE *f; static FILE *f;
static char log_name[MAX_LOG_NAME]; static char log_name[MAX_LOG_NAME];
static bool enable_logging; bool intel_pt_enable_logging;
void intel_pt_log_enable(void) void intel_pt_log_enable(void)
{ {
enable_logging = true; intel_pt_enable_logging = true;
} }
void intel_pt_log_disable(void) void intel_pt_log_disable(void)
{ {
if (f) if (f)
fflush(f); fflush(f);
enable_logging = false; intel_pt_enable_logging = false;
} }
void intel_pt_log_set_name(const char *name) void intel_pt_log_set_name(const char *name)
@@ -80,7 +80,7 @@ static void intel_pt_print_no_data(uint64_t pos, int indent)
static int intel_pt_log_open(void) static int intel_pt_log_open(void)
{ {
if (!enable_logging) if (!intel_pt_enable_logging)
return -1; return -1;
if (f) if (f)
@@ -91,14 +91,14 @@ static int intel_pt_log_open(void)
f = fopen(log_name, "w+"); f = fopen(log_name, "w+");
if (!f) { if (!f) {
enable_logging = false; intel_pt_enable_logging = false;
return -1; return -1;
} }
return 0; return 0;
} }
void intel_pt_log_packet(const struct intel_pt_pkt *packet, int pkt_len, void __intel_pt_log_packet(const struct intel_pt_pkt *packet, int pkt_len,
uint64_t pos, const unsigned char *buf) uint64_t pos, const unsigned char *buf)
{ {
char desc[INTEL_PT_PKT_DESC_MAX]; char desc[INTEL_PT_PKT_DESC_MAX];
@@ -111,7 +111,7 @@ void intel_pt_log_packet(const struct intel_pt_pkt *packet, int pkt_len,
fprintf(f, "%s\n", desc); fprintf(f, "%s\n", desc);
} }
void intel_pt_log_insn(struct intel_pt_insn *intel_pt_insn, uint64_t ip) void __intel_pt_log_insn(struct intel_pt_insn *intel_pt_insn, uint64_t ip)
{ {
char desc[INTEL_PT_INSN_DESC_MAX]; char desc[INTEL_PT_INSN_DESC_MAX];
size_t len = intel_pt_insn->length; size_t len = intel_pt_insn->length;
@@ -128,7 +128,8 @@ void intel_pt_log_insn(struct intel_pt_insn *intel_pt_insn, uint64_t ip)
fprintf(f, "Bad instruction!\n"); fprintf(f, "Bad instruction!\n");
} }
void intel_pt_log_insn_no_data(struct intel_pt_insn *intel_pt_insn, uint64_t ip) void __intel_pt_log_insn_no_data(struct intel_pt_insn *intel_pt_insn,
uint64_t ip)
{ {
char desc[INTEL_PT_INSN_DESC_MAX]; char desc[INTEL_PT_INSN_DESC_MAX];
@@ -142,7 +143,7 @@ void intel_pt_log_insn_no_data(struct intel_pt_insn *intel_pt_insn, uint64_t ip)
fprintf(f, "Bad instruction!\n"); fprintf(f, "Bad instruction!\n");
} }
void intel_pt_log(const char *fmt, ...) void __intel_pt_log(const char *fmt, ...)
{ {
va_list args; va_list args;

34
tools/perf/util/intel-pt-decoder/intel-pt-log.h
View File

@@ -25,20 +25,46 @@ void intel_pt_log_enable(void);
void intel_pt_log_disable(void); void intel_pt_log_disable(void);
void intel_pt_log_set_name(const char *name); void intel_pt_log_set_name(const char *name);
void intel_pt_log_packet(const struct intel_pt_pkt *packet, int pkt_len, void __intel_pt_log_packet(const struct intel_pt_pkt *packet, int pkt_len,
uint64_t pos, const unsigned char *buf); uint64_t pos, const unsigned char *buf);
struct intel_pt_insn; struct intel_pt_insn;
void intel_pt_log_insn(struct intel_pt_insn *intel_pt_insn, uint64_t ip); void __intel_pt_log_insn(struct intel_pt_insn *intel_pt_insn, uint64_t ip);
void intel_pt_log_insn_no_data(struct intel_pt_insn *intel_pt_insn, void __intel_pt_log_insn_no_data(struct intel_pt_insn *intel_pt_insn,
uint64_t ip); uint64_t ip);
__attribute__((format(printf, 1, 2))) __attribute__((format(printf, 1, 2)))
void intel_pt_log(const char *fmt, ...); void __intel_pt_log(const char *fmt, ...);
#define intel_pt_log(fmt, ...) \
do { \
if (intel_pt_enable_logging) \
__intel_pt_log(fmt, ##__VA_ARGS__); \
} while (0)
#define intel_pt_log_packet(arg, ...) \
do { \
if (intel_pt_enable_logging) \
__intel_pt_log_packet(arg, ##__VA_ARGS__); \
} while (0)
#define intel_pt_log_insn(arg, ...) \
do { \
if (intel_pt_enable_logging) \
__intel_pt_log_insn(arg, ##__VA_ARGS__); \
} while (0)
#define intel_pt_log_insn_no_data(arg, ...) \
do { \
if (intel_pt_enable_logging) \
__intel_pt_log_insn_no_data(arg, ##__VA_ARGS__); \
} while (0)
#define x64_fmt "0x%" PRIx64 #define x64_fmt "0x%" PRIx64
extern bool intel_pt_enable_logging;
static inline void intel_pt_log_at(const char *msg, uint64_t u) static inline void intel_pt_log_at(const char *msg, uint64_t u)
{ {
intel_pt_log("%s at " x64_fmt "\n", msg, u); intel_pt_log("%s at " x64_fmt "\n", msg, u);