Skip to content

Commit

Permalink
fix: zenoh_session_multicast test (#1004)
Browse files Browse the repository at this point in the history
* test: use the minimal setting

* test: use a shorter timeout

* fix: re-introduce the nextest timeout

* test: add the debugging info

* test: disable the windows ci

* Fix deadlock in session::close

* test: do not retry

* chore: clean up all the auxiliary files

---------

Co-authored-by: OlivierHecart <[email protected]>
  • Loading branch information
YuanYuYuan and OlivierHecart authored May 6, 2024
1 parent 7cf2eee commit 7e5d5e8
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions zenoh/src/session.rs
Original file line number Diff line number Diff line change
Expand Up @@ -529,10 +529,11 @@ impl Session {
self.runtime.close().await?;
}
let mut state = zwrite!(self.state);
state.primitives.as_ref().unwrap().send_close();
// clean up to break cyclic references from self.state to itself
state.primitives.take();
let primitives = state.primitives.take();
state.queryables.clear();
drop(state);
primitives.as_ref().unwrap().send_close();
self.alive = false;
Ok(())
})
Expand Down

0 comments on commit 7e5d5e8

Please sign in to comment.