From: Dietmar Maurer <dietmar@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup 12/15] proxmox-rrd: new helper methods - slot() and slot_end_time()
Date: Wed, 13 Oct 2021 10:24:49 +0200 [thread overview]
Message-ID: <20211013082452.619406-13-dietmar@proxmox.com> (raw)
In-Reply-To: <20211013082452.619406-1-dietmar@proxmox.com>
---
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
next prev parent reply other threads:[~2021-10-13 8:25 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-13 8:24 [pbs-devel] [PATCH proxmox-backup 00/15] RRD database improvements Dietmar Maurer
2021-10-13 8:24 ` [pbs-devel] [PATCH proxmox-backup 01/15] proxmox-rrd: use a journal to reduce amount of bytes written Dietmar Maurer
2021-10-13 8:24 ` [pbs-devel] [PATCH proxmox-backup 02/15] RRD_CACHE: use a OnceCell instead of lazy_static Dietmar Maurer
2021-10-13 8:24 ` [pbs-devel] [PATCH proxmox-backup 03/15] proxmox-backup-proxy: use tokio::task::spawn_blocking instead of block_in_place Dietmar Maurer
2021-10-13 8:24 ` [pbs-devel] [PATCH proxmox-backup 04/15] proxmox-rrd: implement new CBOR based format Dietmar Maurer
2021-10-13 8:24 ` [pbs-devel] [PATCH proxmox-backup 05/15] proxmox-rrd: remove dependency to proxmox-rrd-api-types Dietmar Maurer
2021-10-13 8:24 ` [pbs-devel] [PATCH proxmox-backup 06/15] proxmox-rrd: extract_data: include values from current slot Dietmar Maurer
2021-10-13 8:24 ` [pbs-devel] [PATCH proxmox-backup 07/15] remove proxmox-rrd-api-types crate, s/RRDTimeFrameResolution/RRDTimeFrame/ Dietmar Maurer
2021-10-13 8:24 ` [pbs-devel] [PATCH proxmox-backup 08/15] proxmox-rrd: support CF::Last Dietmar Maurer
2021-10-13 8:24 ` [pbs-devel] [PATCH proxmox-backup 09/15] proxmox-rrd: split out load_rrd (cleanup) Dietmar Maurer
2021-10-13 8:24 ` [pbs-devel] [PATCH proxmox-backup 10/15] proxmox-rrd: add binary to create/manage rrd files Dietmar Maurer
2021-10-13 8:24 ` [pbs-devel] [PATCH proxmox-backup 11/15] proxmox-rrd: avoid % inside loop Dietmar Maurer
2021-10-13 8:24 ` Dietmar Maurer [this message]
2021-10-13 8:24 ` [pbs-devel] [PATCH proxmox-backup 13/15] proxmox-rrd: protect against negative update time Dietmar Maurer
2021-10-13 8:24 ` [pbs-devel] [PATCH proxmox-backup 14/15] proxmox-rrd: rename last_counter to last_value Dietmar Maurer
2021-10-13 8:24 ` [pbs-devel] [PATCH proxmox-backup 15/15] proxmox-rrd: add more commands to the rrd cli tool Dietmar Maurer
2021-10-13 11:58 ` [pbs-devel] applied-series: [PATCH proxmox-backup 00/15] RRD database improvements Thomas Lamprecht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211013082452.619406-13-dietmar@proxmox.com \
--to=dietmar@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox