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=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, 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 8043DC43603 for ; Wed, 18 Dec 2019 07:09:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 61EEA2467F for ; Wed, 18 Dec 2019 07:09:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726826AbfLRHJM (ORCPT ); Wed, 18 Dec 2019 02:09:12 -0500 Received: from szxga04-in.huawei.com ([45.249.212.190]:8140 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726721AbfLRHI6 (ORCPT ); Wed, 18 Dec 2019 02:08:58 -0500 Received: from DGGEMS410-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id 20A869D74DDEFA6D3ECA; Wed, 18 Dec 2019 15:08:56 +0800 (CST) Received: from huawei.com (10.175.102.38) by DGGEMS410-HUB.china.huawei.com (10.3.19.210) with Microsoft SMTP Server id 14.3.439.0; Wed, 18 Dec 2019 15:08:50 +0800 From: Tan Xiaojun To: , , , , , , , , , , , , , , , CC: , , , , , , , Subject: [PATCH 5/6] perf tools: add perf_evlist__terminate() for terminate Date: Wed, 18 Dec 2019 15:54:54 +0800 Message-ID: <20191218075455.5106-6-tanxiaojun@huawei.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191218075455.5106-1-tanxiaojun@huawei.com> References: <20191218075455.5106-1-tanxiaojun@huawei.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.175.102.38] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Wei Li In __cmd_record(), when receiving SIGINT(ctrl + c), a done flag will be set and the event list will be disabled by perf_evlist__disable() once. While in auxtrace_record.read_finish(), the related events will be enabled again, if they are continuous, the recording seems to be endless. Mark the evlist's state as terminated, preparing for the following fix. Signed-off-by: Wei Li Tested-by: Qi Liu --- tools/perf/builtin-record.c | 1 + tools/perf/util/evlist.c | 14 ++++++++++++++ tools/perf/util/evlist.h | 1 + tools/perf/util/evsel.h | 1 + 4 files changed, 17 insertions(+) diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index fb19ef63cc35..5646949f8cc7 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c @@ -1716,6 +1716,7 @@ static int __cmd_record(struct record *rec, int argc, const char **argv) if (done && !disabled && !target__none(&opts->target)) { trigger_off(&auxtrace_snapshot_trigger); evlist__disable(rec->evlist); + evlist__terminate(rec->evlist); disabled = true; } } diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c index b9c7e5271611..b04794cd8586 100644 --- a/tools/perf/util/evlist.c +++ b/tools/perf/util/evlist.c @@ -377,6 +377,20 @@ bool evsel__cpu_iter_skip(struct evsel *ev, int cpu) return true; } +void evlist__terminate(struct evlist *evlist) +{ + struct evsel *pos; + + evlist__for_each_entry(evlist, pos) { + if (pos->disabled || !perf_evsel__is_group_leader(pos) || !pos->core.fd) + continue; + evsel__disable(pos); + pos->terminated = true; + } + + evlist->enabled = false; +} + void evlist__disable(struct evlist *evlist) { struct evsel *pos; diff --git a/tools/perf/util/evlist.h b/tools/perf/util/evlist.h index f5bd5c386df1..9fbd0ce2a1c4 100644 --- a/tools/perf/util/evlist.h +++ b/tools/perf/util/evlist.h @@ -206,6 +206,7 @@ void evlist__munmap(struct evlist *evlist); size_t evlist__mmap_size(unsigned long pages); +void evlist__terminate(struct evlist *evlist); void evlist__disable(struct evlist *evlist); void evlist__enable(struct evlist *evlist); void perf_evlist__toggle_enable(struct evlist *evlist); diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h index dc14f4a823cd..8e8a2cb41de8 100644 --- a/tools/perf/util/evsel.h +++ b/tools/perf/util/evsel.h @@ -104,6 +104,7 @@ struct evsel { perf_evsel__sb_cb_t *cb; void *data; } side_band; + bool terminated; }; struct perf_missing_features { -- 2.17.1