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=-12.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, 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 D12ACC2D0A3 for ; Thu, 12 Nov 2020 09:11:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9354921D40 for ; Thu, 12 Nov 2020 09:11:21 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="usFFQ+UH" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726725AbgKLJLV (ORCPT ); Thu, 12 Nov 2020 04:11:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37794 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725995AbgKLJLV (ORCPT ); Thu, 12 Nov 2020 04:11:21 -0500 Received: from mail-wm1-x342.google.com (mail-wm1-x342.google.com [IPv6:2a00:1450:4864:20::342]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5B0A1C0613D1 for ; Thu, 12 Nov 2020 01:11:19 -0800 (PST) Received: by mail-wm1-x342.google.com with SMTP id 10so4581969wml.2 for ; Thu, 12 Nov 2020 01:11:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3AXoZy1NFSFZaeqU3mhXRfclVgDkJQK/4WEqeabW1MA=; b=usFFQ+UHOqiz08ehKnSfdw39d/G6bmUT9pVpIIsBd9rCCvBrwEgh4x6cOyG3vcL+He Yl94gJzqvMFUaXRFFc81SHjQcco8t4L4BzozPierFatcjKasmyXdtbaglRMyLcW13dDV 69OqhvkmlreP5d7Y24WI6SuAYvHYaQSVdiKC9Wa3PR4oGZf+/qs4TqXlhCtho8uqdvgt yxF8LgI2mFG2d9Gx4Ufs3mnJZLiVXTfokGpTgHiy5Mb6+XoPmD5NhV4Oo8lmaWzea4gr 7VchqZxmXJSFxe7iwmFc9cuv4tNIrNQbHbz63OS2+svb8NZezJtiZIs9K56K34qP4SNY MpLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3AXoZy1NFSFZaeqU3mhXRfclVgDkJQK/4WEqeabW1MA=; b=k2v6IOfR7HuCdMzDPSg8iPxivXaOkOaB3ksZaHQT9iCPMXQ6V23CT8OB0jUL57dtNH CNIP8xA1JxpZ7hiKBosx6bVXJxyqcnn8qefgA5l7Til8chwYZ0GLmQns7xX3M0DpBYKp ROA01elIwhCcnSkzOarYD9g/gkRlLYaFa7EU+S/zRFTKzeF3FNuq6eR9CSuJc/CCfGZY tTMMDpiY95p3IxgZLnQZu6gwcSQnQxg2lIhmDVFrgS1fDfLgUoAq5B6PRlTgk9lmWxR+ cpBrXaWTeMTWDhFK2NPE+vZnxZuQzwmImw8emipbsFm+x8Wuh+8pDhPGB5pq+lntD8vx brng== X-Gm-Message-State: AOAM530OoxTUZ562jldfMHWo11qKwTzGsOCBGLeRY2jK+iGHTsX0j2pi vR43AmXQ9y2i0x7JCw64w7/jqrCdOns1c9Ss X-Google-Smtp-Source: ABdhPJzMOqMUXyUw5MBq6eVzf3ubk+6FusxPtSJVyebErWzLr2GvuCvE+sTFkoBCqL2HQpe/CmXKQg== X-Received: by 2002:a1c:e087:: with SMTP id x129mr8257108wmg.2.1605172278150; Thu, 12 Nov 2020 01:11:18 -0800 (PST) Received: from oberon.zico.biz ([83.222.187.186]) by smtp.gmail.com with ESMTPSA id r18sm6705718wrj.50.2020.11.12.01.11.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Nov 2020 01:11:17 -0800 (PST) From: "Tzvetomir Stoyanov (VMware)" To: rostedt@goodmis.org Cc: linux-trace-devel@vger.kernel.org Subject: [PATCH v3 6/6] trace-cmd: Add new libtrasefs API to get the current trace clock Date: Thu, 12 Nov 2020 11:11:09 +0200 Message-Id: <20201112091109.1239169-7-tz.stoyanov@gmail.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201112091109.1239169-1-tz.stoyanov@gmail.com> References: <20201112091109.1239169-1-tz.stoyanov@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org A new API is added to tracefs library: tracefs_get_clock() It reads the trace_clock file from the ftrace file system, parses it and returns a string with the current trace clock. The returned string must be freed by free(). Signed-off-by: Tzvetomir Stoyanov (VMware) --- include/tracefs/tracefs.h | 2 ++ lib/tracefs/tracefs-instance.c | 35 ++++++++++++++++++++++++++++++++++ tracecmd/trace-stat.c | 29 +++++++--------------------- utest/tracefs-utest.c | 30 ++++++++++++++++++++++++++++- 4 files changed, 73 insertions(+), 23 deletions(-) diff --git a/include/tracefs/tracefs.h b/include/tracefs/tracefs.h index bcf3dd64..3358e33d 100644 --- a/include/tracefs/tracefs.h +++ b/include/tracefs/tracefs.h @@ -57,4 +57,6 @@ struct tep_handle *tracefs_local_events_system(const char *tracing_dir, int tracefs_fill_local_events(const char *tracing_dir, struct tep_handle *tep, int *parsing_failures); +char *tracefs_get_clock(struct tracefs_instance *instance); + #endif /* _TRACE_FS_H */ diff --git a/lib/tracefs/tracefs-instance.c b/lib/tracefs/tracefs-instance.c index 7b6d9417..d806636e 100644 --- a/lib/tracefs/tracefs-instance.c +++ b/lib/tracefs/tracefs-instance.c @@ -397,3 +397,38 @@ out: tracefs_put_tracing_file(path); return fret; } + +/** + * tracefs_get_clock - Get the current trace clock + * @instance: ftrace instance, can be NULL for the top instance + * + * Returns the current trace clock of the given instance, or NULL in + * case of an error. + * The return string must be freed by free() + */ +char *tracefs_get_clock(struct tracefs_instance *instance) +{ + char *all_clocks = NULL; + char *ret = NULL; + int bytes = 0; + char *clock; + char *cont; + + all_clocks = tracefs_instance_file_read(instance, "trace_clock", &bytes); + if (!all_clocks || !bytes) + goto out; + + clock = strstr(all_clocks, "["); + if (!clock) + goto out; + clock++; + cont = strstr(clock, "]"); + if (!cont) + goto out; + *cont = '\0'; + + ret = strdup(clock); +out: + free(all_clocks); + return ret; +} diff --git a/tracecmd/trace-stat.c b/tracecmd/trace-stat.c index e6678eab..9b61a14f 100644 --- a/tracecmd/trace-stat.c +++ b/tracecmd/trace-stat.c @@ -710,33 +710,18 @@ static void report_buffers(struct buffer_instance *instance) static void report_clock(struct buffer_instance *instance) { - char *str; - char *cont; char *clock; - str = get_instance_file_content(instance, "trace_clock"); - if (!str) - return; - - clock = strstr(str, "["); - if (!clock) - goto out; - clock++; - - cont = strstr(clock, "]"); - if (!cont) /* should never happen */ - goto out; - - *cont = '\0'; + if (instance) + clock = tracefs_get_clock(instance->tracefs); + else + clock = tracefs_get_clock(NULL); /* Default clock is "local", only show others */ - if (strcmp(clock, "local") == 0) - goto out; + if (clock && !strcmp(clock, "local") == 0) + printf("\nClock: %s\n", clock); - printf("\nClock: %s\n", clock); - - out: - free(str); + free(clock); } static void report_cpumask(struct buffer_instance *instance) diff --git a/utest/tracefs-utest.c b/utest/tracefs-utest.c index c42fea12..78eda481 100644 --- a/utest/tracefs-utest.c +++ b/utest/tracefs-utest.c @@ -511,6 +511,33 @@ static void test_instances_walk(void) } } +static void current_clock_check(const char *clock) +{ + int size = 0; + char *clocks; + char *str; + + clocks = tracefs_instance_file_read(test_instance, "trace_clock", &size); + CU_TEST(clocks != NULL); + CU_TEST(size > strlen(clock)); + str = strstr(clocks, clock); + CU_TEST(str != NULL); + CU_TEST(str != clocks); + CU_TEST(*(str - 1) == '['); + CU_TEST(*(str + strlen(clock)) == ']'); + free(clocks); +} + +static void test_get_clock(void) +{ + const char *clock; + + clock = tracefs_get_clock(test_instance); + CU_TEST(clock != NULL); + current_clock_check(clock); + free((char *)clock); +} + static int test_suite_destroy(void) { tracefs_instance_destroy(test_instance); @@ -556,5 +583,6 @@ void test_tracefs_lib(void) test_local_events); CU_add_test(suite, "tracefs_instances_walk API", test_instances_walk); - + CU_add_test(suite, "tracefs_get_clock API", + test_get_clock); } -- 2.28.0