Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="Y/oR5VbW" 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 22E561990 for ; Mon, 27 Nov 2023 14:10:04 -0800 (PST) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-5c5daf2baccso61221077b3.3 for ; Mon, 27 Nov 2023 14:10:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1701123003; x=1701727803; 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=74QLH4lft9zfzlsPq86t9Qk+/WjoI7cS4MoOjhAmrDw=; b=Y/oR5VbWO0lojZUT3goA1EGmqSRbmbnvRdC5dRR4fA2LIeuTr8KZovchCmi8HCXIJG p0hOJ4sAmT86IMx0Wh6/nqK0NpjLnSsaqeZ7tEjEuv8CzDkqY7L0wDqgQQfRQ4MDFOlh jaVN8i7tqYQ0N5NsPdptlwxzllWDeGAr/Z9d69MoEDAjOs7dW42UahVF/nAKmWKpFEdC V7ltwXQQRwlRFGVrzM3rrmk2atXiYJa/xvsOTbnhlPr94u5MmfvXVdQIQMQ1YXvGOrQc YmS5nP9DLTwx8VyIKuGQ5xjMq/IQLAVvJNRAgQKM43jPo4EqRAl5ZauN/HgrBpHoWWZg +/iQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701123003; x=1701727803; 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=74QLH4lft9zfzlsPq86t9Qk+/WjoI7cS4MoOjhAmrDw=; b=Yp3bcYz46CW/1Hhr4uDxl4rBhKQyUlsSp0CRbRtHAC8usd4UHuXQlRjvim9bF6F6Ip /eF+Hrd7a1ArjNxpKCONMraOY9Og2jx4RSM8Kcth+ZSljTpjs1C0aGa2XXLD8pTF2yIv UJjm7rkTrsY9P2MUXWdckxnlASaEJU79CIj3YpbOEDRFjFwF9WK6YRC0+fMG2eC2P8V8 Ge7o81zBOQj3XFKcCXpZODP5fslfd5pg6N/70H9+YXUocwXIu8L4uIUU91DhTUgfJeux QdguxHTAPUPz3ZvIyLBgJ/krMFaUD4hc0FCnDk+jt21V+k+Qc0HLDIN6DZ50+H87G7bo m6Rw== X-Gm-Message-State: AOJu0YzpfqzKfzftEhriqzytqff24G3xTdcUgaLiO22A9qBj6umMFGo4 7nzZ7Mypw/fUNLeK/Ww9UplaI/fM2FLA X-Google-Smtp-Source: AGHT+IFpLm8wJ88TEpLGjaTEVM0kBmLE+9Aqm8CkqTibxFOq5ZdHR/4ErHO5caCX/uuCebGtpCZvzHcwSbzN X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:829:6e77:9093:f39b]) (user=irogers job=sendgmr) by 2002:a05:690c:fcd:b0:5ca:fef:82a4 with SMTP id dg13-20020a05690c0fcd00b005ca0fef82a4mr492696ywb.4.1701123003294; Mon, 27 Nov 2023 14:10:03 -0800 (PST) Date: Mon, 27 Nov 2023 14:08:29 -0800 In-Reply-To: <20231127220902.1315692-1-irogers@google.com> Message-Id: <20231127220902.1315692-18-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: <20231127220902.1315692-1-irogers@google.com> X-Mailer: git-send-email 2.43.0.rc1.413.gea7ed67945-goog Subject: [PATCH v5 17/50] perf debug: Expose debug file From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Ian Rogers , Adrian Hunter , Nick Terrell , Kan Liang , Andi Kleen , Kajol Jain , Athira Rajeev , Huacai Chen , Masami Hiramatsu , Vincent Whitchurch , "Steinar H. Gunderson" , Liam Howlett , Miguel Ojeda , Colin Ian King , Dmitrii Dolgov <9erthalion6@gmail.com>, Yang Jihong , Ming Wang , James Clark , K Prateek Nayak , Sean Christopherson , Leo Yan , Ravi Bangoria , German Gomez , Changbin Du , Paolo Bonzini , Li Dong , Sandipan Das , liuwenyu , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Guilherme Amadio Content-Type: text/plain; charset="UTF-8" Some dumping call backs need to be passed a FILE*. Expose debug file via an accessor API for a consistent way to do this. Catch the unlikely failure of it not being set. Switch two cases where stderr was being used instead of debug_file. Signed-off-by: Ian Rogers --- tools/perf/util/debug.c | 22 +++++++++++++++------- tools/perf/util/debug.h | 1 + 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/tools/perf/util/debug.c b/tools/perf/util/debug.c index 88378c4c5dd9..e282b4ceb4d2 100644 --- a/tools/perf/util/debug.c +++ b/tools/perf/util/debug.c @@ -38,12 +38,21 @@ bool dump_trace = false, quiet = false; int debug_ordered_events; static int redirect_to_stderr; int debug_data_convert; -static FILE *debug_file; +static FILE *_debug_file; bool debug_display_time; +FILE *debug_file(void) +{ + if (!_debug_file) { + pr_warning_once("debug_file not set"); + debug_set_file(stderr); + } + return _debug_file; +} + void debug_set_file(FILE *file) { - debug_file = file; + _debug_file = file; } void debug_set_display_time(bool set) @@ -78,8 +87,8 @@ int veprintf(int level, int var, const char *fmt, va_list args) if (use_browser >= 1 && !redirect_to_stderr) { ui_helpline__vshow(fmt, args); } else { - ret = fprintf_time(debug_file); - ret += vfprintf(debug_file, fmt, args); + ret = fprintf_time(debug_file()); + ret += vfprintf(debug_file(), fmt, args); } } @@ -107,9 +116,8 @@ static int veprintf_time(u64 t, const char *fmt, va_list args) nsecs -= secs * NSEC_PER_SEC; usecs = nsecs / NSEC_PER_USEC; - ret = fprintf(stderr, "[%13" PRIu64 ".%06" PRIu64 "] ", - secs, usecs); - ret += vfprintf(stderr, fmt, args); + ret = fprintf(debug_file(), "[%13" PRIu64 ".%06" PRIu64 "] ", secs, usecs); + ret += vfprintf(debug_file(), fmt, args); return ret; } diff --git a/tools/perf/util/debug.h b/tools/perf/util/debug.h index f99468a7f681..de8870980d44 100644 --- a/tools/perf/util/debug.h +++ b/tools/perf/util/debug.h @@ -77,6 +77,7 @@ int eprintf_time(int level, int var, u64 t, const char *fmt, ...) __printf(4, 5) int veprintf(int level, int var, const char *fmt, va_list args); int perf_debug_option(const char *str); +FILE *debug_file(void); void debug_set_file(FILE *file); void debug_set_display_time(bool set); void perf_debug_setup(void); -- 2.43.0.rc1.413.gea7ed67945-goog