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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 57E21C433FE for ; Fri, 8 Oct 2021 04:20:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 41991610CE for ; Fri, 8 Oct 2021 04:20:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230409AbhJHEWR (ORCPT ); Fri, 8 Oct 2021 00:22:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49870 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230080AbhJHEWQ (ORCPT ); Fri, 8 Oct 2021 00:22:16 -0400 Received: from mail-ed1-x52e.google.com (mail-ed1-x52e.google.com [IPv6:2a00:1450:4864:20::52e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0A5D5C061570 for ; Thu, 7 Oct 2021 21:20:22 -0700 (PDT) Received: by mail-ed1-x52e.google.com with SMTP id p13so31774674edw.0 for ; Thu, 07 Oct 2021 21:20:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=YTI10lwEeAnVMaS6JjzbIGeHCvuyzZKxzXlV0DHYQH8=; b=bxsJOafTRglagv3ZLj7iUxA4Qd/MkfM4p66UvZT3ocja6Duu6brGQZQC/hliq7Okqr wcNPPP/7m+wn+nMMbWEoQBReRtguIavKEJ4qSnv7d+PT+NZgyPWXxCp4i/U6EopVCd+Y SIxUlkEiERaf8noJzt/S+wr/1I874XHUK7erNjfZ1zEttHwfRC89PBPTIpU28O4k/oRX 5E3vm1LhkcZa1UYh+aAugLvrs3CBkS1uiuuMZj5k8EcQM1nooJW+qkVJewCvGQTnU3gg 3XxyV/KP3jGGv6ngxfPp1pU//gHINBa9wmXVxXJ9E/21o29rspE7XJ9fblV9JUo1Kt2R kGxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=YTI10lwEeAnVMaS6JjzbIGeHCvuyzZKxzXlV0DHYQH8=; b=D30AEDGFYuP1yJ3fPwmQqLtjgUNM/UBGj/5MOeKcb9zkBgGj/3DFS8yfpVzUr+oobg sM0ZgTFyJEzflNq+MFGyjLhbxYb+YfbEYTVdbeuP/yEK37FURBxr+jWESYUTWW6sSXz7 V33494hoXZ9INGiZftWkH0E0eK0Cy4Lyog5sSDK5ESQX2bxYrWkFMPgYFHENPHTeRJIE uh30AMEbJKeCkRr2cEGFVqZCDSdobWQ6ECbbY/F3ICq/RPK/UTXtBGzfU7GorYCBl8OS kRPllrv3nIFOIPFRT2Kdlo780GzkTVlXEK/T3Sbv96/r76oQZ8C0CKSbYzWT3reqEvbU 1GiQ== X-Gm-Message-State: AOAM533gS5c0mQm5WZt4l/5BkkMaqlmBj6rzqrWge9nQFvFZxqxsoYEI S+MEORkju3T6BMJ3UTFrBIwvryeim+qF0w== X-Google-Smtp-Source: ABdhPJwcQnIl7nAdfSusdGqAfK1qCVYEpNcQpqOBBZ14/oAyDT94ZXSttkTxcnhiDAe/qd4VWs6pag== X-Received: by 2002:a05:6402:411:: with SMTP id q17mr11887129edv.35.1633666820638; Thu, 07 Oct 2021 21:20:20 -0700 (PDT) Received: from oberon.zico.biz ([83.222.187.186]) by smtp.gmail.com with ESMTPSA id p6sm511669edi.18.2021.10.07.21.20.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Oct 2021 21:20:20 -0700 (PDT) From: "Tzvetomir Stoyanov (VMware)" To: rostedt@goodmis.org Cc: linux-trace-devel@vger.kernel.org Subject: [PATCH v4 19/25] trace-cmd library: Handle the extended DONE option Date: Fri, 8 Oct 2021 07:19:52 +0300 Message-Id: <20211008041958.976309-20-tz.stoyanov@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211008041958.976309-1-tz.stoyanov@gmail.com> References: <20211008041958.976309-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 In trace file version 7 the DONE option is extended to store the offset in the file to the next options section. This way a list of options sections can be stored in the file. Added logic to recursively read all option sections from the file. Signed-off-by: Tzvetomir Stoyanov (VMware) --- lib/trace-cmd/include/trace-cmd-local.h | 1 + lib/trace-cmd/trace-input.c | 42 +++++++++++++++++++++++-- lib/trace-cmd/trace-output.c | 2 +- 3 files changed, 41 insertions(+), 4 deletions(-) diff --git a/lib/trace-cmd/include/trace-cmd-local.h b/lib/trace-cmd/include/trace-cmd-local.h index d3760483..4b26960f 100644 --- a/lib/trace-cmd/include/trace-cmd-local.h +++ b/lib/trace-cmd/include/trace-cmd-local.h @@ -51,5 +51,6 @@ struct cpu_data_source { int out_write_cpu_data(struct tracecmd_output *handle, int cpus, struct cpu_data_source *data, const char *buff_name); off64_t msg_lseek(struct tracecmd_msg_handle *msg_handle, off_t offset, int whence); +unsigned long long get_last_option_offset(struct tracecmd_input *handle); #endif /* _TRACE_CMD_LOCAL_H */ diff --git a/lib/trace-cmd/trace-input.c b/lib/trace-cmd/trace-input.c index 70be9988..6137fc89 100644 --- a/lib/trace-cmd/trace-input.c +++ b/lib/trace-cmd/trace-input.c @@ -175,6 +175,7 @@ struct tracecmd_input { struct file_section *sections; bool options_init; unsigned long long options_start; + unsigned long long options_last_offset; size_t total_file_size; /* For custom profilers. */ @@ -2863,6 +2864,30 @@ tracecmd_search_task_map(struct tracecmd_input *handle, return lib; } +__hidden unsigned long long get_last_option_offset(struct tracecmd_input *handle) +{ + return handle->options_last_offset; +} + +static int handle_option_done(struct tracecmd_input *handle, char *buf, int size) +{ + unsigned long long offset; + + if (size < 8) + return -1; + offset = lseek64(handle->fd, 0, SEEK_CUR); + if (offset >= size) + handle->options_last_offset = offset - size; + offset = tep_read_number(handle->pevent, buf, 8); + if (!offset) + return 0; + + if (lseek64(handle->fd, offset, SEEK_SET) == (off_t)-1) + return -1; + + return handle_options(handle); +} + static inline int save_read_number(struct tep_handle *tep, char *data, int *data_size, int *read_pos, int bytes, unsigned long long *num) { @@ -2965,19 +2990,27 @@ static int handle_options(struct tracecmd_input *handle) long long offset; unsigned short option; unsigned int size; + unsigned short id, flags; char *cpustats = NULL; struct hook_list *hook; char *buf; int cpus; int ret; - handle->options_start = lseek64(handle->fd, 0, SEEK_CUR); + if (!HAS_SECTIONS(handle)) { + handle->options_start = lseek64(handle->fd, 0, SEEK_CUR); + } else { + if (read_section_header(handle, &id, &flags, NULL, NULL)) + return -1; + if (id != TRACECMD_OPTION_DONE) + return -1; + } for (;;) { if (read2(handle, &option)) return -1; - if (option == TRACECMD_OPTION_DONE) + if (!HAS_SECTIONS(handle) && option == TRACECMD_OPTION_DONE) break; /* next 4 bytes is the size of the option */ @@ -3113,7 +3146,10 @@ static int handle_options(struct tracecmd_input *handle) section_add_or_update(handle, option, -1, tep_read_number(handle->pevent, buf, 8), 0); break; - + case TRACECMD_OPTION_DONE: + ret = handle_option_done(handle, buf, size); + free(buf); + return ret; default: tracecmd_warning("unknown option %d", option); break; diff --git a/lib/trace-cmd/trace-output.c b/lib/trace-cmd/trace-output.c index ffcc62e1..b21aaf5d 100644 --- a/lib/trace-cmd/trace-output.c +++ b/lib/trace-cmd/trace-output.c @@ -2151,7 +2151,7 @@ struct tracecmd_output *tracecmd_get_output_handle_fd(int fd) tep_ref(handle->pevent); handle->page_size = tracecmd_page_size(ihandle); handle->file_version = tracecmd_get_in_file_version(ihandle); - handle->options_start = tracecmd_get_options_offset(ihandle); + handle->options_start = get_last_option_offset(ihandle); list_head_init(&handle->options); list_head_init(&handle->buffers); -- 2.31.1