fix(mem-leak): running_swap never shrinks
#2301
Conversation
|
Why is this PR blocked? I can see CI builds are green and commit history doesn't depend on any common commits from other PRs. |
Nope it depends on history from #2280, no extra commits are showing up here since I am trying to merge into |
mm2src/mm2_main/src/lp_swap.rs
Outdated
| pub fn running_swaps_num(ctx: &MmArc) -> u64 { | ||
| let swap_ctx = SwapsContext::from_ctx(ctx).unwrap(); | ||
| let swaps = swap_ctx.running_swaps.lock().unwrap(); | ||
| swaps.iter().fold(0, |total, (swap, _)| match swap.upgrade() { | ||
| Some(_) => total + 1, | ||
| None => total, | ||
| }) | ||
| let count = swap_ctx.running_swaps.lock().unwrap().len(); | ||
| count as u64 | ||
| } |
There was a problem hiding this comment.
let change the return type to usize instead of u64
mm2src/mm2_main/src/lp_swap.rs
Outdated
| for (swap, _) in swaps.values() { | ||
| if coins.contains(&swap.maker_coin().to_string()) || coins.contains(&swap.taker_coin().to_string()) { | ||
| uuids.push(*swap.uuid()) |
There was a problem hiding this comment.
you can use uuid.extend and filter_map to avoid for loop and push
I am not sure what is the purpose of this PR then 🤔 |
|
Basically this PR looks good for me: it removes finished or aborted swaps from the running_swaps list. |
this field was convereted to a hashmap instead of a vector for easy access to the swap also we now manually delete the swap from running swaps when the swap is finished (memory leak fix). as a consequence to manuallly deleting the swap from running_swaps, we can now store them as arcs instead of weakrefs, which simplifies a lot of .upgrade calls.
mariocynicys
force-pushed
the
running-swaps-memleak
branch
from
b02fced to
0890de8
Compare
|
re-wrote the fix on top of dev. it's not blocked anymore by the original PR from |
this field was convereted to a hashmap instead of a vector for easy access to the swap. also we now manually delete the swap from running swaps when the swap is finished~/inturepted~ (memory leak fix). as a consequence to manuallly deleting the swap from running_swaps, we can now store them as arcs instead of weakrefs, which simplifies a lot of
.upgrade()calls.blocked on its base #2280re-fixed on top ofdevinstead