From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id A8938BC275 for ; Thu, 28 Mar 2024 13:38:36 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A568EA080 for ; Thu, 28 Mar 2024 13:37:48 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Thu, 28 Mar 2024 13:37:47 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id DB43442ABD for ; Thu, 28 Mar 2024 13:37:46 +0100 (CET) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Thu, 28 Mar 2024 13:36:55 +0100 Message-Id: <20240328123707.336951-47-c.ebner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240328123707.336951-1-c.ebner@proxmox.com> References: <20240328123707.336951-1-c.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.029 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pbs-devel] [PATCH v3 proxmox-backup 46/58] pxar: caching: add look-ahead cache types X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Mar 2024 12:38:36 -0000 The look-ahead cache is used to cache entries during pxar archive creation before encoding, in order to decide if regular file payloads might be re-used rather than re-encoded. These types allow to store the needed data and keep track of directory boundaries while traversing the filesystem tree. Signed-off-by: Christian Ebner --- changes since version 2: - removed caching for cli exclude patterns, these will be stored in own entry type within the metadata archive pbs-client/src/pxar/look_ahead_cache.rs | 38 +++++++++++++++++++++++++ pbs-client/src/pxar/mod.rs | 1 + 2 files changed, 39 insertions(+) create mode 100644 pbs-client/src/pxar/look_ahead_cache.rs diff --git a/pbs-client/src/pxar/look_ahead_cache.rs b/pbs-client/src/pxar/look_ahead_cache.rs new file mode 100644 index 000000000..68f3fd1f2 --- /dev/null +++ b/pbs-client/src/pxar/look_ahead_cache.rs @@ -0,0 +1,38 @@ +use nix::sys::stat::FileStat; +use pxar::encoder::PayloadOffset; +use std::ffi::CString; +use std::os::unix::io::OwnedFd; + +use pxar::Metadata; + +pub(crate) struct CacheEntryData { + pub(crate) fd: OwnedFd, + pub(crate) c_file_name: CString, + pub(crate) stat: FileStat, + pub(crate) metadata: Metadata, + pub(crate) payload_offset: PayloadOffset, +} + +impl CacheEntryData { + pub(crate) fn new( + fd: OwnedFd, + c_file_name: CString, + stat: FileStat, + metadata: Metadata, + payload_offset: PayloadOffset, + ) -> Self { + Self { + fd, + c_file_name, + stat, + metadata, + payload_offset, + } + } +} + +pub(crate) enum CacheEntry { + RegEntry(CacheEntryData), + DirEntry(CacheEntryData), + DirEnd, +} diff --git a/pbs-client/src/pxar/mod.rs b/pbs-client/src/pxar/mod.rs index 76652094e..6567b93ad 100644 --- a/pbs-client/src/pxar/mod.rs +++ b/pbs-client/src/pxar/mod.rs @@ -50,6 +50,7 @@ pub(crate) mod create; pub(crate) mod dir_stack; pub(crate) mod extract; +pub(crate) mod look_ahead_cache; pub(crate) mod metadata; pub(crate) mod tools; -- 2.39.2