Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751969AbcDRGch (ORCPT ); Mon, 18 Apr 2016 02:32:37 -0400 Received: from szxga03-in.huawei.com ([119.145.14.66]:62740 "EHLO szxga03-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751619AbcDRGcg (ORCPT ); Mon, 18 Apr 2016 02:32:36 -0400 From: Wang Nan To: , CC: , , Wang Nan , Adrian Hunter , He Kuang , Jiri Olsa , Masami Hiramatsu , Namhyung Kim , Zefan Li Subject: [PATCH v4 1/6] perf tools: Derive trigger class from auxtrace_snapshot Date: Mon, 18 Apr 2016 06:32:08 +0000 Message-ID: <1460961133-182746-2-git-send-email-wangnan0@huawei.com> X-Mailer: git-send-email 1.8.3.4 In-Reply-To: <1460961133-182746-1-git-send-email-wangnan0@huawei.com> References: <1460961133-182746-1-git-send-email-wangnan0@huawei.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.107.193.248] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020204.57147F7A.00FE,ss=1,re=0.000,recu=0.000,reip=0.000,cl=1,cld=1,fgs=0, ip=0.0.0.0, so=2013-05-26 15:14:31, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: 08d1d419189dfa2c7c1954d1c1b35dc0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 8760 Lines: 299 Use 'trigger' to model operations which need to be executed when an event (a signal, for example) is observed. States and transits: OFF--(on)--> READY --(toggle)--> TOGGLED --(process)--> PROCESSING ^ | | | | | | (ready) (ready) | | | \__________________/______________________/ is_toggled and is_ready are two key functions to query the state of a trigger. is_toggled means the event already happen; is_ready means the trigger is waiting for the event. 'PROCESSING' represents a state the event happens and be observed, and the processing is on the way so can't accept a new event immediately. auxtrace_record__snapshot_started and auxtrace_snapshot_err are removed and switch to trigger. Signed-off-by: Wang Nan Cc: Adrian Hunter Cc: He Kuang Cc: Jiri Olsa Cc: Masami Hiramatsu Cc: Namhyung Kim Cc: Zefan Li Cc: pi3orama@163.com --- tools/perf/builtin-record.c | 73 +++++++------------------- tools/perf/util/trigger.h | 123 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 142 insertions(+), 54 deletions(-) create mode 100644 tools/perf/util/trigger.h diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index 5b4758a..0ff2422 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c @@ -34,6 +34,7 @@ #include "util/parse-regs-options.h" #include "util/llvm-utils.h" #include "util/bpf-loader.h" +#include "util/trigger.h" #include "asm/bug.h" #include @@ -127,44 +128,7 @@ static volatile int done; static volatile int signr = -1; static volatile int child_finished; -static volatile enum { - AUXTRACE_SNAPSHOT_OFF = -1, - AUXTRACE_SNAPSHOT_DISABLED = 0, - AUXTRACE_SNAPSHOT_ENABLED = 1, -} auxtrace_snapshot_state = AUXTRACE_SNAPSHOT_OFF; - -static inline void -auxtrace_snapshot_on(void) -{ - auxtrace_snapshot_state = AUXTRACE_SNAPSHOT_DISABLED; -} - -static inline void -auxtrace_snapshot_enable(void) -{ - if (auxtrace_snapshot_state == AUXTRACE_SNAPSHOT_OFF) - return; - auxtrace_snapshot_state = AUXTRACE_SNAPSHOT_ENABLED; -} - -static inline void -auxtrace_snapshot_disable(void) -{ - if (auxtrace_snapshot_state == AUXTRACE_SNAPSHOT_OFF) - return; - auxtrace_snapshot_state = AUXTRACE_SNAPSHOT_DISABLED; -} - -static inline bool -auxtrace_snapshot_is_enabled(void) -{ - if (auxtrace_snapshot_state == AUXTRACE_SNAPSHOT_OFF) - return false; - return auxtrace_snapshot_state == AUXTRACE_SNAPSHOT_ENABLED; -} - -static volatile int auxtrace_snapshot_err; -static volatile int auxtrace_record__snapshot_started; +static DEFINE_TRIGGER(auxtrace_snapshot); static void sig_handler(int sig) { @@ -282,11 +246,12 @@ static void record__read_auxtrace_snapshot(struct record *rec) { pr_debug("Recording AUX area tracing snapshot\n"); if (record__auxtrace_read_snapshot_all(rec) < 0) { - auxtrace_snapshot_err = -1; + auxtrace_snapshot_error(); } else { - auxtrace_snapshot_err = auxtrace_record__snapshot_finish(rec->itr); - if (!auxtrace_snapshot_err) - auxtrace_snapshot_enable(); + if (auxtrace_record__snapshot_finish(rec->itr)) + auxtrace_snapshot_error(); + else + auxtrace_snapshot_ready(); } } @@ -815,21 +780,21 @@ static int __cmd_record(struct record *rec, int argc, const char **argv) perf_evlist__enable(rec->evlist); } - auxtrace_snapshot_enable(); + auxtrace_snapshot_ready(); for (;;) { unsigned long long hits = rec->samples; if (record__mmap_read_all(rec) < 0) { - auxtrace_snapshot_disable(); + auxtrace_snapshot_error(); err = -1; goto out_child; } - if (auxtrace_record__snapshot_started) { - auxtrace_record__snapshot_started = 0; - if (!auxtrace_snapshot_err) + if (auxtrace_snapshot_is_toggled()) { + auxtrace_snapshot_process(); + if (!auxtrace_snapshot_is_error()) record__read_auxtrace_snapshot(rec); - if (auxtrace_snapshot_err) { + if (auxtrace_snapshot_is_error()) { pr_err("AUX area tracing snapshot failed\n"); err = -1; goto out_child; @@ -858,12 +823,12 @@ static int __cmd_record(struct record *rec, int argc, const char **argv) * disable events in this case. */ if (done && !disabled && !target__none(&opts->target)) { - auxtrace_snapshot_disable(); + auxtrace_snapshot_off(); perf_evlist__disable(rec->evlist); disabled = true; } } - auxtrace_snapshot_disable(); + auxtrace_snapshot_off(); if (forks && workload_exec_errno) { char msg[STRERR_BUFSIZE]; @@ -1447,9 +1412,9 @@ out_symbol_exit: static void snapshot_sig_handler(int sig __maybe_unused) { - if (!auxtrace_snapshot_is_enabled()) + if (!auxtrace_snapshot_is_ready()) return; - auxtrace_snapshot_disable(); - auxtrace_snapshot_err = auxtrace_record__snapshot_start(record.itr); - auxtrace_record__snapshot_started = 1; + auxtrace_snapshot_toggle(); + if (auxtrace_record__snapshot_start(record.itr)) + auxtrace_snapshot_error(); } diff --git a/tools/perf/util/trigger.h b/tools/perf/util/trigger.h new file mode 100644 index 0000000..852d876 --- /dev/null +++ b/tools/perf/util/trigger.h @@ -0,0 +1,123 @@ +#ifndef __TRIGGER_H_ +#define __TRIGGER_H_ 1 + +#include "util/debug.h" +#include "asm/bug.h" + +/* + * Use trigger to model operations which need to be executed when + * an event (a signal, for example) is observed. + * + * States and transits: + * + * + * OFF--(on)--> READY --(toggle)--> TOGGLED --(process)--> PROCESSING + * ^ | | + * | | | + * | (ready) (ready) + * | | | + * \__________________/______________________/ + * + * is_toggled and is_ready are two key functions to query the state of + * a trigger. is_toggled means the event already happen; is_ready means the + * trigger is waiting for the event. + * + * 'PROCESSING' represents a state the event happens and be observed, and + * the processing is on the way so can't accept a new event immediately. + */ + +struct trigger { + volatile enum { + TRIGGER_ERROR = -2, + TRIGGER_OFF = -1, + TRIGGER_READY = 0, + TRIGGER_TOGGLED = 1, + TRIGGER_PROCESSING = 2, + } state; + const char *name; +}; + +#define TRIGGER_WARN_ONCE(t, exp) \ + WARN_ONCE(t->state != exp, "trigger '%s' state transist error: %d in %s()\n", \ + t->name, t->state, __func__) + +static inline bool trigger_is_available(struct trigger *t) +{ + return t->state >= 0; +} + +static inline bool trigger_is_error(struct trigger *t) +{ + return t->state <= TRIGGER_ERROR; +} + +static inline void trigger_on(struct trigger *t) +{ + TRIGGER_WARN_ONCE(t, TRIGGER_OFF); + t->state = TRIGGER_READY; +} + +static inline void trigger_ready(struct trigger *t) +{ + if (!trigger_is_available(t)) + return; + t->state = TRIGGER_READY; +} + +static inline void trigger_toggle(struct trigger *t) +{ + if (!trigger_is_available(t)) + return; + TRIGGER_WARN_ONCE(t, TRIGGER_READY); + t->state = TRIGGER_TOGGLED; +} + +static inline void trigger_process(struct trigger *t) +{ + if (!trigger_is_available(t)) + return; + TRIGGER_WARN_ONCE(t, TRIGGER_TOGGLED); + t->state = TRIGGER_PROCESSING; +} + +static inline void trigger_off(struct trigger *t) +{ + if (!trigger_is_available(t)) + return; + t->state = TRIGGER_OFF; +} + +static inline void trigger_error(struct trigger *t) +{ + t->state = TRIGGER_ERROR; +} + +static inline bool trigger_is_ready(struct trigger *t) +{ + return t->state == TRIGGER_READY; +} + +static inline bool trigger_is_toggled(struct trigger *t) +{ + return t->state == TRIGGER_TOGGLED; +} + +#define __TRIGGER_VAR(n) n##_state +#define __DEF_TRIGGER_VOID_FUNC(n, op) \ +static inline void n##_##op(void) {trigger_##op(&__TRIGGER_VAR(n)); } +#define __DEF_TRIGGER_BOOL_FUNC(n, op) \ +static inline bool n##_##op(void) {return trigger_##op(&__TRIGGER_VAR(n)); } + +#define DEFINE_TRIGGER(n) \ +struct trigger n##_state = {.state = TRIGGER_OFF, .name = #n}; \ +__DEF_TRIGGER_VOID_FUNC(n, on) \ +__DEF_TRIGGER_VOID_FUNC(n, ready) \ +__DEF_TRIGGER_VOID_FUNC(n, toggle) \ +__DEF_TRIGGER_VOID_FUNC(n, process) \ +__DEF_TRIGGER_VOID_FUNC(n, off) \ +__DEF_TRIGGER_VOID_FUNC(n, error) \ +__DEF_TRIGGER_BOOL_FUNC(n, is_ready) \ +__DEF_TRIGGER_BOOL_FUNC(n, is_toggled) \ +__DEF_TRIGGER_BOOL_FUNC(n, is_error) + +#endif -- 1.8.3.4