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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 474EDC7EE2E for ; Thu, 25 May 2023 07:12:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229459AbjEYHMt (ORCPT ); Thu, 25 May 2023 03:12:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46766 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239117AbjEYHMW (ORCPT ); Thu, 25 May 2023 03:12:22 -0400 Received: from mail-yw1-x1149.google.com (mail-yw1-x1149.google.com [IPv6:2607:f8b0:4864:20::1149]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 35FEDE49 for ; Thu, 25 May 2023 00:12:15 -0700 (PDT) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-5653213f5c0so5664897b3.1 for ; Thu, 25 May 2023 00:12:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1684998734; x=1687590734; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=Uig2l1ENW/mdXFGb6s2gWNQOI7wDuYaOhOqcyff66lU=; b=WFkyDn+GM9s1OIHNVKuObZVdfyEZgexFdMsTstTrvYmg9t0RLdNZwjobMYNXSiayqX khdAEV+aAP+kS+KCdxiXzwt7cFGQekt2njUxpoLxg5X5nXeYUFBVxaCHh8k7FsxIAa19 eJMSph0uDPi+oHI37ag0tTtjJHP6wcgWD1YGT8mxGrbueNL9TqBDYv6xD9nXfZcVOG3D M1JYUzFkmRoKy89SbJud+5Aiy165HXKl1JUVzhZEgqAbX+N6Y5Cm4DsH2R75XtuDNPbj 4Px/9KkCG1kgjvpLPmH7/005l1lS0MEqo7SWmP+4ScZUAFd8tXIU7GgquBDoQ6Ax2Xhz UzOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684998734; x=1687590734; 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=Uig2l1ENW/mdXFGb6s2gWNQOI7wDuYaOhOqcyff66lU=; b=Ohnwz0QoAnu9AQ/gwC1FO6u22VHWMaWntRre+mKeI3s8fcUcYR6yMbiS+JJmXgeW22 XVK0Mw3vZ3XS20zpWttGdYsgB9jeWipancIF05vB0R246gU9gT342fbR1SsVH9VENzUq 4/eo6w2rFzP4KfOvyvkOMJqcqB9ywSAZHk/hd0Uw+V2YIH/ETYn7zvEsawCtB4HFMGd1 ocs7Hk1Vhe4Yzb3G1JZPxB4Pcs1/WGlJ33cHow19ofuAFUGaA3lHl42W/l5qA0bPlypx 1cdOzz5Mkwy0MkazCt7Fy/cMP1IQQK+BHrU7K5xVSmbZ953xUYXPLWkRf2h7vfJ77fIE iT1Q== X-Gm-Message-State: AC+VfDxYi5pf0Q29taXV4OAr2FneA+/5ab/JaFZvXNWpETVYZXGbyhDo ZnYLHMTCzZc/aAO6AwN+uR20M+ueEUQT X-Google-Smtp-Source: ACHHUZ5yqtiQnY7SZWdEmci8o4nFxrT52OQmcvPZ769+IpbJUqBpS9Sahk1sEapJJzGEI75KmWqAlmB6gHKV X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:7aa7:3d2d:76ae:8e96]) (user=irogers job=sendgmr) by 2002:a05:6902:1813:b0:ba8:4000:d7e1 with SMTP id cf19-20020a056902181300b00ba84000d7e1mr1224821ybb.2.1684998734413; Thu, 25 May 2023 00:12:14 -0700 (PDT) Date: Thu, 25 May 2023 00:11:24 -0700 In-Reply-To: <20230525071133.2066610-1-irogers@google.com> Message-Id: <20230525071133.2066610-8-irogers@google.com> Mime-Version: 1.0 References: <20230525071133.2066610-1-irogers@google.com> X-Mailer: git-send-email 2.40.1.698.g37aff9b760-goog Subject: [PATCH v1 07/16] tools lib api fs tracing_path: Remove two unused MAX_PATH paths From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Ian Rogers , Adrian Hunter , "Masami Hiramatsu (Google)" , "Steven Rostedt (Google)" , Ross Zwisler , Leo Yan , Tiezhu Yang , Yang Jihong , Andi Kleen , Kan Liang , Ravi Bangoria , Sean Christopherson , K Prateek Nayak , Paolo Bonzini , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-perf-users@vger.kernel.org tracing_mnt was set but never written. tracing_events_path was set and read on errors paths, but its value is exactly tracing_path with a "/events" appended, so we can derive the value in the error paths. There appears to have been a missing "/" when tracing_events_path was initialized. Signed-off-by: Ian Rogers --- tools/lib/api/fs/tracing_path.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/tools/lib/api/fs/tracing_path.c b/tools/lib/api/fs/tracing_path.c index 7ba3e81274e8..30745f35d0d2 100644 --- a/tools/lib/api/fs/tracing_path.c +++ b/tools/lib/api/fs/tracing_path.c @@ -13,17 +13,12 @@ #include "tracing_path.h" -static char tracing_mnt[PATH_MAX] = "/sys/kernel/debug"; static char tracing_path[PATH_MAX] = "/sys/kernel/tracing"; -static char tracing_events_path[PATH_MAX] = "/sys/kernel/tracing/events"; static void __tracing_path_set(const char *tracing, const char *mountpoint) { - snprintf(tracing_mnt, sizeof(tracing_mnt), "%s", mountpoint); snprintf(tracing_path, sizeof(tracing_path), "%s/%s", mountpoint, tracing); - snprintf(tracing_events_path, sizeof(tracing_events_path), "%s/%s%s", - mountpoint, tracing, "events"); } static const char *tracing_path_tracefs_mount(void) @@ -149,15 +144,15 @@ int tracing_path__strerror_open_tp(int err, char *buf, size_t size, /* sdt markers */ if (!strncmp(filename, "sdt_", 4)) { snprintf(buf, size, - "Error:\tFile %s/%s not found.\n" + "Error:\tFile %s/events/%s not found.\n" "Hint:\tSDT event cannot be directly recorded on.\n" "\tPlease first use 'perf probe %s:%s' before recording it.\n", - tracing_events_path, filename, sys, name); + tracing_path, filename, sys, name); } else { snprintf(buf, size, - "Error:\tFile %s/%s not found.\n" + "Error:\tFile %s/events/%s not found.\n" "Hint:\tPerhaps this kernel misses some CONFIG_ setting to enable this feature?.\n", - tracing_events_path, filename); + tracing_path, filename); } break; } @@ -169,9 +164,9 @@ int tracing_path__strerror_open_tp(int err, char *buf, size_t size, break; case EACCES: { snprintf(buf, size, - "Error:\tNo permissions to read %s/%s\n" + "Error:\tNo permissions to read %s/events/%s\n" "Hint:\tTry 'sudo mount -o remount,mode=755 %s'\n", - tracing_events_path, filename, tracing_path_mount()); + tracing_path, filename, tracing_path_mount()); } break; default: -- 2.40.1.698.g37aff9b760-goog