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 BD5D67542D for ; Wed, 13 Oct 2021 10:25:33 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 8BE7BE5C2 for ; Wed, 13 Oct 2021 10:25:01 +0200 (CEST) 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 id C74D3E505 for ; Wed, 13 Oct 2021 10:24:57 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 9CE144451C; Wed, 13 Oct 2021 10:24:57 +0200 (CEST) From: Dietmar Maurer To: pbs-devel@lists.proxmox.com Date: Wed, 13 Oct 2021 10:24:49 +0200 Message-Id: <20211013082452.619406-13-dietmar@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211013082452.619406-1-dietmar@proxmox.com> References: <20211013082452.619406-1-dietmar@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.545 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [rrd.rs] Subject: [pbs-devel] [PATCH proxmox-backup 12/15] proxmox-rrd: new helper methods - slot() and slot_end_time() 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: Wed, 13 Oct 2021 08:25:33 -0000 --- proxmox-rrd/src/rrd.rs | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/proxmox-rrd/src/rrd.rs b/proxmox-rrd/src/rrd.rs index 54cb8b48..12d2ec8c 100644 --- a/proxmox-rrd/src/rrd.rs +++ b/proxmox-rrd/src/rrd.rs @@ -135,6 +135,14 @@ impl RRA { } } + fn slot_end_time(&self, time: u64) -> u64 { + self.resolution*(time/self.resolution + 1) + } + + fn slot(&self, time: u64) -> usize { + ((time/self.resolution) as usize) % self.data.len() + } + // directly overwrite data slots // the caller need to set last_update value on the DataSource manually. pub(crate) fn insert_data( @@ -146,8 +154,8 @@ impl RRA { if resolution != self.resolution { bail!("inser_data failed: got wrong resolution"); } - let num_entries = self.data.len() as u64; - let mut index = ((start/self.resolution) % num_entries) as usize; + + let mut index = self.slot(start); for i in 0..data.len() { if let Some(v) = data[i] { @@ -167,7 +175,9 @@ impl RRA { let min_time = epoch - num_entries*reso; let min_time = (min_time/reso + 1)*reso; let mut t = last_update.saturating_sub(num_entries*reso); - let mut index = ((t/reso) % num_entries) as usize; + + let mut index = self.slot(t); + for _ in 0..num_entries { t += reso; index += 1; if index >= self.data.len() { index = 0; } @@ -183,12 +193,11 @@ impl RRA { let epoch = time as u64; let last_update = last_update as u64; let reso = self.resolution; - let num_entries = self.data.len() as u64; - let index = ((epoch/reso) % num_entries) as usize; - let last_index = ((last_update/reso) % num_entries) as usize; + let index = self.slot(epoch); + let last_index = self.slot(last_update); - if (epoch - (last_update as u64)) > reso || index != last_index { + if (epoch - last_update) > reso || index != last_index { self.last_count = 0; } @@ -233,11 +242,11 @@ impl RRA { let mut list = Vec::new(); - let rrd_end = reso*(last_update/reso + 1); + let rrd_end = self.slot_end_time(last_update); let rrd_start = rrd_end.saturating_sub(reso*num_entries); let mut t = start; - let mut index = ((t/reso) % num_entries) as usize; + let mut index = self.slot(t); for _ in 0..num_entries { if t > end { break; }; if t < rrd_start || t > rrd_end { -- 2.30.2