From patchwork Thu Mar 2 03:11:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Changbin Du X-Patchwork-Id: 63182 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp4014934wrd; Wed, 1 Mar 2023 19:21:10 -0800 (PST) X-Google-Smtp-Source: AK7set9rNNpWAaRrwwJJlKc+l7M2g8gcSprxLVSOxGinPGTHSXHM4wRIybu7djVJIcrZucYb7PPL X-Received: by 2002:a17:906:5805:b0:86a:833d:e7d8 with SMTP id m5-20020a170906580500b0086a833de7d8mr8272118ejq.17.1677727270441; Wed, 01 Mar 2023 19:21:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677727270; cv=none; d=google.com; s=arc-20160816; b=QHMGdRQE2EAOMJ1JAhPFgWIWS8cwSAjAXD/f8UsFj/xnqD9nWUJ4Ud7RjHD/C+Gur+ nampNg25coVf/S9MYK4rGYO64pRIuD7tsDS96nmmjGa4sjuwbZtrAfoiat8pD4Q3sCp4 YlIJ8IsD2C/GFOwSevGIswKqlaDz3TW0iWIHRInpR/STcFCWMawX5Af9mvE2XcsL7DLl VVdnnrV5t1CUbuxkP32tNT3vMmj8Vl47nk5se+uPFoZcJwwuFL+TA52UzsHMiHVXfI71 Exz12u2fDSjj6piE85aqXOcSh/6oZgn4u13hGUZR8OaVNGC4Wk34uvorLbHzhnEXkD8y KO3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=isaHV9BtftvluqgSg2rNUf59H/MyDw+uSy9PrwA136E=; b=zAQvdye4JFTpa5v0MkWmzgjx1bPbk/buZgYxzYJWub5DBlW7vDU7OEoKSuV4XpKVjh KThBNiXweBvocwaRihwIqhgO5j+aTwxCR9qwzvvd/CVj/NNlp/I9V9BDW3KuNwfd8LpD LdK6ipEbX+EOQ3nKAjtzlFmrxIU371qWnEjV5JcaUue14j1uKTNik8my8ubO2r9i53o+ u8ux7UWVIMyzQ4spnqu2ffyLGwz36pDx7NHWpiLkrenQIWDpLUSiwUt07hFuCAEBXB/I JUBl312mTHu3EhIXaDe4HLDgfJAWg6/M9rU5hI5msaFLnjpzXn5btUnd926JJv1L4G/s CgTQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m22-20020a170906259600b008b177104a57si13270412ejb.344.2023.03.01.19.20.47; Wed, 01 Mar 2023 19:21:10 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229900AbjCBDMf (ORCPT + 99 others); Wed, 1 Mar 2023 22:12:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56722 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229778AbjCBDM1 (ORCPT ); Wed, 1 Mar 2023 22:12:27 -0500 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B8FF6532BD; Wed, 1 Mar 2023 19:12:25 -0800 (PST) Received: from kwepemi500013.china.huawei.com (unknown [172.30.72.55]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4PRx335ky4zrS3t; Thu, 2 Mar 2023 11:11:43 +0800 (CST) Received: from M910t.huawei.com (10.110.54.157) by kwepemi500013.china.huawei.com (7.221.188.120) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.21; Thu, 2 Mar 2023 11:12:22 +0800 From: Changbin Du To: Arnaldo Carvalho de Melo , Peter Zijlstra , Ingo Molnar CC: Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , , , Hui Wang , Changbin Du Subject: [PATCH v2 3/3] perf: ftrace: reuse target::initial_delay Date: Thu, 2 Mar 2023 11:11:46 +0800 Message-ID: <20230302031146.2801588-4-changbin.du@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230302031146.2801588-1-changbin.du@huawei.com> References: <20230302031146.2801588-1-changbin.du@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.110.54.157] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To kwepemi500013.china.huawei.com (7.221.188.120) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759224550307311721?= X-GMAIL-MSGID: =?utf-8?q?1759224550307311721?= Replace perf_ftrace::initial_delay with target::initial_delay. Specifying a negative initial_delay is meaningless for ftrace in practice but allowed here. Signed-off-by: Changbin Du --- tools/perf/builtin-ftrace.c | 10 +++++----- tools/perf/util/ftrace.h | 1 - 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/tools/perf/builtin-ftrace.c b/tools/perf/builtin-ftrace.c index d7fe00f66b83..73d51ce84c3a 100644 --- a/tools/perf/builtin-ftrace.c +++ b/tools/perf/builtin-ftrace.c @@ -623,7 +623,7 @@ static int __cmd_ftrace(struct perf_ftrace *ftrace) /* display column headers */ read_tracing_file_to_stdout("trace"); - if (!ftrace->initial_delay) { + if (!ftrace->target.initial_delay) { if (write_tracing_file("tracing_on", "1") < 0) { pr_err("can't enable tracing\n"); goto out_close_fd; @@ -632,8 +632,8 @@ static int __cmd_ftrace(struct perf_ftrace *ftrace) evlist__start_workload(ftrace->evlist); - if (ftrace->initial_delay) { - usleep(ftrace->initial_delay * 1000); + if (ftrace->target.initial_delay > 0) { + usleep(ftrace->target.initial_delay * 1000); if (write_tracing_file("tracing_on", "1") < 0) { pr_err("can't enable tracing\n"); goto out_close_fd; @@ -1164,8 +1164,8 @@ int cmd_ftrace(int argc, const char **argv) "Size of per cpu buffer, needs to use a B, K, M or G suffix.", parse_buffer_size), OPT_BOOLEAN(0, "inherit", &ftrace.inherit, "Trace children processes"), - OPT_UINTEGER('D', "delay", &ftrace.initial_delay, - "Number of milliseconds to wait before starting tracing after program start"), + OPT_INTEGER('D', "delay", &ftrace.target.initial_delay, + "Number of milliseconds to wait before starting tracing after program start"), OPT_PARENT(common_options), }; const struct option latency_options[] = { diff --git a/tools/perf/util/ftrace.h b/tools/perf/util/ftrace.h index a34cd15733b8..558efcb98d25 100644 --- a/tools/perf/util/ftrace.h +++ b/tools/perf/util/ftrace.h @@ -25,7 +25,6 @@ struct perf_ftrace { int graph_noirqs; int graph_verbose; int graph_thresh; - unsigned int initial_delay; }; struct filter_entry {