generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-01-31 14:39:55 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #371 from hurtonm/fix_race_condition_in_connecters

Browse Source 
Fix race conditions in {tcp,ipc}_connecter
This commit is contained in:
Ian Barber 2012-06-11 23:57:21 -07:00
commit b448de926b
6 changed files with 46 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/ipc_connecter.cpp
View File

@ -59,13 +59,9 @@ zmq::ipc_connecter_t::ipc_connecter_t (class io_thread_t *io_thread_,
zmq::ipc_connecter_t::~ipc_connecter_t ()
{
if (wait)
cancel_timer (reconnect_timer_id);
if (handle_valid)
rm_fd (handle);
if (s != retired_fd)
close ();
zmq_assert (!wait);
zmq_assert (!handle_valid);
zmq_assert (s == retired_fd);
}
void zmq::ipc_connecter_t::process_plug ()
@ -76,6 +72,24 @@ void zmq::ipc_connecter_t::process_plug ()
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 ()
{
// We are not polling for incomming data, so we are actually called

1
src/ipc_connecter.hpp
View File

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

3
src/ipc_listener.cpp
View File

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

28
src/tcp_connecter.cpp
View File

@ -69,13 +69,9 @@ zmq::tcp_connecter_t::tcp_connecter_t (class io_thread_t *io_thread_,
zmq::tcp_connecter_t::~tcp_connecter_t ()
{
if (wait)
cancel_timer (reconnect_timer_id);
if (handle_valid)
rm_fd (handle);
if (s != retired_fd)
close ();
zmq_assert (!wait);
zmq_assert (!handle_valid);
zmq_assert (s == retired_fd);
}
void zmq::tcp_connecter_t::process_plug ()
@ -86,6 +82,24 @@ void zmq::tcp_connecter_t::process_plug ()
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 ()
{
// We are not polling for incomming data, so we are actually called

1
src/tcp_connecter.hpp
View File

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

3
src/tcp_listener.cpp
View File

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