lkml.org 
[lkml]   [2015]   [Sep]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:perf/core] perf intel-pt: Make logging slightly more efficient
    Commit-ID:  116f349c5bf8c7aec4047dd6e06c310354b46e4f
    Gitweb: http://git.kernel.org/tip/116f349c5bf8c7aec4047dd6e06c310354b46e4f
    Author: Adrian Hunter <adrian.hunter@intel.com>
    AuthorDate: Fri, 25 Sep 2015 16:15:35 +0300
    Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
    CommitDate: Mon, 28 Sep 2015 16:45:26 -0300

    perf intel-pt: Make logging slightly more efficient

    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>
    ---
    tools/perf/util/intel-pt-decoder/intel-pt-log.c | 21 +++++++-------
    tools/perf/util/intel-pt-decoder/intel-pt-log.h | 38 +++++++++++++++++++++----
    2 files changed, 43 insertions(+), 16 deletions(-)

    diff --git a/tools/perf/util/intel-pt-decoder/intel-pt-log.c b/tools/perf/util/intel-pt-decoder/intel-pt-log.c
    index d09c7d9..319bef3 100644
    --- a/tools/perf/util/intel-pt-decoder/intel-pt-log.c
    +++ b/tools/perf/util/intel-pt-decoder/intel-pt-log.c
    @@ -29,18 +29,18 @@

    static FILE *f;
    static char log_name[MAX_LOG_NAME];
    -static bool enable_logging;
    +bool intel_pt_enable_logging;

    void intel_pt_log_enable(void)
    {
    - enable_logging = true;
    + intel_pt_enable_logging = true;
    }

    void intel_pt_log_disable(void)
    {
    if (f)
    fflush(f);
    - enable_logging = false;
    + intel_pt_enable_logging = false;
    }

    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)
    {
    - if (!enable_logging)
    + if (!intel_pt_enable_logging)
    return -1;

    if (f)
    @@ -91,15 +91,15 @@ static int intel_pt_log_open(void)

    f = fopen(log_name, "w+");
    if (!f) {
    - enable_logging = false;
    + intel_pt_enable_logging = false;
    return -1;
    }

    return 0;
    }

    -void intel_pt_log_packet(const struct intel_pt_pkt *packet, int pkt_len,
    - uint64_t pos, const unsigned char *buf)
    +void __intel_pt_log_packet(const struct intel_pt_pkt *packet, int pkt_len,
    + uint64_t pos, const unsigned char *buf)
    {
    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);
    }

    -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];
    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");
    }

    -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];

    @@ -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");
    }

    -void intel_pt_log(const char *fmt, ...)
    +void __intel_pt_log(const char *fmt, ...)
    {
    va_list args;

    diff --git a/tools/perf/util/intel-pt-decoder/intel-pt-log.h b/tools/perf/util/intel-pt-decoder/intel-pt-log.h
    index db3942f..debe751 100644
    --- a/tools/perf/util/intel-pt-decoder/intel-pt-log.h
    +++ b/tools/perf/util/intel-pt-decoder/intel-pt-log.h
    @@ -25,20 +25,46 @@ void intel_pt_log_enable(void);
    void intel_pt_log_disable(void);
    void intel_pt_log_set_name(const char *name);

    -void intel_pt_log_packet(const struct intel_pt_pkt *packet, int pkt_len,
    - uint64_t pos, const unsigned char *buf);
    +void __intel_pt_log_packet(const struct intel_pt_pkt *packet, int pkt_len,
    + uint64_t pos, const unsigned char *buf);

    struct intel_pt_insn;

    -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,
    - 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,
    + uint64_t ip);

    __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

    +extern bool intel_pt_enable_logging;
    +
    static inline void intel_pt_log_at(const char *msg, uint64_t u)
    {
    intel_pt_log("%s at " x64_fmt "\n", msg, u);

    \
     
     \ /
      Last update: 2015-09-29 11:01    [W:4.238 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site