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=-11.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 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 C8BA6C388F9 for ; Wed, 21 Oct 2020 16:00:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6B5FE222C8 for ; Wed, 21 Oct 2020 16:00:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2444331AbgJUQAy (ORCPT ); Wed, 21 Oct 2020 12:00:54 -0400 Received: from mga14.intel.com ([192.55.52.115]:7416 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2444323AbgJUQAy (ORCPT ); Wed, 21 Oct 2020 12:00:54 -0400 IronPort-SDR: KA9Wh5MMkeeF4Im4wo8ONAnZBj1TLlV+C3PXRDtaJq/5618bpwfwrajJbjWx3UVg92xeckLsUS bBn3assm+WNQ== X-IronPort-AV: E=McAfee;i="6000,8403,9780"; a="166613549" X-IronPort-AV: E=Sophos;i="5.77,401,1596524400"; d="scan'208";a="166613549" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Oct 2020 09:00:34 -0700 IronPort-SDR: JGNosnvwsmzI1DYofw4J6jZHXntvyUgkpjmeFa2kSwx/b74Ou+Ko3gdw5TEFp+SzzV4CzZf30W V/WiKWFXn8sg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,401,1596524400"; d="scan'208";a="522790278" Received: from linux.intel.com ([10.54.29.200]) by fmsmga006.fm.intel.com with ESMTP; 21 Oct 2020 09:00:34 -0700 Received: from [10.249.231.46] (abudanko-mobl.ccr.corp.intel.com [10.249.231.46]) by linux.intel.com (Postfix) with ESMTP id ADDC5580720; Wed, 21 Oct 2020 09:00:31 -0700 (PDT) Subject: [PATCH v2 05/15] perf session: introduce decompressor into trace reader object From: Alexey Budankov To: Arnaldo Carvalho de Melo , Jiri Olsa Cc: Namhyung Kim , Alexander Shishkin , Adrian Hunter , Andi Kleen , Peter Zijlstra , Ingo Molnar , linux-kernel References: <1ec29ed6-0047-d22f-630b-a7f5ccee96b4@linux.intel.com> Organization: Intel Corp. Message-ID: Date: Wed, 21 Oct 2020 19:00:30 +0300 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.12.1 MIME-Version: 1.0 In-Reply-To: <1ec29ed6-0047-d22f-630b-a7f5ccee96b4@linux.intel.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Introduce decompressor to trace reader object so that decompression could be executed on per trace file basis separately for every trace file located in trace directory. Signed-off-by: Alexey Budankov --- tools/perf/util/session.c | 4 +++- tools/perf/util/session.h | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c index 911b2dbcd0ac..6afc670fdf0c 100644 --- a/tools/perf/util/session.c +++ b/tools/perf/util/session.c @@ -44,6 +44,8 @@ static int perf_session__process_compressed_event(struct perf_session *session, u64 decomp_last_rem = 0; size_t mmap_len, decomp_len = session->header.env.comp_mmap_len; struct decomp *decomp, *decomp_last = session->decomp_last; + struct zstd_data *zstd_data = session->reader ? + &(session->reader->zstd_data) : &(session->zstd_data); if (decomp_last) { decomp_last_rem = decomp_last->size - decomp_last->head; @@ -71,7 +73,7 @@ static int perf_session__process_compressed_event(struct perf_session *session, src = (void *)event + sizeof(struct perf_record_compressed); src_size = event->pack.header.size - sizeof(struct perf_record_compressed); - decomp_size = zstd_decompress_stream(&(session->zstd_data), src, src_size, + decomp_size = zstd_decompress_stream(zstd_data, src, src_size, &(decomp->data[decomp_last_rem]), decomp_len - decomp_last_rem); if (!decomp_size) { munmap(decomp, mmap_len); diff --git a/tools/perf/util/session.h b/tools/perf/util/session.h index abdb8518a81f..4fc9ccdf7970 100644 --- a/tools/perf/util/session.h +++ b/tools/perf/util/session.h @@ -42,6 +42,7 @@ struct reader { u64 data_size; u64 data_offset; reader_cb_t process; + struct zstd_data zstd_data; }; struct perf_session { -- 2.24.1