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

ZMQII-59: TCP server crashes sometimes when message is send and socket is closed immediately

Browse Source
This commit is contained in:
Martin Sustrik
2010-02-07 09:14:43 +01:00
parent d21bf21a36
commit bbaa494fb5
3 changed files with 30 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/object.cpp
View File

@@ -146,12 +146,13 @@ zmq::io_thread_t *zmq::object_t::choose_io_thread (uint64_t taskset_)
void zmq::object_t::send_stop ()
{
// Send command goes always to the current object. To-self pipe is
// used exclusively for sending this command.
// 'stop' command goes always from administrative thread to
// the current object.
int admin_thread_id = dispatcher->thread_slot_count () - 1;
command_t cmd;
cmd.destination = this;
cmd.type = command_t::stop;
dispatcher->write (thread_slot, thread_slot, cmd);
dispatcher->write (admin_thread_id, thread_slot, cmd);
}
void zmq::object_t::send_plug (owned_t *destination_, bool inc_seqnum_)
@@ -314,9 +315,6 @@ void zmq::object_t::process_seqnum ()
void zmq::object_t::send_command (command_t &cmd_)
{
int destination_thread_slot = cmd_.destination->get_thread_slot ();
if (destination_thread_slot == thread_slot)
cmd_.destination->process_command (cmd_);
else
dispatcher->write (thread_slot, destination_thread_slot, cmd_);
dispatcher->write (thread_slot, destination_thread_slot, cmd_);
}