generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-10-13 22:50:19 +02:00
Code Issues Projects Releases Wiki Activity

Revert "fixes #1565: Allow session to flush commands on an engine error"

Browse Source 
This reverts commit 54799c8c6f.

This change broke the tests/test_shutdown_stress testcase.
This commit is contained in:
Pieter Hintjens
2015-12-17 16:20:48 +01:00
parent 768fc7699e
commit 31c35498af
3 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/session_base.cpp
View File

@@ -429,9 +429,6 @@ void zmq::session_base_t::engine_error (
if (zap_pipe) if (zap_pipe)
zap_pipe->check_read (); zap_pipe->check_read ();
zmq_assert(socket);
socket->flush_commands();
} }
void zmq::session_base_t::process_term (int linger_) void zmq::session_base_t::process_term (int linger_)

7
src/socket_base.cpp
View File

@@ -1467,13 +1467,6 @@ void zmq::socket_base_t::check_destroy ()
} }
} }
void zmq::socket_base_t::flush_commands ()
{
ENTER_MUTEX();
process_commands (0, false);
EXIT_MUTEX();
}
void zmq::socket_base_t::read_activated (pipe_t *pipe_) void zmq::socket_base_t::read_activated (pipe_t *pipe_)
{ {
xread_activated (pipe_); xread_activated (pipe_);

2
src/socket_base.hpp
View File

@@ -109,8 +109,6 @@ namespace zmq
void out_event (); void out_event ();
void timer_event (int id_); void timer_event (int id_);
void flush_commands();
// i_pipe_events interface implementation. // i_pipe_events interface implementation.
void read_activated (pipe_t *pipe_); void read_activated (pipe_t *pipe_);
void write_activated (pipe_t *pipe_); void write_activated (pipe_t *pipe_);