Remove closing from TransportPeerEventHandler

eclipse-zenoh · Sep 25, 2024 · 512a372 · 512a372
1 parent 3abde56
commit 512a372
Show file tree

Hide file tree

Showing 20 changed files with 2 additions and 68 deletions.
diff --git a/io/zenoh-transport/src/lib.rs b/io/zenoh-transport/src/lib.rs
@@ -82,7 +82,6 @@ impl TransportEventHandler for DummyTransportEventHandler {
 /*************************************/
 pub trait TransportMulticastEventHandler: Send + Sync {
     fn new_peer(&self, peer: TransportPeer) -> ZResult<Arc<dyn TransportPeerEventHandler>>;
-    fn closing(&self);
     fn closed(&self);
     fn as_any(&self) -> &dyn Any;
 }
@@ -95,7 +94,6 @@ impl TransportMulticastEventHandler for DummyTransportMulticastEventHandler {
     fn new_peer(&self, _peer: TransportPeer) -> ZResult<Arc<dyn TransportPeerEventHandler>> {
         Ok(Arc::new(DummyTransportPeerEventHandler))
     }
-    fn closing(&self) {}
     fn closed(&self) {}
     fn as_any(&self) -> &dyn Any {
         self
@@ -121,7 +119,6 @@ pub trait TransportPeerEventHandler: Send + Sync {
     fn handle_message(&self, msg: NetworkMessage) -> ZResult<()>;
     fn new_link(&self, src: Link);
     fn del_link(&self, link: Link);
-    fn closing(&self);
     fn closed(&self);
     fn as_any(&self) -> &dyn Any;
 }
@@ -137,7 +134,6 @@ impl TransportPeerEventHandler for DummyTransportPeerEventHandler {
 
     fn new_link(&self, _link: Link) {}
     fn del_link(&self, _link: Link) {}
-    fn closing(&self) {}
     fn closed(&self) {}
 
     fn as_any(&self) -> &dyn Any {

diff --git a/io/zenoh-transport/src/multicast/transport.rs b/io/zenoh-transport/src/multicast/transport.rs
@@ -178,11 +178,7 @@ impl TransportMulticastInner {
     pub(super) async fn delete(&self) -> ZResult<()> {
         tracing::debug!("Closing multicast transport on {:?}", self.locator);
 
-        // Notify the callback that we are going to close the transport
         let callback = zwrite!(self.callback).take();
-        if let Some(cb) = callback.as_ref() {
-            cb.closing();
-        }
 
         // Delete the transport on the manager
         let _ = self.manager.del_transport_multicast(&self.locator).await;
@@ -441,7 +437,6 @@ impl TransportMulticastInner {
 
             // TODO(yuyuan): Unify the termination
             peer.token.cancel();
-            peer.handler.closing();
             drop(guard);
             peer.handler.closed();
         }

diff --git a/io/zenoh-transport/src/unicast/lowlatency/transport.rs b/io/zenoh-transport/src/unicast/lowlatency/transport.rs
@@ -117,12 +117,7 @@ impl TransportUnicastLowlatency {
         // to avoid concurrent new_transport and closing/closed notifications
         let mut a_guard = self.get_alive().await;
         *a_guard = false;
-
-        // Notify the callback that we are going to close the transport
         let callback = zwrite!(self.callback).take();
-        if let Some(cb) = callback.as_ref() {
-            cb.closing();
-        }
 
         // Delete the transport on the manager
         let _ = self.manager.del_transport_unicast(&self.config.zid).await;

diff --git a/io/zenoh-transport/src/unicast/universal/transport.rs b/io/zenoh-transport/src/unicast/universal/transport.rs
@@ -129,12 +129,7 @@ impl TransportUnicastUniversal {
         // to avoid concurrent new_transport and closing/closed notifications
         let mut a_guard = self.get_alive().await;
         *a_guard = false;
-
-        // Notify the callback that we are going to close the transport
         let callback = zwrite!(self.callback).take();
-        if let Some(cb) = callback.as_ref() {
-            cb.closing();
-        }
 
         // Delete the transport on the manager
         let _ = self.manager.del_transport_unicast(&self.config.zid).await;

diff --git a/io/zenoh-transport/tests/endpoints.rs b/io/zenoh-transport/tests/endpoints.rs
@@ -62,7 +62,6 @@ impl TransportPeerEventHandler for SC {
     }
     fn new_link(&self, _link: Link) {}
     fn del_link(&self, _link: Link) {}
-    fn closing(&self) {}
     fn closed(&self) {}
 
     fn as_any(&self) -> &dyn Any {

diff --git a/io/zenoh-transport/tests/multicast_compression.rs b/io/zenoh-transport/tests/multicast_compression.rs
@@ -111,7 +111,6 @@ mod tests {
                 count: self.count.clone(),
             }))
         }
-        fn closing(&self) {}
         fn closed(&self) {}
 
         fn as_any(&self) -> &dyn Any {
@@ -127,7 +126,6 @@ mod tests {
 
         fn new_link(&self, _link: Link) {}
         fn del_link(&self, _link: Link) {}
-        fn closing(&self) {}
         fn closed(&self) {}
 
         fn as_any(&self) -> &dyn Any {

diff --git a/io/zenoh-transport/tests/multicast_transport.rs b/io/zenoh-transport/tests/multicast_transport.rs
@@ -110,7 +110,6 @@ mod tests {
                 count: self.count.clone(),
             }))
         }
-        fn closing(&self) {}
         fn closed(&self) {}
 
         fn as_any(&self) -> &dyn Any {
@@ -126,7 +125,6 @@ mod tests {
 
         fn new_link(&self, _link: Link) {}
         fn del_link(&self, _link: Link) {}
-        fn closing(&self) {}
         fn closed(&self) {}
 
         fn as_any(&self) -> &dyn Any {

diff --git a/io/zenoh-transport/tests/transport_whitelist.rs b/io/zenoh-transport/tests/transport_whitelist.rs
@@ -58,7 +58,6 @@ impl TransportPeerEventHandler for SCRouter {
 
     fn new_link(&self, _link: Link) {}
     fn del_link(&self, _link: Link) {}
-    fn closing(&self) {}
     fn closed(&self) {}
 
     fn as_any(&self) -> &dyn Any {

diff --git a/io/zenoh-transport/tests/unicast_authenticator.rs b/io/zenoh-transport/tests/unicast_authenticator.rs
@@ -70,7 +70,6 @@ impl TransportPeerEventHandler for MHRouterAuthenticator {
     }
     fn new_link(&self, _link: Link) {}
     fn del_link(&self, _link: Link) {}
-    fn closing(&self) {}
     fn closed(&self) {}
 
     fn as_any(&self) -> &dyn Any {

diff --git a/io/zenoh-transport/tests/unicast_compression.rs b/io/zenoh-transport/tests/unicast_compression.rs
@@ -110,7 +110,6 @@ mod tests {
 
         fn new_link(&self, _link: Link) {}
         fn del_link(&self, _link: Link) {}
-        fn closing(&self) {}
         fn closed(&self) {}
 
         fn as_any(&self) -> &dyn Any {
@@ -150,7 +149,6 @@ mod tests {
 
         fn new_link(&self, _link: Link) {}
         fn del_link(&self, _link: Link) {}
-        fn closing(&self) {}
         fn closed(&self) {}
 
         fn as_any(&self) -> &dyn Any {

diff --git a/io/zenoh-transport/tests/unicast_concurrent.rs b/io/zenoh-transport/tests/unicast_concurrent.rs
@@ -98,7 +98,6 @@ impl TransportPeerEventHandler for MHPeer {
 
     fn new_link(&self, _link: Link) {}
     fn del_link(&self, _link: Link) {}
-    fn closing(&self) {}
     fn closed(&self) {}
 
     fn as_any(&self) -> &dyn Any {

diff --git a/io/zenoh-transport/tests/unicast_intermittent.rs b/io/zenoh-transport/tests/unicast_intermittent.rs
@@ -138,7 +138,6 @@ impl TransportPeerEventHandler for SCClient {
 
     fn new_link(&self, _link: Link) {}
     fn del_link(&self, _link: Link) {}
-    fn closing(&self) {}
     fn closed(&self) {}
 
     fn as_any(&self) -> &dyn Any {

diff --git a/io/zenoh-transport/tests/unicast_priorities.rs b/io/zenoh-transport/tests/unicast_priorities.rs
@@ -133,7 +133,6 @@ impl TransportPeerEventHandler for SCRouter {
 
     fn new_link(&self, _link: Link) {}
     fn del_link(&self, _link: Link) {}
-    fn closing(&self) {}
     fn closed(&self) {}
 
     fn as_any(&self) -> &dyn Any {
@@ -183,7 +182,6 @@ impl TransportPeerEventHandler for SCClient {
 
     fn new_link(&self, _link: Link) {}
     fn del_link(&self, _link: Link) {}
-    fn closing(&self) {}
     fn closed(&self) {}
 
     fn as_any(&self) -> &dyn Any {

diff --git a/io/zenoh-transport/tests/unicast_shm.rs b/io/zenoh-transport/tests/unicast_shm.rs
@@ -141,7 +141,6 @@ mod tests {
 
         fn new_link(&self, _link: Link) {}
         fn del_link(&self, _link: Link) {}
-        fn closing(&self) {}
         fn closed(&self) {}
 
         fn as_any(&self) -> &dyn Any {

diff --git a/io/zenoh-transport/tests/unicast_simultaneous.rs b/io/zenoh-transport/tests/unicast_simultaneous.rs
@@ -126,7 +126,6 @@ mod tests {
 
         fn new_link(&self, _link: Link) {}
         fn del_link(&self, _link: Link) {}
-        fn closing(&self) {}
         fn closed(&self) {}
 
         fn as_any(&self) -> &dyn Any {

diff --git a/io/zenoh-transport/tests/unicast_transport.rs b/io/zenoh-transport/tests/unicast_transport.rs
@@ -296,7 +296,6 @@ impl TransportPeerEventHandler for SCRouter {
 
     fn new_link(&self, _link: Link) {}
     fn del_link(&self, _link: Link) {}
-    fn closing(&self) {}
     fn closed(&self) {}
 
     fn as_any(&self) -> &dyn Any {
@@ -336,7 +335,6 @@ impl TransportPeerEventHandler for SCClient {
 
     fn new_link(&self, _link: Link) {}
     fn del_link(&self, _link: Link) {}
-    fn closing(&self) {}
     fn closed(&self) {}
 
     fn as_any(&self) -> &dyn Any {

diff --git a/zenoh/src/api/admin.rs b/zenoh/src/api/admin.rs
@@ -187,8 +187,6 @@ impl TransportMulticastEventHandler for Handler {
         }
     }
 
-    fn closing(&self) {}
-
     fn closed(&self) {}
 
     fn as_any(&self) -> &dyn std::any::Any {
@@ -250,8 +248,6 @@ impl TransportPeerEventHandler for PeerHandler {
         );
     }
 
-    fn closing(&self) {}
-
     fn closed(&self) {
         let info = DataInfo {
             kind: SampleKind::Delete,

diff --git a/zenoh/src/net/primitives/demux.rs b/zenoh/src/net/primitives/demux.rs
@@ -100,8 +100,6 @@ impl TransportPeerEventHandler for DeMux {
 
     fn del_link(&self, _link: Link) {}
 
-    fn closing(&self) {}
-
     fn closed(&self) {
         self.face.send_close();
     }

diff --git a/zenoh/src/net/primitives/mux.rs b/zenoh/src/net/primitives/mux.rs
@@ -200,9 +200,7 @@ impl Primitives for Mux {
         }
     }
 
-    fn send_close(&self) {
-        // self.handler.closing().await;
-    }
+    fn send_close(&self) {}
 }
 
 impl EPrimitives for Mux {
@@ -530,9 +528,7 @@ impl Primitives for McastMux {
         }
     }
 
-    fn send_close(&self) {
-        // self.handler.closing().await;
-    }
+    fn send_close(&self) {}
 }
 
 impl EPrimitives for McastMux {

diff --git a/zenoh/src/net/runtime/mod.rs b/zenoh/src/net/runtime/mod.rs
@@ -457,13 +457,6 @@ impl TransportPeerEventHandler for RuntimeSession {
         }
     }
 
-    fn closing(&self) {
-        self.main_handler.closing();
-        for handler in &self.slave_handlers {
-            handler.closing();
-        }
-    }
-
     fn closed(&self) {
         self.main_handler.closed();
         Runtime::closed_session(self);
@@ -500,12 +493,6 @@ impl TransportMulticastEventHandler for RuntimeMulticastGroup {
         }))
     }
 
-    fn closing(&self) {
-        for handler in &self.slave_handlers {
-            handler.closed();
-        }
-    }
-
     fn closed(&self) {
         for handler in &self.slave_handlers {
             handler.closed();
@@ -541,13 +528,6 @@ impl TransportPeerEventHandler for RuntimeMulticastSession {
         }
     }
 
-    fn closing(&self) {
-        self.main_handler.closing();
-        for handler in &self.slave_handlers {
-            handler.closing();
-        }
-    }
-
     fn closed(&self) {
         self.main_handler.closed();
         for handler in &self.slave_handlers {