Github/aralez
1
0
Fork 0
mirror of https://github.com/sadoyan/aralez.git synced 2026-04-30 06:48:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Removed unnecessary locks dashmaps

Browse Source
This commit is contained in:
Ara Sadoyan
2025-03-14 12:13:14 +01:00
parent 8b9caa8b08
commit 3901b246b3
4 changed files with 16 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/utils/compare.rs
View File

@@ -1,9 +1,8 @@
use crate::utils::tools::*;
use std::collections::HashSet;
use tokio::sync::RwLockReadGuard;
// #[allow(dead_code)]
pub fn dm(map1: &RwLockReadGuard<UpstreamMap>, map2: &UpstreamMap) -> bool {
pub fn dm(map1: &UpstreamMap, map2: &UpstreamMap) -> bool {
if map1.len() != map2.len() {
return false; // Different number of keys
}

13
src/utils/healthcheck.rs
View File

@@ -3,10 +3,9 @@ use dashmap::DashMap;
use std::sync::atomic::AtomicUsize;
use std::sync::Arc;
use std::time::Duration;
use tokio::sync::RwLock;
use tokio::time::interval;
pub async fn hc(upslist: Arc<RwLock<UpstreamMap>>, fullist: Arc<RwLock<UpstreamMap>>) {
pub async fn hc(upslist: Arc<UpstreamMap>, fullist: Arc<UpstreamMap>) {
let mut period = interval(Duration::from_secs(2));
loop {
@@ -18,8 +17,7 @@ pub async fn hc(upslist: Arc<RwLock<UpstreamMap>>, fullist: Arc<RwLock<UpstreamM
// println!("\nElapsed dash: {:.2?}", before.elapsed());
// let before = Instant::now();
{
let full = fullist.read().await;
for v in full.iter() {
for v in fullist.iter() {
fclone.insert(v.key().clone(), (v.value().0.clone(), AtomicUsize::new(0)));
}
} // lock releases when scope ends
@@ -43,16 +41,15 @@ pub async fn hc(upslist: Arc<RwLock<UpstreamMap>>, fullist: Arc<RwLock<UpstreamM
}
// let before = Instant::now();
{
let upsl = upslist.read().await;
if !crate::utils::compare::dm(&upsl, &totest) {
if !crate::utils::compare::dm(&upslist, &totest) {
println!("Dashmaps not matched, synchronizing");
upsl.clear();
upslist.clear();
for (k, v) in totest { // loop takes the ownership
println!("Host: {}", k);
for vv in &v.0 {
println!(" :===> {:?}", vv);
}
upsl.insert(k, v);
upslist.insert(k, v);
}
}
}