From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AB288C4CECD for ; Mon, 27 Apr 2020 21:19:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8AB402072D for ; Mon, 27 Apr 2020 21:19:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588022396; bh=PAT7hA1rypVrh/iB3HF5RenoGsjEq4UbJDWnvxF0fo4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=nxsKwlJRVekSkpQ1qXoOFqdWc2Tt7Gl6yX7qQ7Oy7ROMX7Yd7loTQw8JKb/9EZzcX /RhQFez1N7IT0x3/4hnDZfiX1I5P4lQBjZ9eWmGIA7amBZBet1VImNiScgvWYrfTmo OkfndJ7b8bWxLepxpZ5R49IsY7Xg6+aPk+zUPcD0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726285AbgD0VTz (ORCPT ); Mon, 27 Apr 2020 17:19:55 -0400 Received: from mail.kernel.org ([198.145.29.99]:36176 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726030AbgD0VTx (ORCPT ); Mon, 27 Apr 2020 17:19:53 -0400 Received: from quaco.ghostprotocols.net (unknown [179.97.37.151]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id DADE22078C; Mon, 27 Apr 2020 21:19:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588022393; bh=PAT7hA1rypVrh/iB3HF5RenoGsjEq4UbJDWnvxF0fo4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=b/GEhIpQQeLCu7dWaUhrrZc95F86O5OhvUHxb0JWm47QX9uwQ2nHzmoVZx8yNfTKY b1/GrHFrPIi6AuqNF6n3eqS1edwOcnT/rq978x1PlDMlGM95UH5EVfrSvehz8Us/TM UXkHeWz5mNaKYEz9rejqraeuQtgqQG6JO851cZxA= From: Arnaldo Carvalho de Melo To: Jiri Olsa , Namhyung Kim Cc: Ingo Molnar , Thomas Gleixner , Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Arnaldo Carvalho de Melo , Adrian Hunter , Song Liu Subject: [PATCH 2/7] perf top: Move sb_evlist to 'struct perf_top' Date: Mon, 27 Apr 2020 18:19:30 -0300 Message-Id: <20200427211935.25789-3-acme@kernel.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200427211935.25789-1-acme@kernel.org> References: <20200427211935.25789-1-acme@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Arnaldo Carvalho de Melo Where state related to a 'perf top' session is grouped. Cc: Adrian Hunter Cc: Jiri Olsa Cc: Namhyung Kim Cc: Song Liu Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-top.c | 7 +++---- tools/perf/util/top.h | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c index 6b067a5ba1d5..70e1c732db6a 100644 --- a/tools/perf/builtin-top.c +++ b/tools/perf/builtin-top.c @@ -1580,7 +1580,6 @@ int cmd_top(int argc, const char **argv) OPTS_EVSWITCH(&top.evswitch), OPT_END() }; - struct evlist *sb_evlist = NULL; const char * const top_usage[] = { "perf top []", NULL @@ -1744,9 +1743,9 @@ int cmd_top(int argc, const char **argv) } if (!top.record_opts.no_bpf_event) - bpf_event__add_sb_event(&sb_evlist, &perf_env); + bpf_event__add_sb_event(&top.sb_evlist, &perf_env); - if (perf_evlist__start_sb_thread(sb_evlist, target)) { + if (perf_evlist__start_sb_thread(top.sb_evlist, target)) { pr_debug("Couldn't start the BPF side band thread:\nBPF programs starting from now on won't be annotatable\n"); opts->no_bpf_event = true; } @@ -1754,7 +1753,7 @@ int cmd_top(int argc, const char **argv) status = __cmd_top(&top); if (!opts->no_bpf_event) - perf_evlist__stop_sb_thread(sb_evlist); + perf_evlist__stop_sb_thread(top.sb_evlist); out_delete_evlist: evlist__delete(top.evlist); diff --git a/tools/perf/util/top.h b/tools/perf/util/top.h index 45dc84ddff37..ff8391208ecd 100644 --- a/tools/perf/util/top.h +++ b/tools/perf/util/top.h @@ -18,7 +18,7 @@ struct perf_session; struct perf_top { struct perf_tool tool; - struct evlist *evlist; + struct evlist *evlist, *sb_evlist; struct record_opts record_opts; struct annotation_options annotation_opts; struct evswitch evswitch; -- 2.21.1