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=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 45E51C4320A for ; Wed, 28 Jul 2021 13:34:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 313DC60EC0 for ; Wed, 28 Jul 2021 13:34:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236718AbhG1NeI (ORCPT ); Wed, 28 Jul 2021 09:34:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54366 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236711AbhG1NeH (ORCPT ); Wed, 28 Jul 2021 09:34:07 -0400 Received: from mail-ej1-x62a.google.com (mail-ej1-x62a.google.com [IPv6:2a00:1450:4864:20::62a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C162FC061764 for ; Wed, 28 Jul 2021 06:34:02 -0700 (PDT) Received: by mail-ej1-x62a.google.com with SMTP id v21so4690185ejg.1 for ; Wed, 28 Jul 2021 06:34:02 -0700 (PDT) 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=O3MlOCSVZr10henjb/kOmATFSY+Wwfn0tH13upLABCo=; b=nHTRaVXq2FBKW5Dfe5mtwqH/UPS38w5kM1IfPRIJEY2xT3AJcCgjtR3W/SwZtzGw7a JVKDtr0Yis+ln5mjzl5Asu+4jQW2HJGpUuRD/gNqdp91eDrIz0wGHRFU8e/3VbjUIvyE c+Gce3uLUz8yMx4i6ZErMIFbRIJ1utGWJvtEp3t5nkdBgkmeabeskFDuQosq0Nw43xA8 oYoPaf88vyaHhmJBaxA8qIF98TbUhwm87qOtiF1WUROG4rcLcJlF+msKQQKWUNAGzIic SoCLkgPKinXhSFUX7WGf6uwvISBwkbwopgQ/I7m5r/h8Oell/ulWf9O6stRrU23NKTJs cF8A== 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=O3MlOCSVZr10henjb/kOmATFSY+Wwfn0tH13upLABCo=; b=UuD1jN+MX/q+DRdQNi9U7tI/rGGLE/mk1qx1m7arT6lCFjvanJZD074pZaUTWpUZR2 WIAwJ6f4JXcbsW2v+YyQjszcuzVd1jcVVvx3T76b2GJ0viWK7VVD95+N+t03T1jAQB/q fpBM0dp9KQ5yN4CR8Sv2nIMrwrdQlHNKrzu5kSkyqS9Z87OFv6/YiMi1cUJNuY0xSpLQ WnwNAPrCKT+6pTFH75T0ZEktOfnf7ApEah6G/KggjCZLlKPo2d/t3dEH+qMYz+cizWbg lmk+pQnjU6ROnNbu9ef7efmy7O4Jz/qVRendM7kwXr0jsPSejIup2tvz/bNxzy+O2erI 6ZBQ== X-Gm-Message-State: AOAM53290uHjGcRg3ryA0AAOZ8TJKNrNDlS6fIAVIcIjKfjv+Sts1Cve mOxefncBESOQXyBXaVB/r6LqBDSCwWRzJQ== X-Google-Smtp-Source: ABdhPJw3adNtqjzIebWJ8fTET2Nc7sYVz7VvqgzM7cWC/PcgtlTZ+4VY9tTLsgt5yFRlbGsihHo+zg== X-Received: by 2002:a17:906:2a8e:: with SMTP id l14mr27113835eje.321.1627479237452; Wed, 28 Jul 2021 06:33:57 -0700 (PDT) Received: from oberon.zico.biz ([83.222.187.186]) by smtp.gmail.com with ESMTPSA id b25sm2700705edv.9.2021.07.28.06.33.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Jul 2021 06:33:53 -0700 (PDT) From: "Tzvetomir Stoyanov (VMware)" To: rostedt@goodmis.org Cc: linux-trace-devel@vger.kernel.org Subject: [PATCH 61/87] trace-cmd: Call additional APIs when creating trace file Date: Wed, 28 Jul 2021 16:32:24 +0300 Message-Id: <20210728133250.234140-62-tz.stoyanov@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210728133250.234140-1-tz.stoyanov@gmail.com> References: <20210728133250.234140-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 When creating a trace file, two more APIs should be called, compared to the old flow: - tracecmd_write_buffer_info(), to write version 6 buffers metadata in the file. - tracecmd_write_options() after the trace data is written, for version 7 trace files, as the buffer metadata is appended to the options at the end. Signed-off-by: Tzvetomir Stoyanov (VMware) --- tracecmd/trace-listen.c | 6 ++++++ tracecmd/trace-record.c | 4 ++++ tracecmd/trace-restore.c | 3 ++- tracecmd/trace-split.c | 3 +++ 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/tracecmd/trace-listen.c b/tracecmd/trace-listen.c index d812145b..3312a042 100644 --- a/tracecmd/trace-listen.c +++ b/tracecmd/trace-listen.c @@ -604,6 +604,9 @@ static int put_together_file(int cpus, int ofd, const char *node, if (write_options) { ret = tracecmd_write_cpus(handle, cpus); + if (ret) + goto out; + ret = tracecmd_write_buffer_info(handle); if (ret) goto out; ret = tracecmd_write_options(handle); @@ -612,6 +615,9 @@ static int put_together_file(int cpus, int ofd, const char *node, } ret = tracecmd_write_cpu_data(handle, cpus, temp_files, ""); + if (!ret && tracecmd_get_out_file_version(handle) >= 7) + tracecmd_write_options(handle); + out: tracecmd_output_close(handle); for (cpu--; cpu >= 0; cpu--) { diff --git a/tracecmd/trace-record.c b/tracecmd/trace-record.c index 2e8db8a4..ddab7798 100644 --- a/tracecmd/trace-record.c +++ b/tracecmd/trace-record.c @@ -3738,6 +3738,9 @@ setup_connection(struct buffer_instance *instance, struct common_record_context if (ret) goto error; ret = tracecmd_write_cpus(network_handle, instance->cpu_count); + if (ret) + goto error; + ret = tracecmd_write_buffer_info(network_handle); if (ret) goto error; ret = tracecmd_write_options(network_handle); @@ -4109,6 +4112,7 @@ static void setup_agent(struct buffer_instance *instance, add_options(network_handle, ctx); tracecmd_write_cmdlines(network_handle); tracecmd_write_cpus(network_handle, instance->cpu_count); + tracecmd_write_buffer_info(network_handle); tracecmd_write_options(network_handle); tracecmd_msg_finish_sending_data(instance->msg_handle); instance->network_handle = network_handle; diff --git a/tracecmd/trace-restore.c b/tracecmd/trace-restore.c index 8d2fcae8..fbda42dd 100644 --- a/tracecmd/trace-restore.c +++ b/tracecmd/trace-restore.c @@ -163,6 +163,7 @@ void trace_restore (int argc, char **argv) if (tracecmd_append_cpu_data(handle, args, &argv[first_arg]) < 0) die("failed to append data"); - + if (tracecmd_get_out_file_version(handle) >= 7) + tracecmd_write_options(handle); return; } diff --git a/tracecmd/trace-split.c b/tracecmd/trace-split.c index e4a0c3b3..0768329f 100644 --- a/tracecmd/trace-split.c +++ b/tracecmd/trace-split.c @@ -391,6 +391,9 @@ static double parse_file(struct tracecmd_input *handle, if (tracecmd_append_cpu_data(ohandle, cpus, cpu_list) < 0) die("Failed to append tracing data\n"); + if (tracecmd_get_out_file_version(ohandle) >= 7) + tracecmd_write_options(ohandle); + current = end; for (cpu = 0; cpu < cpus; cpu++) { /* Set the tracecmd cursor to the next set of records */ -- 2.31.1