tyler/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update to proxmox-http 0.5.4

Browse Source 
Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
This commit is contained in:
Dietmar Maurer
2021-11-14 08:27:45 +01:00
parent e3eb062c09
commit 09f999337a
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@ -98,7 +98,7 @@ pathpatterns = "0.1.2"
pxar = { version = "0.10.1", features = [ "tokio-io" ] } pxar = { version = "0.10.1", features = [ "tokio-io" ] }
proxmox = { version = "0.15.0", features = [ "sortable-macro" ] } proxmox = { version = "0.15.0", features = [ "sortable-macro" ] }
proxmox-http = { version = "0.5.3", features = [ "client", "http-helpers", "websocket" ] } proxmox-http = { version = "0.5.4", features = [ "client", "http-helpers", "websocket" ] }
proxmox-io = "1" proxmox-io = "1"
proxmox-lang = "1" proxmox-lang = "1"
proxmox-router = { version = "1.1", features = [ "cli" ] } proxmox-router = { version = "1.1", features = [ "cli" ] }

2
pbs-client/Cargo.toml
View File

@ -30,7 +30,7 @@ xdg = "2.2"
pathpatterns = "0.1.2" pathpatterns = "0.1.2"
proxmox = "0.15.0" proxmox = "0.15.0"
proxmox-fuse = "0.1.1" proxmox-fuse = "0.1.1"
proxmox-http = { version = "0.5.3", features = [ "client", "http-helpers", "websocket" ] } proxmox-http = { version = "0.5.4", features = [ "client", "http-helpers", "websocket" ] }
proxmox-io = { version = "1", features = [ "tokio" ] } proxmox-io = { version = "1", features = [ "tokio" ] }
proxmox-lang = "1" proxmox-lang = "1"
proxmox-router = { version = "1.1", features = [ "cli" ] } proxmox-router = { version = "1.1", features = [ "cli" ] }

6
src/shared_rate_limiter.rs
View File

@ -31,7 +31,7 @@ impl Init for WrapLimiter {
struct SharedRateLimiterData { struct SharedRateLimiterData {
magic: [u8; 8], magic: [u8; 8],
tbf: SharedMutex<WrapLimiter>, tbf: SharedMutex<WrapLimiter>,
padding: [u8; 4096 - 120], padding: [u8; 4096 - 104],
} }
impl Init for SharedRateLimiterData { impl Init for SharedRateLimiterData {
@ -98,9 +98,9 @@ impl ShareableRateLimit for SharedRateLimiter {
.update_rate(rate, bucket_size); .update_rate(rate, bucket_size);
} }
fn average_rate(&self, current_time: Instant) -> f64 { fn traffic(&self) -> u64 {
self.shmem.data().tbf.lock().0 self.shmem.data().tbf.lock().0
.average_rate(current_time) .traffic()
} }
fn register_traffic(&self, current_time: Instant, data_len: u64) -> Duration { fn register_traffic(&self, current_time: Instant, data_len: u64) -> Duration {