generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-10-29 12:18:04 +01:00
Code Issues Projects Releases Wiki Activity

obsolete parameter removed from 'bind' command

Browse Source
This commit is contained in:
Martin Sustrik
2009-11-21 21:13:29 +01:00
parent 0e9ab2e8a3
commit 64634605b3
6 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/command.hpp
View File

@@ -70,7 +70,6 @@ namespace zmq
// Sent from session to socket to establish pipe(s) between them. // Sent from session to socket to establish pipe(s) between them.
struct { struct {
class owned_t *session;
class reader_t *in_pipe; class reader_t *in_pipe;
class writer_t *out_pipe; class writer_t *out_pipe;
} bind; } bind;

9
src/object.cpp
View File

@@ -83,8 +83,7 @@ void zmq::object_t::process_command (command_t &cmd_)
return; return;
case command_t::bind: case command_t::bind:
process_bind (cmd_.args.bind.session, process_bind (cmd_.args.bind.in_pipe, cmd_.args.bind.out_pipe);
cmd_.args.bind.in_pipe, cmd_.args.bind.out_pipe);
return; return;
case command_t::pipe_term: case command_t::pipe_term:
@@ -183,13 +182,12 @@ void zmq::object_t::send_attach (session_t *destination_, i_engine *engine_)
send_command (cmd); send_command (cmd);
} }
void zmq::object_t::send_bind (object_t *destination_, owned_t *session_, void zmq::object_t::send_bind (object_t *destination_,
reader_t *in_pipe_, writer_t *out_pipe_) reader_t *in_pipe_, writer_t *out_pipe_)
{ {
command_t cmd; command_t cmd;
cmd.destination = destination_; cmd.destination = destination_;
cmd.type = command_t::bind; cmd.type = command_t::bind;
cmd.args.bind.session = session_;
cmd.args.bind.in_pipe = in_pipe_; cmd.args.bind.in_pipe = in_pipe_;
cmd.args.bind.out_pipe = out_pipe_; cmd.args.bind.out_pipe = out_pipe_;
send_command (cmd); send_command (cmd);
@@ -265,8 +263,7 @@ void zmq::object_t::process_attach (i_engine *engine_)
zmq_assert (false); zmq_assert (false);
} }
void zmq::object_t::process_bind (owned_t *session_, void zmq::object_t::process_bind (reader_t *in_pipe_, writer_t *out_pipe_)
reader_t *in_pipe_, writer_t *out_pipe_)
{ {
zmq_assert (false); zmq_assert (false);
} }

6
src/object.hpp
View File

@@ -68,7 +68,7 @@ namespace zmq
class owned_t *object_); class owned_t *object_);
void send_attach (class session_t *destination_, void send_attach (class session_t *destination_,
struct i_engine *engine_); struct i_engine *engine_);
void send_bind (object_t *destination_, class owned_t *session_, void send_bind (object_t *destination_,
class reader_t *in_pipe_, class writer_t *out_pipe_); class reader_t *in_pipe_, class writer_t *out_pipe_);
void send_revive (class object_t *destination_); void send_revive (class object_t *destination_);
void send_pipe_term (class writer_t *destination_); void send_pipe_term (class writer_t *destination_);
@@ -84,8 +84,8 @@ namespace zmq
virtual void process_plug (); virtual void process_plug ();
virtual void process_own (class owned_t *object_); virtual void process_own (class owned_t *object_);
virtual void process_attach (struct i_engine *engine_); virtual void process_attach (struct i_engine *engine_);
virtual void process_bind (class owned_t *session_, virtual void process_bind (class reader_t *in_pipe_,
class reader_t *in_pipe_, class writer_t *out_pipe_); class writer_t *out_pipe_);
virtual void process_revive (); virtual void process_revive ();
virtual void process_pipe_term (); virtual void process_pipe_term ();
virtual void process_pipe_term_ack (); virtual void process_pipe_term_ack ();

2
src/session.cpp
View File

@@ -155,7 +155,7 @@ void zmq::session_t::process_plug ()
out_pipe->set_endpoint (this); out_pipe->set_endpoint (this);
} }
send_bind (owner, this, outbound ? &outbound->reader : NULL, send_bind (owner, outbound ? &outbound->reader : NULL,
inbound ? &inbound->writer : NULL); inbound ? &inbound->writer : NULL);
} }

6
src/socket_base.cpp
View File

@@ -160,8 +160,7 @@ int zmq::socket_base_t::connect (const char *addr_)
// Attach the pipes to the peer socket. Note that peer's seqnum // Attach the pipes to the peer socket. Note that peer's seqnum
// was incremented in find_endpoint function. When this command // was incremented in find_endpoint function. When this command
// is delivered, peer will consider the seqnum to be processed. // is delivered, peer will consider the seqnum to be processed.
// TODO: Seems that 'session' parameter is unused... send_bind (peer, out_pipe ? &out_pipe->reader : NULL,
send_bind (peer, NULL, out_pipe ? &out_pipe->reader : NULL,
in_pipe ? &in_pipe->writer : NULL); in_pipe ? &in_pipe->writer : NULL);
return 0; return 0;
@@ -510,8 +509,7 @@ void zmq::socket_base_t::process_own (owned_t *object_)
io_objects.insert (object_); io_objects.insert (object_);
} }
void zmq::socket_base_t::process_bind (owned_t *session_, void zmq::socket_base_t::process_bind (reader_t *in_pipe_, writer_t *out_pipe_)
reader_t *in_pipe_, writer_t *out_pipe_)
{ {
attach_pipes (in_pipe_, out_pipe_); attach_pipes (in_pipe_, out_pipe_);
} }

3
src/socket_base.hpp
View File

@@ -114,8 +114,7 @@ namespace zmq
// Handlers for incoming commands. // Handlers for incoming commands.
void process_own (class owned_t *object_); void process_own (class owned_t *object_);
void process_bind (class owned_t *session_, void process_bind (class reader_t *in_pipe_, class writer_t *out_pipe_);
class reader_t *in_pipe_, class writer_t *out_pipe_);
void process_term_req (class owned_t *object_); void process_term_req (class owned_t *object_);
void process_term_ack (); void process_term_ack ();