3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2024-12-31 01:43:02 +08:00
Code Issues Projects Releases Wiki Activity

Fixed problems from previous PR for #2158 (#2160)

Browse Source 
* - Fixed windows build errors
- Extended monitor lock scope to prevent race-condition between
  process_stop and monitor

* - Fixed windows build errors
- Extended monitor lock scope to prevent race-condition between
  process_stop and monitor
This commit is contained in:
Jens Auer 2016-10-12 11:34:22 +02:00 committed by Luca Boccassi
parent 398f256a5c
commit b031325996
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/socket_base.cpp
View File

@ -1380,10 +1380,9 @@ void zmq::socket_base_t::process_stop ()
// We'll remember the fact so that any blocking call is interrupted and any // We'll remember the fact so that any blocking call is interrupted and any
// further attempt to use the socket will return ETERM. The user is still // further attempt to use the socket will return ETERM. The user is still
// responsible for calling zmq_close on the socket though! // responsible for calling zmq_close on the socket though!
{ scoped_lock_t lock(monitor_sync);
scoped_lock_t lock(monitor_sync); stop_monitor ();
stop_monitor ();
}
ctx_terminated = true; ctx_terminated = true;
} }
@ -1583,13 +1582,13 @@ void zmq::socket_base_t::extract_flags (msg_t *msg_)
int zmq::socket_base_t::monitor (const char *addr_, int events_) int zmq::socket_base_t::monitor (const char *addr_, int events_)
{ {
scoped_lock_t lock(monitor_sync);
if (unlikely (ctx_terminated)) { if (unlikely (ctx_terminated)) {
errno = ETERM; errno = ETERM;
return -1; return -1;
} }
scoped_lock_t lock(monitor_sync);
// Support deregistering monitoring endpoints as well // Support deregistering monitoring endpoints as well
if (addr_ == NULL) { if (addr_ == NULL) {
stop_monitor (); stop_monitor ();
@ -1629,7 +1628,7 @@ int zmq::socket_base_t::monitor (const char *addr_, int events_)
return rc; return rc;
} }
void zmq::socket_base_t::event_connected (const std::string &addr_, int fd_) void zmq::socket_base_t::event_connected (const std::string &addr_, zmq::fd_t fd_)
{ {
event(addr_, fd_, ZMQ_EVENT_CONNECTED); event(addr_, fd_, ZMQ_EVENT_CONNECTED);
} }
@ -1644,7 +1643,7 @@ void zmq::socket_base_t::event_connect_retried (const std::string &addr_, int in
event(addr_, interval_, ZMQ_EVENT_CONNECT_RETRIED); event(addr_, interval_, ZMQ_EVENT_CONNECT_RETRIED);
} }
void zmq::socket_base_t::event_listening (const std::string &addr_, int fd_) void zmq::socket_base_t::event_listening (const std::string &addr_, zmq::fd_t fd_)
{ {
event(addr_, fd_, ZMQ_EVENT_LISTENING); event(addr_, fd_, ZMQ_EVENT_LISTENING);
} }
@ -1654,7 +1653,7 @@ void zmq::socket_base_t::event_bind_failed (const std::string &addr_, int err_)
event(addr_, err_, ZMQ_EVENT_BIND_FAILED); event(addr_, err_, ZMQ_EVENT_BIND_FAILED);
} }
void zmq::socket_base_t::event_accepted (const std::string &addr_, int fd_) void zmq::socket_base_t::event_accepted (const std::string &addr_, zmq::fd_t fd_)
{ {
event(addr_, fd_, ZMQ_EVENT_ACCEPTED); event(addr_, fd_, ZMQ_EVENT_ACCEPTED);
} }
@ -1664,7 +1663,7 @@ void zmq::socket_base_t::event_accept_failed (const std::string &addr_, int err_
event(addr_, err_, ZMQ_EVENT_ACCEPT_FAILED); event(addr_, err_, ZMQ_EVENT_ACCEPT_FAILED);
} }
void zmq::socket_base_t::event_closed (const std::string &addr_, int fd_) void zmq::socket_base_t::event_closed (const std::string &addr_, zmq::fd_t fd_)
{ {
event(addr_, fd_, ZMQ_EVENT_CLOSED); event(addr_, fd_, ZMQ_EVENT_CLOSED);
} }
@ -1674,17 +1673,17 @@ void zmq::socket_base_t::event_close_failed (const std::string &addr_, int err_)
event(addr_, err_, ZMQ_EVENT_CLOSE_FAILED); event(addr_, err_, ZMQ_EVENT_CLOSE_FAILED);
} }
void zmq::socket_base_t::event_disconnected (const std::string &addr_, int fd_) void zmq::socket_base_t::event_disconnected (const std::string &addr_, zmq::fd_t fd_)
{ {
event(addr_, fd_, ZMQ_EVENT_DISCONNECTED); event(addr_, fd_, ZMQ_EVENT_DISCONNECTED);
} }
void zmq::socket_base_t::event(const std::string &addr_, int fd_, int type_) void zmq::socket_base_t::event(const std::string &addr_, intptr_t value_, int type_)
{ {
scoped_lock_t lock(monitor_sync); scoped_lock_t lock(monitor_sync);
if (monitor_events & type_) if (monitor_events & type_)
{ {
monitor_event (type_, fd_, addr_); monitor_event (type_, value_, addr_);
} }
} }

2
src/socket_base.hpp
View File

@ -182,7 +182,7 @@ namespace zmq
private: private:
// test if event should be sent and then dispatch it // test if event should be sent and then dispatch it
void event(const std::string &addr_, int fd_, int type_); void event(const std::string &addr_, intptr_t fd_, int type_);
// Socket event data dispatch // Socket event data dispatch
void monitor_event (int event_, intptr_t value_, const std::string& addr_); void monitor_event (int event_, intptr_t value_, const std::string& addr_);