From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id D39931FF38F for ; Tue, 4 Jun 2024 10:34:33 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 832DACB95; Tue, 4 Jun 2024 10:35:02 +0200 (CEST) Date: Tue, 04 Jun 2024 10:34:25 +0200 From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= To: Proxmox Backup Server development discussion References: <20240528094303.309806-1-c.ebner@proxmox.com> <20240528094303.309806-39-c.ebner@proxmox.com> In-Reply-To: <20240528094303.309806-39-c.ebner@proxmox.com> MIME-Version: 1.0 User-Agent: astroid/0.16.0 (https://github.com/astroidmail/astroid) Message-Id: <1717490044.atjd0otzsb.astroid@yuna.none> X-SPAM-LEVEL: Spam detection results: 0 AWL 0.058 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: Re: [pbs-devel] [PATCH v8 proxmox-backup 38/69] pxar: show padding in debug output on archive list 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: , Reply-To: Proxmox Backup Server development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "pbs-devel" On May 28, 2024 11:42 am, Christian Ebner wrote: > In addition to the entries, also show the padding encountered in-between > referenced payloads. > > Example invocation: `PXAR_LOG=debug pxar list archive.mpxar` > > Signed-off-by: Christian Ebner > --- > changes since version 7: > - include missing `last` variable declaration > > changes since version 6: > - no changes > > pxar-bin/src/main.rs | 19 +++++++++++++++++++ > 1 file changed, 19 insertions(+) > > diff --git a/pxar-bin/src/main.rs b/pxar-bin/src/main.rs > index 17e468062..b5a5bbe9f 100644 > --- a/pxar-bin/src/main.rs > +++ b/pxar-bin/src/main.rs > @@ -9,6 +9,7 @@ use std::sync::Arc; > use anyhow::{bail, format_err, Error}; > use futures::future::FutureExt; > use futures::select; > +use pxar::EntryKind; nit: this is one of our crates, so should go below next to pathpatterns > use tokio::signal::unix::{signal, SignalKind}; > > use pathpatterns::{MatchEntry, MatchType, PatternFlag}; > @@ -475,10 +476,28 @@ fn dump_archive(archive: String, payload_input: Option) -> Result<(), Er > pxar::PxarVariant::Unified(archive) > }; > > + let mut last = None; > for entry in pxar::decoder::Decoder::open(input)? { > let entry = entry?; > > if log::log_enabled!(log::Level::Debug) { > + match entry.kind() { > + EntryKind::File { > + payload_offset: Some(offset), > + size, > + .. > + } => { > + if let Some(last) = last { > + let skipped = offset - last; > + if skipped > 0 { > + log::debug!("Encountered padding of {skipped} bytes"); > + } > + } > + last = Some(offset + size + std::mem::size_of::() as u64); > + } > + _ => (), > + } > + > log::debug!("{}", format_single_line_entry(&entry)); > } else { > log::info!("{:?}", entry.path()); > -- > 2.39.2 > > > > _______________________________________________ > pbs-devel mailing list > pbs-devel@lists.proxmox.com > https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel > > > _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel