@@ -53,12 +53,8 @@ impl<Inter: IsChannel, Intra: IsChannel> PrimaryReceiveRelay<Inter, Intra> {
5353 let inter_receiver_builder = self . inter_receiver_builder . take ( ) . unwrap ( ) ;
5454 let intra_sender_builder = self . intra_sender_builder . take ( ) . unwrap ( ) ;
5555 let timeout = self . timeout ;
56- <<<<<<< HEAD
5756
5857 thread:: spawn ( move || {
59- =======
60- let thread = thread:: spawn ( move || {
61- >>>>>>> 999 c8dd ( ctrlc is not built after rebasing)
6258 if let Err ( e) = Self :: thread_main ( inter_receiver_builder, intra_sender_builder, timeout)
6359 {
6460 // This error is expected during shutdown when the scheduler drops its receiver.
@@ -140,48 +136,6 @@ impl<Inter: IsChannel, Intra: IsChannel> PrimaryReceiveRelay<Inter, Intra> {
140136 trace ! ( "PrimaryReceiveRelay connected" ) ;
141137 Ok ( ( inter_receiver, intra_sender) )
142138 }
143- <<<<<<< HEAD
144- =======
145-
146- pub fn connect( & mut self ) -> Result < ( ) , Error > {
147- self . inter_sender. connect_receivers( self . timeout) ?;
148- trace ! ( "PrimarySendRelay connected" ) ;
149- Ok ( ( ) )
150- }
151-
152- pub fn get_remote_agents( & self ) -> impl Iterator < Item = AgentId > + ' _ {
153- self . remote_agents. iter( ) . copied( )
154- }
155-
156- pub fn send_to_agent(
157- & mut self ,
158- agent_id: AgentId ,
159- signal: Inter :: ProtocolSignal ,
160- ) -> Result < ( ) , Error > {
161- let channel_id = ChannelId :: Agent ( agent_id) ;
162- self . inter_sender. send( channel_id, signal)
163- }
164-
165- pub fn sync_time( & mut self ) -> Result < ( ) , Error > {
166- let signal = Signal :: StartupSync ( sync_info( ) ) ;
167-
168- // Send sync info to all remote agents
169- for id in self . remote_agents. iter ( ) {
170- let channel_id = ChannelId : : Agent ( * id) ;
171- self . inter_sender. send( channel_id, signal. into( ) ) ?;
172- }
173- Ok ( ( ) )
174- }
175-
176- pub fn broadcast( & mut self , signal: Inter :: ProtocolSignal ) -> Result < ( ) , Error > {
177- // Send signal to all remote agents
178- for id in self . remote_agents. iter ( ) {
179- let channel_id = ChannelId : : Agent ( * id) ;
180- self . inter_sender. send( channel_id, signal) ?;
181- }
182- Ok ( ( ) )
183- }
184- >>>>>>> 999 c8dd ( ctrlc is not built after rebasing)
185139}
186140
187141/// Relay for a secondary to receive signals from the primary agent
0 commit comments