Commit 7cfd03ba authored by Martin Hurton's avatar Martin Hurton

Remove unplug from i_engine interface

parent 5db30fe9
...@@ -37,9 +37,6 @@ namespace zmq ...@@ -37,9 +37,6 @@ namespace zmq
virtual void plug (zmq::io_thread_t *io_thread_, virtual void plug (zmq::io_thread_t *io_thread_,
class session_base_t *session_) = 0; class session_base_t *session_) = 0;
// Unplug the engine from the session.
virtual void unplug () = 0;
// Terminate and deallocate the engine. Note that 'detached' // Terminate and deallocate the engine. Note that 'detached'
// events are not fired on termination. // events are not fired on termination.
virtual void terminate () = 0; virtual void terminate () = 0;
......
...@@ -59,7 +59,6 @@ namespace zmq ...@@ -59,7 +59,6 @@ namespace zmq
// i_engine interface implementation. // i_engine interface implementation.
void plug (zmq::io_thread_t *io_thread_, void plug (zmq::io_thread_t *io_thread_,
zmq::session_base_t *session_); zmq::session_base_t *session_);
void unplug ();
void terminate (); void terminate ();
void activate_in (); void activate_in ();
void activate_out (); void activate_out ();
...@@ -70,6 +69,9 @@ namespace zmq ...@@ -70,6 +69,9 @@ namespace zmq
private: private:
// Unplug the engine from the session.
void unplug ();
// PGM is not able to move subscriptions upstream. Thus, drop all // PGM is not able to move subscriptions upstream. Thus, drop all
// the pending subscriptions. // the pending subscriptions.
void drop_subscriptions (); void drop_subscriptions ();
......
...@@ -57,7 +57,6 @@ namespace zmq ...@@ -57,7 +57,6 @@ namespace zmq
// i_engine interface implementation. // i_engine interface implementation.
void plug (zmq::io_thread_t *io_thread_, void plug (zmq::io_thread_t *io_thread_,
zmq::session_base_t *session_); zmq::session_base_t *session_);
void unplug ();
void terminate (); void terminate ();
void activate_in (); void activate_in ();
void activate_out (); void activate_out ();
...@@ -69,6 +68,9 @@ namespace zmq ...@@ -69,6 +68,9 @@ namespace zmq
private: private:
// Unplug the engine from the session.
void unplug ();
// TX and RX timeout timer ID's. // TX and RX timeout timer ID's.
enum {tx_timer_id = 0xa0, rx_timer_id = 0xa1}; enum {tx_timer_id = 0xa0, rx_timer_id = 0xa1};
......
...@@ -51,7 +51,6 @@ namespace zmq ...@@ -51,7 +51,6 @@ namespace zmq
// i_engine interface implementation. // i_engine interface implementation.
void plug (zmq::io_thread_t *io_thread_, void plug (zmq::io_thread_t *io_thread_,
zmq::session_base_t *session_); zmq::session_base_t *session_);
void unplug ();
void terminate (); void terminate ();
void activate_in (); void activate_in ();
void activate_out (); void activate_out ();
...@@ -62,6 +61,9 @@ namespace zmq ...@@ -62,6 +61,9 @@ namespace zmq
private: private:
// Unplug the engine from the session.
void unplug ();
// Function to handle network disconnections. // Function to handle network disconnections.
void error (); void error ();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment