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 74629C432BE for ; Thu, 29 Jul 2021 05:10:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 54BAF60041 for ; Thu, 29 Jul 2021 05:10:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234041AbhG2FK5 (ORCPT ); Thu, 29 Jul 2021 01:10:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41512 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233900AbhG2FK4 (ORCPT ); Thu, 29 Jul 2021 01:10:56 -0400 Received: from mail-ed1-x531.google.com (mail-ed1-x531.google.com [IPv6:2a00:1450:4864:20::531]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2A9DEC061757 for ; Wed, 28 Jul 2021 22:10:53 -0700 (PDT) Received: by mail-ed1-x531.google.com with SMTP id u12so6435546eds.2 for ; Wed, 28 Jul 2021 22:10:53 -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=bl0/I845lZrCmZcqjigMiovAvAuzlZ22UJnt/1lm4W8=; b=iCpj6zY1QRsjZ33BAJrfwEe94v6qLwqRHCcjmZTIhObZ6T1Y+tPyoYbs52ZSVg7twX +HueSFV1YcrwM8m/yQiG0zwj5BjWC/OWi/wOs1M9cPum4h65JZG17N3Xj8tgvtT+9kel plosxeSSJJDc/xyhJYYvvbtLKJF8aI+xBq1f3FQVANi8I1z1sHaQILPL7OaEFfL2VwVe DIvMLZTuSvXUrX4DF+GpielHLKPzfSsauGp7nW1N226MV+II/WwFwunW5Goj2UkqGWxi 8mcxrjOyO+8mgdsiioOvfA/XKR3aHhiCOBm4QWK13+xYrDMKdrh9btOAEBcaRuRCqa2O +k1Q== 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=bl0/I845lZrCmZcqjigMiovAvAuzlZ22UJnt/1lm4W8=; b=isn8BLo1FpXy6ftTdBWo6O75lnj0z3gd2UNauC3WjhjUxtbLyzlxuGaxyvtwWeOaLe JCfi/6LgcFaxAO2jwHjHnya9HSB2s4P2RCHBnIpSHz5mF+hoLurry/o9A0fWWzdKgjvH yoGx1Op25gRX/1d9UJ74Iiz5Zg2SUZDqgfQ7Bs+pqNfq/EZwydyHSm5MaoYJzYjQW1g6 qHdZVRrefKrh+WPWJzrZlHnc9rfzAxxQeD4afrrw+bVrCxOTi01/SQ/5K6wOxQk+3t2w ZTYKsfkfq+QYzlcEuGz+OzNtdynjnPIdQIiamNsUO4GUZn1+KfTn2ElF3lRsp9n72/K/ WQHw== X-Gm-Message-State: AOAM532P/+eWVgH8J6PjHBKbHx2+FnNzXA9w0DB5Wct2vkpzR5PYS3q1 /ZvJXhh8FqWXlDuHq/5wM3I= X-Google-Smtp-Source: ABdhPJwWxHaRFKOzRCMR24q31Rvs6Dg02ZUfJriDwSZ7OtQaonfpQDIbDPE72B/BW4LpJxIHfRFdJQ== X-Received: by 2002:a05:6402:516f:: with SMTP id d15mr4091716ede.210.1627535451826; Wed, 28 Jul 2021 22:10:51 -0700 (PDT) Received: from oberon.zico.biz ([83.222.187.186]) by smtp.gmail.com with ESMTPSA id s20sm530615eji.116.2021.07.28.22.10.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Jul 2021 22:10:51 -0700 (PDT) From: "Tzvetomir Stoyanov (VMware)" To: rostedt@goodmis.org Cc: linux-trace-devel@vger.kernel.org Subject: [PATCH v2 52/87] trace-cmd library: Initialize CPU data decompression logic Date: Thu, 29 Jul 2021 08:09:24 +0300 Message-Id: <20210729050959.12263-53-tz.stoyanov@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210729050959.12263-1-tz.stoyanov@gmail.com> References: <20210729050959.12263-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 On CPU data initialization stage, initialize decompression context for both in-memory and temporary file decompression logics. Signed-off-by: Tzvetomir Stoyanov (VMware) --- lib/trace-cmd/trace-input.c | 70 +++++++++++++++++++++++++++++++++++-- 1 file changed, 67 insertions(+), 3 deletions(-) diff --git a/lib/trace-cmd/trace-input.c b/lib/trace-cmd/trace-input.c index 6fb63c0f..f3783a98 100644 --- a/lib/trace-cmd/trace-input.c +++ b/lib/trace-cmd/trace-input.c @@ -1275,6 +1275,7 @@ static void *allocate_page_map(struct tracecmd_input *handle, off64_t map_offset; void *map; int ret; + int fd; if (handle->read_page) { map = malloc(handle->page_size); @@ -1314,12 +1315,15 @@ static void *allocate_page_map(struct tracecmd_input *handle, map_size -= map_offset + map_size - (cpu_data->file_offset + cpu_data->file_size); + if (cpu_data->compress.fd >= 0) + fd = cpu_data->compress.fd; + else + fd = handle->fd; again: page_map->size = map_size; page_map->offset = map_offset; - page_map->map = mmap(NULL, map_size, PROT_READ, MAP_PRIVATE, - handle->fd, map_offset); + page_map->map = mmap(NULL, map_size, PROT_READ, MAP_PRIVATE, fd, map_offset); if (page_map->map == MAP_FAILED) { /* Try a smaller map */ @@ -2511,16 +2515,76 @@ tracecmd_read_prev(struct tracecmd_input *handle, struct tep_record *record) /* Not reached */ } -static int init_cpu(struct tracecmd_input *handle, int cpu) +static int init_cpu_zfile(struct tracecmd_input *handle, int cpu) +{ + struct cpu_data *cpu_data; + unsigned long long size; + off64_t offset; + + cpu_data = &handle->cpu_data[cpu]; + offset = lseek64(handle->fd, 0, SEEK_CUR); + if (lseek64(handle->fd, cpu_data->file_offset, SEEK_SET) == (off_t)-1) + return -1; + strcpy(cpu_data->compress.file, COMPR_TEMP_FILE); + cpu_data->compress.fd = mkstemp(cpu_data->compress.file); + if (cpu_data->compress.fd < 0) + return -1; + if (tracecmd_uncompress_copy_to(handle->compress, cpu_data->compress.fd, NULL, &size)) + return -1; + if (lseek64(handle->fd, offset, SEEK_SET) == (off_t)-1) + return -1; + cpu_data->offset = 0; + cpu_data->file_offset = 0; + cpu_data->file_size = size; + cpu_data->size = size; + return 0; +} + +static int init_cpu_zpage(struct tracecmd_input *handle, int cpu) { struct cpu_data *cpu_data = &handle->cpu_data[cpu]; + int count; int i; + if (lseek64(handle->fd, cpu_data->file_offset, SEEK_SET) == (off_t)-1) + return -1; + + count = tracecmd_load_chunks_info(handle->compress, &cpu_data->compress.chunks); + if (count < 0) + return -1; + cpu_data->compress.count = count; + cpu_data->compress.last_chunk = 0; + + cpu_data->file_offset = 0; + cpu_data->file_size = 0; + for (i = 0; i < count; i++) + cpu_data->file_size += cpu_data->compress.chunks[i].size; cpu_data->offset = cpu_data->file_offset; cpu_data->size = cpu_data->file_size; + return 0; +} + +static int init_cpu(struct tracecmd_input *handle, int cpu) +{ + struct cpu_data *cpu_data = &handle->cpu_data[cpu]; + int ret; + int i; + + if (handle->cpu_compressed && cpu_data->file_size > 0) { + if (handle->read_zpage) + ret = init_cpu_zpage(handle, cpu); + else + ret = init_cpu_zfile(handle, cpu); + if (ret) + return ret; + } else { + cpu_data->offset = cpu_data->file_offset; + cpu_data->size = cpu_data->file_size; + } cpu_data->timestamp = 0; list_head_init(&cpu_data->page_maps); + list_head_init(&cpu_data->compress.cache); if (!cpu_data->size) { printf("CPU %d is empty\n", cpu); -- 2.31.1