From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 97E29194A59 for ; Wed, 26 Jun 2024 20:37:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719434222; cv=none; b=DjFUc8hR2yb1X+HcKT1LSdZinAErQKt7N4608EGBfnrMAfCi9u+3AgQbFCnhWiv0MiDyX10OMOi5aUEAfxhuFm2om7NyIzEsYfte/UPtGIcdNdYPQti9jjrFu+EKEZKoVTqvJKdETdqVEzoxcB+DJSM1BZslwiPlNGX3hXwi6Kk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719434222; c=relaxed/simple; bh=RFTmrZzGTM9IWPWjHq70q/GKoQrds29ugAT8XNOZor0=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=O0cXtZXi/xOaMMpQiBMV20YskJSmLLLcPaQewQ1xmGmxfd57PHuSpGwI4mIVwbVPMSXeJkuH4V2SQpu5HG6Y4Z/QZVsWxyzV4XjCzeXhzM8rdJfzvklsZuSshR3yBGh02c8qW4auZy2cqhL21/06Gj/bPjBn6SK2/uPUaAL0IsQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=uG0PR/Zx; arc=none smtp.client-ip=209.85.128.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="uG0PR/Zx" Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-6485051924fso18515297b3.1 for ; Wed, 26 Jun 2024 13:37:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1719434219; x=1720039019; darn=vger.kernel.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=W+G0HGMTQoy+2+TKDBA5eg+niEy3wMk5iRiA3dPthGE=; b=uG0PR/Zxn96VV50kPaOiNhQ9PnN+2+GtKgs7pstJ68kOMELjgxSbjBTOLDfQ26Pfjj aq1VocKqA4/EmtvNcu8y06tQ3Bti4MwVO5bmxkuTnNaF9uCEtHTNT+XBsZv7JzBDE/0Y 7jnXtsr1XC94pTcyLoDnVOAIRHBslqposIPMlkgSzRRru2y0+X7rGf/LYW6BLMFBFW5h J8562fE8gtn06PCMcE5vrOAzaF92+4ashp+gljyJtVmQtxl9LIM+W7BODCcSYM5Zna2Q 9UBtTGR3x35uTMvneadKLrKkXQ12zJ53g31Bju/4zEAYt0XjIYZXDbp3U/CxVEY7JoIT w5/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719434220; x=1720039020; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=W+G0HGMTQoy+2+TKDBA5eg+niEy3wMk5iRiA3dPthGE=; b=pkdERSFBpfxV8X8kmwDx0tQkYB83y2X53FAgJUSeZY7fl0YLhzf1MWz+bW5ExLLqeb Z+UgIk7Mku0K3WtNmsmjFEeZ3k4aC5tVocxhyB5DXgKI/0AlO6aGgObgj8rmtfx9Sw0B Hcyd6H5uDZbj/6CMQuKaJtWRkE2J9txP0U++DN7UpMMoj45TbZ0W1fxe4hWlNJRLoimo 57YoySdImfq3xGvrr2M+dCbI7mHXjm7yYK/2v/i8PZjp4qZUwRlGcPuK2ZRTdyHnteP3 7sBo/7AeMLcSuo49UZHXBQ7T8UUbXpRE70pHbRxZCUNCYyTwUtgZPZPjNG3m1Z2T6/WD uH0A== X-Forwarded-Encrypted: i=1; AJvYcCWE111+z05IzR3Iipw+NCz42kkjIA2cVxwo+EyCvyQimljEnkWSXYHbbA74XSs6kigGlLKjCQhKFHmozYh44pr1t4hakcAmeg9qGuUkzO5R9g== X-Gm-Message-State: AOJu0Yzasmh61fMzq7M9j3qVPbWbme10thHJpQuzxR7AqgkRn16fTa+f bo1sXeO35QgJoXwHhEYZ6Am9oGhDsqDvxV2ZiiPck9SHvcmCjlOksDjbwDUT+A9YvHmYePJWl1H zJyu2ow== X-Google-Smtp-Source: AGHT+IGFNPE1mTzElJCJfk3y8lPhljBftC9JeXwX2Xh4efoZ4u/33kjM0V9SfLs8rKr6O0JpSXmbu4IU89Bx X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:23a1:25b9:2412:56de]) (user=irogers job=sendgmr) by 2002:a25:c591:0:b0:e02:d71e:87b5 with SMTP id 3f1490d57ef6-e0304009b41mr375405276.6.1719434219631; Wed, 26 Jun 2024 13:36:59 -0700 (PDT) Date: Wed, 26 Jun 2024 13:36:11 -0700 In-Reply-To: <20240626203630.1194748-1-irogers@google.com> Message-Id: <20240626203630.1194748-10-irogers@google.com> Precedence: bulk X-Mailing-List: linux-perf-users@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240626203630.1194748-1-irogers@google.com> X-Mailer: git-send-email 2.45.2.741.gdbec12cfda-goog Subject: [PATCH v2 09/27] perf lock: Use perf_tool__init From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , John Garry , Will Deacon , James Clark , Mike Leach , Leo Yan , Suzuki K Poulose , Yicong Yang , Jonathan Cameron , Nick Terrell , Nick Desaulniers , Oliver Upton , Anshuman Khandual , Song Liu , Ilkka Koskinen , Huacai Chen , Yanteng Si , Sun Haiyong , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="UTF-8" Use perf_tool__init so that more uses of struct perf_tool can be const and not relying on perf_tool__fill_defaults. Signed-off-by: Ian Rogers --- tools/perf/builtin-lock.c | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/tools/perf/builtin-lock.c b/tools/perf/builtin-lock.c index 6efa9d646637..2c216427e929 100644 --- a/tools/perf/builtin-lock.c +++ b/tools/perf/builtin-lock.c @@ -1933,22 +1933,21 @@ static bool force; static int __cmd_report(bool display_info) { int err = -EINVAL; - struct perf_tool eops = { - .attr = perf_event__process_attr, - .event_update = process_event_update, - .sample = process_sample_event, - .comm = perf_event__process_comm, - .mmap = perf_event__process_mmap, - .namespaces = perf_event__process_namespaces, - .tracing_data = perf_event__process_tracing_data, - .ordered_events = true, - }; + struct perf_tool eops; struct perf_data data = { .path = input_name, .mode = PERF_DATA_MODE_READ, .force = force, }; + perf_tool__init(&eops, /*ordered_events=*/true); + eops.attr = perf_event__process_attr; + eops.event_update = process_event_update; + eops.sample = process_sample_event; + eops.comm = perf_event__process_comm; + eops.mmap = perf_event__process_mmap; + eops.namespaces = perf_event__process_namespaces; + eops.tracing_data = perf_event__process_tracing_data; session = perf_session__new(&data, &eops); if (IS_ERR(session)) { pr_err("Initializing perf session failed\n"); @@ -2069,15 +2068,7 @@ static int check_lock_contention_options(const struct option *options, static int __cmd_contention(int argc, const char **argv) { int err = -EINVAL; - struct perf_tool eops = { - .attr = perf_event__process_attr, - .event_update = process_event_update, - .sample = process_sample_event, - .comm = perf_event__process_comm, - .mmap = perf_event__process_mmap, - .tracing_data = perf_event__process_tracing_data, - .ordered_events = true, - }; + struct perf_tool eops; struct perf_data data = { .path = input_name, .mode = PERF_DATA_MODE_READ, @@ -2100,6 +2091,14 @@ static int __cmd_contention(int argc, const char **argv) con.result = &lockhash_table[0]; + perf_tool__init(&eops, /*ordered_events=*/true); + eops.attr = perf_event__process_attr; + eops.event_update = process_event_update; + eops.sample = process_sample_event; + eops.comm = perf_event__process_comm; + eops.mmap = perf_event__process_mmap; + eops.tracing_data = perf_event__process_tracing_data; + session = perf_session__new(use_bpf ? NULL : &data, &eops); if (IS_ERR(session)) { pr_err("Initializing perf session failed\n"); -- 2.45.2.741.gdbec12cfda-goog