generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-03-03 12:58:05 +01:00
Code Issues Projects Releases Wiki Activity

Revert "Merge branch 'master' of github.com:zeromq/libzmq"

Browse Source 
This reverts commit 7b10586558268479e62ed901f3d8d76916bc6c8a, reversing
changes made to 33459029793474d14cdb48f85ad2c58dc7ed156f.
This commit is contained in:
Ian Barber 2012-06-12 14:12:03 +01:00
parent 6117a2b099
commit dde69fb9fb
6 changed files with 18 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/ipc_connecter.cpp
View File

@ -59,9 +59,13 @@ zmq::ipc_connecter_t::ipc_connecter_t (class io_thread_t *io_thread_,
zmq::ipc_connecter_t::~ipc_connecter_t () zmq::ipc_connecter_t::~ipc_connecter_t ()
{ {
zmq_assert (!wait); if (wait)
zmq_assert (!handle_valid); cancel_timer (reconnect_timer_id);
zmq_assert (s == retired_fd); if (handle_valid)
rm_fd (handle);
if (s != retired_fd)
close ();
} }
void zmq::ipc_connecter_t::process_plug () void zmq::ipc_connecter_t::process_plug ()
@ -72,24 +76,6 @@ void zmq::ipc_connecter_t::process_plug ()
start_connecting (); start_connecting ();
} }
void zmq::ipc_connecter_t::process_term (int linger_)
{
if (wait) {
cancel_timer (reconnect_timer_id);
wait = false;
}
if (handle_valid) {
rm_fd (handle);
handle_valid = false;
}
if (s != retired_fd)
close ();
own_t::process_term (linger_);
}
void zmq::ipc_connecter_t::in_event () void zmq::ipc_connecter_t::in_event ()
{ {
// We are not polling for incomming data, so we are actually called // We are not polling for incomming data, so we are actually called

1
src/ipc_connecter.hpp
View File

@ -55,7 +55,6 @@ namespace zmq
// Handlers for incoming commands. // Handlers for incoming commands.
void process_plug (); void process_plug ();
void process_term (int linger_);
// Handlers for I/O events. // Handlers for I/O events.
void in_event (); void in_event ();

3
src/ipc_listener.cpp
View File

@ -52,7 +52,8 @@ zmq::ipc_listener_t::ipc_listener_t (io_thread_t *io_thread_,
zmq::ipc_listener_t::~ipc_listener_t () zmq::ipc_listener_t::~ipc_listener_t ()
{ {
zmq_assert (s == retired_fd); if (s != retired_fd)
close ();
} }
void zmq::ipc_listener_t::process_plug () void zmq::ipc_listener_t::process_plug ()

28
src/tcp_connecter.cpp
View File

@ -69,9 +69,13 @@ zmq::tcp_connecter_t::tcp_connecter_t (class io_thread_t *io_thread_,
zmq::tcp_connecter_t::~tcp_connecter_t () zmq::tcp_connecter_t::~tcp_connecter_t ()
{ {
zmq_assert (!wait); if (wait)
zmq_assert (!handle_valid); cancel_timer (reconnect_timer_id);
zmq_assert (s == retired_fd); if (handle_valid)
rm_fd (handle);
if (s != retired_fd)
close ();
} }
void zmq::tcp_connecter_t::process_plug () void zmq::tcp_connecter_t::process_plug ()
@ -82,24 +86,6 @@ void zmq::tcp_connecter_t::process_plug ()
start_connecting (); start_connecting ();
} }
void zmq::tcp_connecter_t::process_term (int linger_)
{
if (wait) {
cancel_timer (reconnect_timer_id);
wait = false;
}
if (handle_valid) {
rm_fd (handle);
handle_valid = false;
}
if (s != retired_fd)
close ();
own_t::process_term (linger_);
}
void zmq::tcp_connecter_t::in_event () void zmq::tcp_connecter_t::in_event ()
{ {
// We are not polling for incomming data, so we are actually called // We are not polling for incomming data, so we are actually called

1
src/tcp_connecter.hpp
View File

@ -53,7 +53,6 @@ namespace zmq
// Handlers for incoming commands. // Handlers for incoming commands.
void process_plug (); void process_plug ();
void process_term (int linger_);
// Handlers for I/O events. // Handlers for I/O events.
void in_event (); void in_event ();

3
src/tcp_listener.cpp
View File

@ -61,7 +61,8 @@ zmq::tcp_listener_t::tcp_listener_t (io_thread_t *io_thread_,
zmq::tcp_listener_t::~tcp_listener_t () zmq::tcp_listener_t::~tcp_listener_t ()
{ {
zmq_assert (s == retired_fd); if (s != retired_fd)
close ();
} }
void zmq::tcp_listener_t::process_plug () void zmq::tcp_listener_t::process_plug ()