From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754145AbbFRISN (ORCPT ); Thu, 18 Jun 2015 04:18:13 -0400 Received: from terminus.zytor.com ([198.137.202.10]:57282 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753552AbbFRIR4 (ORCPT ); Thu, 18 Jun 2015 04:17:56 -0400 Date: Thu, 18 Jun 2015 01:17:39 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: bp@suse.de, mingo@kernel.org, acme@redhat.com, fweisbec@gmail.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, dsahern@gmail.com, namhyung@kernel.org, adrian.hunter@intel.com, jolsa@redhat.com, hpa@zytor.com, dzickus@redhat.com, eranian@google.com Reply-To: dzickus@redhat.com, eranian@google.com, adrian.hunter@intel.com, hpa@zytor.com, jolsa@redhat.com, dsahern@gmail.com, namhyung@kernel.org, fweisbec@gmail.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, acme@redhat.com, bp@suse.de, mingo@kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf evlist: Add toggle_enable() method Git-Commit-ID: 2b56bcfb6f4bb0aa0813b6ee1dde8f5b23fce5d4 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 2b56bcfb6f4bb0aa0813b6ee1dde8f5b23fce5d4 Gitweb: http://git.kernel.org/tip/2b56bcfb6f4bb0aa0813b6ee1dde8f5b23fce5d4 Author: Arnaldo Carvalho de Melo AuthorDate: Wed, 17 Jun 2015 16:40:26 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 17 Jun 2015 16:40:26 -0300 perf evlist: Add toggle_enable() method For an upcoming feature in 'perf top' we will have a hotkey to enable/disable events, so remember if the events in the list are enabled or disabled and allows toggling this state using a new method. Cc: Adrian Hunter Cc: Borislav Petkov Cc: David Ahern Cc: Don Zickus Cc: Frederic Weisbecker Cc: Jiri Olsa Cc: Namhyung Kim Cc: Stephane Eranian Link: http://lkml.kernel.org/n/tip-64c4jvdl5feg2zhimxvokqka@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/evlist.c | 9 +++++++++ tools/perf/util/evlist.h | 2 ++ 2 files changed, 11 insertions(+) diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c index 6b58a47..8366511 100644 --- a/tools/perf/util/evlist.c +++ b/tools/perf/util/evlist.c @@ -297,6 +297,8 @@ void perf_evlist__disable(struct perf_evlist *evlist) PERF_EVENT_IOC_DISABLE, 0); } } + + evlist->enabled = false; } void perf_evlist__enable(struct perf_evlist *evlist) @@ -316,6 +318,13 @@ void perf_evlist__enable(struct perf_evlist *evlist) PERF_EVENT_IOC_ENABLE, 0); } } + + evlist->enabled = true; +} + +void perf_evlist__toggle_enable(struct perf_evlist *evlist) +{ + (evlist->enabled ? perf_evlist__disable : perf_evlist__enable)(evlist); } int perf_evlist__disable_event(struct perf_evlist *evlist, diff --git a/tools/perf/util/evlist.h b/tools/perf/util/evlist.h index 955bf31..a8489b9 100644 --- a/tools/perf/util/evlist.h +++ b/tools/perf/util/evlist.h @@ -41,6 +41,7 @@ struct perf_evlist { int nr_groups; int nr_mmaps; bool overwrite; + bool enabled; size_t mmap_len; int id_pos; int is_pos; @@ -139,6 +140,7 @@ void perf_evlist__munmap(struct perf_evlist *evlist); void perf_evlist__disable(struct perf_evlist *evlist); void perf_evlist__enable(struct perf_evlist *evlist); +void perf_evlist__toggle_enable(struct perf_evlist *evlist); int perf_evlist__disable_event(struct perf_evlist *evlist, struct perf_evsel *evsel);