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

Patches from sub-forward branch incorporated

Browse Source 
Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
This commit is contained in:
Martin Sustrik
2011-05-30 10:07:34 +02:00
parent 311fb0d852
commit 0b59866a84
30 changed files with 884 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/object.cpp
View File

@@ -74,7 +74,7 @@ void zmq::object_t::process_command (command_t &cmd_)
case command_t::plug:
process_plug ();
process_seqnum ();
return;
break;
case command_t::own:
process_own (cmd_.args.own.object);
@@ -96,9 +96,13 @@ void zmq::object_t::process_command (command_t &cmd_)
process_seqnum ();
break;
case command_t::hiccup:
process_hiccup (cmd_.args.hiccup.pipe);
break;
case command_t::pipe_term:
process_pipe_term ();
return;
break;
case command_t::pipe_term_ack:
process_pipe_term_ack ();
@@ -290,6 +294,18 @@ void zmq::object_t::send_activate_write (pipe_t *destination_,
send_command (cmd);
}
void zmq::object_t::send_hiccup (pipe_t *destination_, void *pipe_)
{
command_t cmd;
#if defined ZMQ_MAKE_VALGRIND_HAPPY
memset (&cmd, 0, sizeof (cmd));
#endif
cmd.destination = destination_;
cmd.type = command_t::hiccup;
cmd.args.hiccup.pipe = pipe_;
send_command (cmd);
}
void zmq::object_t::send_pipe_term (pipe_t *destination_)
{
command_t cmd;
@@ -418,6 +434,11 @@ void zmq::object_t::process_activate_write (uint64_t msgs_read_)
zmq_assert (false);
}
void zmq::object_t::process_hiccup (void *pipe_)
{
zmq_assert (false);
}
void zmq::object_t::process_pipe_term ()
{
zmq_assert (false);