generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2024-12-14 19:13:52 +01:00
Code Issues Projects Releases Wiki Activity

listener object unregisters its fd correctly

Browse Source
This commit is contained in:
Martin Sustrik 2010-08-24 09:57:15 +02:00
parent 0d5f3ebbda
commit 87655b0b9d
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/zmq_engine.cpp
View File

@ -62,15 +62,12 @@ void zmq::zmq_engine_t::plug (io_thread_t *io_thread_, i_inout *inout_)
// Connect to I/O threads poller object. // Connect to I/O threads poller object.
io_object_t::plug (io_thread_); io_object_t::plug (io_thread_);
handle = add_fd (tcp_socket.get_fd ()); handle = add_fd (tcp_socket.get_fd ());
set_pollin (handle); set_pollin (handle);
set_pollout (handle); set_pollout (handle);
// Flush all the data that may have been already received downstream. // Flush all the data that may have been already received downstream.
in_event (); in_event ();
// TODO: Re-plug to the new I/O thread & poller!
} }
void zmq::zmq_engine_t::unplug () void zmq::zmq_engine_t::unplug ()

5
src/zmq_listener.cpp
View File

@ -49,9 +49,10 @@ void zmq::zmq_listener_t::process_plug ()
set_pollin (handle); set_pollin (handle);
} }
void zmq::zmq_listener_t::process_unplug () void zmq::zmq_listener_t::process_term ()
{ {
rm_fd (handle); rm_fd (handle);
own_t::process_term ();
} }
void zmq::zmq_listener_t::in_event () void zmq::zmq_listener_t::in_event ()
@ -70,5 +71,3 @@ void zmq::zmq_listener_t::in_event ()
launch_sibling (init); launch_sibling (init);
} }

2
src/zmq_listener.hpp
View File

@ -44,7 +44,7 @@ namespace zmq
// Handlers for incoming commands. // Handlers for incoming commands.
void process_plug (); void process_plug ();
void process_unplug (); void process_term ();
// Handlers for I/O events. // Handlers for I/O events.
void in_event (); void in_event ();