From patchwork Fri Apr 15 18:20:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wang Nan X-Patchwork-Id: 65964 Delivered-To: patch@linaro.org Received: by 10.140.93.198 with SMTP id d64csp76900qge; Fri, 15 Apr 2016 11:21:37 -0700 (PDT) X-Received: by 10.66.140.105 with SMTP id rf9mr31377762pab.117.1460744496188; Fri, 15 Apr 2016 11:21:36 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s16si3643368pfi.193.2016.04.15.11.21.35; Fri, 15 Apr 2016 11:21:36 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751726AbcDOSVV (ORCPT + 29 others); Fri, 15 Apr 2016 14:21:21 -0400 Received: from szxga02-in.huawei.com ([119.145.14.65]:15433 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751594AbcDOSVS (ORCPT ); Fri, 15 Apr 2016 14:21:18 -0400 Received: from 172.24.1.48 (EHLO szxeml422-hub.china.huawei.com) ([172.24.1.48]) by szxrg02-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id DFJ76223; Sat, 16 Apr 2016 02:20:37 +0800 (CST) Received: from linux-4hy3.site (10.107.193.248) by szxeml422-hub.china.huawei.com (10.82.67.152) with Microsoft SMTP Server id 14.3.235.1; Sat, 16 Apr 2016 02:20:25 +0800 From: Wang Nan To: , CC: , , Wang Nan , Adrian Hunter , He Kuang , Jiri Olsa , Masami Hiramatsu , Namhyung Kim , Zefan Li , Arnaldo Carvalho de Melo Subject: [PATCH v3 1/6] perf tools: Derive trigger class from auxtrace_snapshot Date: Fri, 15 Apr 2016 18:20:15 +0000 Message-ID: <1460744420-175165-2-git-send-email-wangnan0@huawei.com> X-Mailer: git-send-email 1.8.3.4 In-Reply-To: <1460744420-175165-1-git-send-email-wangnan0@huawei.com> References: <1460744420-175165-1-git-send-email-wangnan0@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.107.193.248] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020204.571130F7.0033, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0, ip=0.0.0.0, so=2013-06-18 04:22:30, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: 37ca8f47e6065b1bb1b166c9ff585e30 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Create a new class named 'trigger' to model the state of a trigger and implement auxtrace_snapshot with it. auxtrace_record__snapshot_started and auxtrace_snapshot_err are absorbed. 'trigger' defines 4 state transitioning functions ('on', 'released', 'toggle' and 'colddown') and 2 state query function ('is_released') and ('is_toggled'). The state 'ON' and 'OFF' take higher priority than 'RELEASED' and 'TOGGLED'. A trigger must be 'on' before 'enable' and 'disable' take effect. A trigger can be colddown after being triggered. 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 Link: http://lkml.kernel.org/r/1460643725-167413-2-git-send-email-wangnan0@huawei.com [ Moved the trigger definitions to trigger.h ] Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-record.c | 73 ++++++++----------------------- tools/perf/util/trigger.h | 103 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 122 insertions(+), 54 deletions(-) create mode 100644 tools/perf/util/trigger.h -- 1.8.3.4 diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index 3239a6e..cfaa2df 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, OFF); 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_release(); } } @@ -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_release(); 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_colddown(); + 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]; @@ -1442,9 +1407,9 @@ out_symbol_exit: static void snapshot_sig_handler(int sig __maybe_unused) { - if (!auxtrace_snapshot_is_enabled()) + if (!auxtrace_snapshot_is_released()) 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..162c1c8 --- /dev/null +++ b/tools/perf/util/trigger.h @@ -0,0 +1,103 @@ +#ifndef __TRIGGER_H_ +#define __TRIGGER_H_ 1 + +struct trigger { + volatile enum { + TRIGGER_OFF = -1, + TRIGGER_RELEASED = 0, + TRIGGER_TOGGLED = 1, + TRIGGER_COLDDOWN = 2, + } state; + volatile bool error; +}; + +static inline void trigger_on(struct trigger *s) +{ + if (s->error) + return; + s->state = TRIGGER_RELEASED; +} + +static inline void trigger_release(struct trigger *s) +{ + if (s->error) + return; + if (s->state != TRIGGER_OFF) + s->state = TRIGGER_RELEASED; +} + +static inline void trigger_toggle(struct trigger *s) +{ + if (s->error) + return; + if (s->state != TRIGGER_OFF) + s->state = TRIGGER_TOGGLED; +} + +static inline void trigger_colddown(struct trigger *s) +{ + if (s->error) + return; + if (s->state == TRIGGER_TOGGLED) + s->state = TRIGGER_COLDDOWN; +} + +static inline void trigger_off(struct trigger *s) +{ + if (s->error) + return; + if (s->state != TRIGGER_OFF) + s->state = TRIGGER_OFF; +} + +static inline void trigger_error(struct trigger *s) +{ + if (s->error) + return; + trigger_off(s); + s->error = true; +} + +static inline bool trigger_is_released(struct trigger *s) +{ + if (s->error) + return false; + if (s->state != TRIGGER_OFF) + return s->state == TRIGGER_RELEASED; + return false; +} + +static inline bool trigger_is_toggled(struct trigger *s) +{ + if (s->error) + return false; + if (s->state != TRIGGER_OFF) + return s->state == TRIGGER_TOGGLED; + return false; +} + +static inline bool trigger_is_error(struct trigger *s) +{ + return s->error; +} + +#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_FUNC(n, type, op) \ +static inline type n##_##op(void) {return trigger_##op(&__TRIGGER_VAR(n)); } + +#define DEFINE_TRIGGER(n, def) \ +struct trigger n##_state = {.state = TRIGGER_##def, .error = false,};\ +__DEF_TRIGGER_VOID_FUNC(n, on) \ +__DEF_TRIGGER_VOID_FUNC(n, release) \ +__DEF_TRIGGER_VOID_FUNC(n, toggle) \ +__DEF_TRIGGER_VOID_FUNC(n, colddown) \ +__DEF_TRIGGER_VOID_FUNC(n, off) \ +__DEF_TRIGGER_VOID_FUNC(n, error) \ +__DEF_TRIGGER_FUNC(n, bool, is_released) \ +__DEF_TRIGGER_FUNC(n, bool, is_toggled) \ +__DEF_TRIGGER_FUNC(n, bool, is_error) + +#endif