Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix memory leak in KeyedJobs threadpool helper.

Browse Source
This commit is contained in:
Avi Weinstock 2021-05-14 18:08:22 -04:00
parent 7115b1c899
commit 523bf2be58
4 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Cargo.lock generated
View File

@ -2415,15 +2415,6 @@ dependencies = [
"serde",
]
[[package]]
name = "inline_tweak"
version = "1.0.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7033e97b20277cc0d043226d1940fa7719ff08d2305d1fc7421e53066d00eb4b"
dependencies = [
"lazy_static",
]
[[package]]
name = "inotify"
version = "0.7.1"
@ -5843,7 +5834,6 @@ dependencies = [
"iced_native",
"iced_winit",
"image",
"inline_tweak",
"itertools 0.10.0",
"keyboard-keynames",
"lazy_static",

2
voxygen/Cargo.toml
View File

@ -104,7 +104,7 @@ treeculler = "0.2"
tokio = { version = "1", default-features = false, features = ["rt-multi-thread"] }
num_cpus = "1.0"
# vec_map = { version = "0.8.2" }
inline_tweak = "1.0.2"
# inline_tweak = "1.0.2"
itertools = "0.10.0"
crossbeam-channel = "0.5"

1
voxygen/src/hud/minimap.rs
View File

@ -293,7 +293,6 @@ impl VoxelMinimap {
.map2(TerrainChunkSize::RECT_SIZE, |i, j| (i as u32).rem_euclid(j))
.as_();
let column = self.chunk_minimaps.get(&(cpos + coff));
//let ceiling_offset = 8;
let color: Vec4<u8> = column
.and_then(
|MinimapColumn {

28
voxygen/src/ui/mod.rs
View File

@ -48,7 +48,7 @@ use conrod_core::{
};
use core::{convert::TryInto, f32, f64, ops::Range};
use graphic::TexId;
use hashbrown::{hash_map::Entry, HashMap};
use hashbrown::{hash_map::Entry, HashMap, HashSet};
use std::{hash::Hash, time::Duration};
use tracing::{error, warn};
use vek::*;
@ -1058,17 +1058,19 @@ fn default_scissor(renderer: &Renderer) -> Aabr<u16> {
pub struct KeyedJobs<K, V> {
tx: crossbeam_channel::Sender<(K, V)>,
rx: crossbeam_channel::Receiver<(K, V)>,
buf: HashMap<K, V>,
completed: HashMap<K, V>,
pending: HashSet<K>,
}
impl<K: Hash + Eq + Send + Sync + 'static, V: Send + Sync + 'static> KeyedJobs<K, V> {
impl<K: Hash + Eq + Send + Sync + 'static + Clone, V: Send + Sync + 'static> KeyedJobs<K, V> {
#[allow(clippy::new_without_default)]
pub fn new() -> Self {
let (tx, rx) = crossbeam_channel::unbounded();
Self {
tx,
rx,
buf: HashMap::new(),
completed: HashMap::new(),
pending: HashSet::new(),
}
}
@ -1079,21 +1081,25 @@ impl<K: Hash + Eq + Send + Sync + 'static, V: Send + Sync + 'static> KeyedJobs<K
f: impl FnOnce(&K) -> V + Send + Sync + 'static,
) -> Option<(K, V)> {
if let Some(pool) = pool {
if let Some(v) = self.buf.remove(&k) {
if let Some(v) = self.completed.remove(&k) {
Some((k, v))
} else {
while let Ok((k2, v)) = self.rx.try_recv() {
self.pending.remove(&k2);
if k == k2 {
return Some((k, v));
} else {
self.buf.insert(k2, v);
self.completed.insert(k2, v);
}
}
let tx = self.tx.clone();
pool.spawn("IMAGE_PROCESSING", move || {
let v = f(&k);
let _ = tx.send((k, v));
});
if !self.pending.contains(&k) {
self.pending.insert(k.clone());
let tx = self.tx.clone();
pool.spawn("IMAGE_PROCESSING", move || {
let v = f(&k);
let _ = tx.send((k, v));
});
}
None
}
} else {