3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-03-10 07:56:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't pass flags to xrecv method

Browse Source
This commit is contained in:
Martin Hurton 2012-11-09 17:17:43 +01:00
parent 7865f96e97
commit 66dc4d8b54
20 changed files with 28 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/dealer.cpp
View File

@ -54,11 +54,8 @@ int zmq::dealer_t::xsend (msg_t *msg_)
return lb.send (msg_);
}
int zmq::dealer_t::xrecv (msg_t *msg_, int flags_)
int zmq::dealer_t::xrecv (msg_t *msg_)
{
// flags_ is unused
(void)flags_;
return fq.recv (msg_);
}

2
src/dealer.hpp
View File

@ -48,7 +48,7 @@ namespace zmq
// Overloads of functions from socket_base_t.
void xattach_pipe (zmq::pipe_t *pipe_, bool icanhasall_);
int xsend (zmq::msg_t *msg_);
int xrecv (zmq::msg_t *msg_, int flags_);
int xrecv (zmq::msg_t *msg_);
bool xhas_in ();
bool xhas_out ();
void xread_activated (zmq::pipe_t *pipe_);

5
src/pair.cpp
View File

@ -86,11 +86,8 @@ int zmq::pair_t::xsend (msg_t *msg_)
return 0;
}
int zmq::pair_t::xrecv (msg_t *msg_, int flags_)
int zmq::pair_t::xrecv (msg_t *msg_)
{
// flags_ is unused
(void)flags_;
// Deallocate old content of the message.
int rc = msg_->close ();
errno_assert (rc == 0);

2
src/pair.hpp
View File

@ -44,7 +44,7 @@ namespace zmq
// Overloads of functions from socket_base_t.
void xattach_pipe (zmq::pipe_t *pipe_, bool icanhasall_);
int xsend (zmq::msg_t *msg_);
int xrecv (zmq::msg_t *msg_, int flags_);
int xrecv (zmq::msg_t *msg_);
bool xhas_in ();
bool xhas_out ();
void xread_activated (zmq::pipe_t *pipe_);

2
src/pub.cpp
View File

@ -32,7 +32,7 @@ zmq::pub_t::~pub_t ()
{
}
int zmq::pub_t::xrecv (class msg_t *, int)
int zmq::pub_t::xrecv (class msg_t *)
{
// Messages cannot be received from PUB socket.
errno = ENOTSUP;

2
src/pub.hpp
View File

@ -40,7 +40,7 @@ namespace zmq
~pub_t ();
// Implementations of virtual functions from socket_base_t.
int xrecv (zmq::msg_t *msg_, int flags_);
int xrecv (zmq::msg_t *msg_);
bool xhas_in ();
private:

5
src/pull.cpp
View File

@ -53,11 +53,8 @@ void zmq::pull_t::xterminated (pipe_t *pipe_)
fq.terminated (pipe_);
}
int zmq::pull_t::xrecv (msg_t *msg_, int flags_)
int zmq::pull_t::xrecv (msg_t *msg_)
{
// flags_ is unused
(void)flags_;
return fq.recv (msg_);
}

2
src/pull.hpp
View File

@ -46,7 +46,7 @@ namespace zmq
// Overloads of functions from socket_base_t.
void xattach_pipe (zmq::pipe_t *pipe_, bool icanhasall_);
int xrecv (zmq::msg_t *msg_, int flags_);
int xrecv (zmq::msg_t *msg_);
bool xhas_in ();
void xread_activated (zmq::pipe_t *pipe_);
void xterminated (zmq::pipe_t *pipe_);

6
src/rep.cpp
View File

@ -57,7 +57,7 @@ int zmq::rep_t::xsend (msg_t *msg_)
return 0;
}
int zmq::rep_t::xrecv (msg_t *msg_, int flags_)
int zmq::rep_t::xrecv (msg_t *msg_)
{
// If we are in middle of sending a reply, we cannot receive next request.
if (sending_reply) {
@ -69,7 +69,7 @@ int zmq::rep_t::xrecv (msg_t *msg_, int flags_)
// to the reply pipe.
if (request_begins) {
while (true) {
int rc = router_t::xrecv (msg_, flags_);
int rc = router_t::xrecv (msg_);
if (rc != 0)
return rc;
@ -95,7 +95,7 @@ int zmq::rep_t::xrecv (msg_t *msg_, int flags_)
}
// Get next message part to return to the user.
int rc = router_t::xrecv (msg_, flags_);
int rc = router_t::xrecv (msg_);
if (rc != 0)
return rc;

2
src/rep.hpp
View File

@ -41,7 +41,7 @@ namespace zmq
// Overloads of functions from socket_base_t.
int xsend (zmq::msg_t *msg_);
int xrecv (zmq::msg_t *msg_, int flags_);
int xrecv (zmq::msg_t *msg_);
bool xhas_in ();
bool xhas_out ();

8
src/req.cpp
View File

@ -75,7 +75,7 @@ int zmq::req_t::xsend (msg_t *msg_)
return 0;
}
int zmq::req_t::xrecv (msg_t *msg_, int flags_)
int zmq::req_t::xrecv (msg_t *msg_)
{
// If request wasn't send, we can't wait for reply.
if (!receiving_reply) {
@ -85,14 +85,14 @@ int zmq::req_t::xrecv (msg_t *msg_, int flags_)
// First part of the reply should be the original request ID.
if (message_begins) {
int rc = dealer_t::xrecv (msg_, flags_);
int rc = dealer_t::xrecv (msg_);
if (rc != 0)
return rc;
// TODO: This should also close the connection with the peer!
if (unlikely (!(msg_->flags () & msg_t::more) || msg_->size () != 0)) {
while (true) {
int rc = dealer_t::xrecv (msg_, flags_);
int rc = dealer_t::xrecv (msg_);
errno_assert (rc == 0);
if (!(msg_->flags () & msg_t::more))
break;
@ -106,7 +106,7 @@ int zmq::req_t::xrecv (msg_t *msg_, int flags_)
message_begins = false;
}
int rc = dealer_t::xrecv (msg_, flags_);
int rc = dealer_t::xrecv (msg_);
if (rc != 0)
return rc;

2
src/req.hpp
View File

@ -43,7 +43,7 @@ namespace zmq
// Overloads of functions from socket_base_t.
int xsend (zmq::msg_t *msg_);
int xrecv (zmq::msg_t *msg_, int flags_);
int xrecv (zmq::msg_t *msg_);
bool xhas_in ();
bool xhas_out ();

5
src/router.cpp
View File

@ -224,11 +224,8 @@ int zmq::router_t::xsend (msg_t *msg_)
return 0;
}
int zmq::router_t::xrecv (msg_t *msg_, int flags_)
int zmq::router_t::xrecv (msg_t *msg_)
{
// flags_ is unused
(void)flags_;
if (prefetched) {
if (!identity_sent) {
int rc = msg_->move (prefetched_id);

2
src/router.hpp
View File

@ -51,7 +51,7 @@ namespace zmq
void xattach_pipe (zmq::pipe_t *pipe_, bool icanhasall_);
int xsetsockopt (int option_, const void *optval_, size_t optvallen_);
int xsend (msg_t *msg_);
int xrecv (msg_t *msg_, int flags_);
int xrecv (msg_t *msg_);
bool xhas_in ();
bool xhas_out ();
void xread_activated (zmq::pipe_t *pipe_);

8
src/socket_base.cpp
View File

@ -689,7 +689,7 @@ int zmq::socket_base_t::recv (msg_t *msg_, int flags_)
}
// Get the message.
int rc = xrecv (msg_, flags_);
int rc = xrecv (msg_);
if (unlikely (rc != 0 && errno != EAGAIN))
return -1;
@ -708,7 +708,7 @@ int zmq::socket_base_t::recv (msg_t *msg_, int flags_)
return -1;
ticks = 0;
rc = xrecv (msg_, flags_);
rc = xrecv (msg_);
if (rc < 0)
return rc;
extract_flags (msg_);
@ -726,7 +726,7 @@ int zmq::socket_base_t::recv (msg_t *msg_, int flags_)
while (true) {
if (unlikely (process_commands (block ? timeout : 0, false) != 0))
return -1;
rc = xrecv (msg_, flags_);
rc = xrecv (msg_);
if (rc == 0) {
ticks = 0;
break;
@ -897,7 +897,7 @@ bool zmq::socket_base_t::xhas_in ()
return false;
}
int zmq::socket_base_t::xrecv (msg_t *, int)
int zmq::socket_base_t::xrecv (msg_t *)
{
errno = ENOTSUP;
return -1;

2
src/socket_base.hpp
View File

@ -137,7 +137,7 @@ namespace zmq
// The default implementation assumes that recv in not supported.
virtual bool xhas_in ();
virtual int xrecv (zmq::msg_t *msg_, int flags_);
virtual int xrecv (zmq::msg_t *msg_);
// i_pipe_events will be forwarded to these functions.
virtual void xread_activated (pipe_t *pipe_);

5
src/xpub.cpp
View File

@ -145,11 +145,8 @@ bool zmq::xpub_t::xhas_out ()
return dist.has_out ();
}
int zmq::xpub_t::xrecv (msg_t *msg_, int flags_)
int zmq::xpub_t::xrecv (msg_t *msg_)
{
// flags_ is unused
(void)flags_;
// If there is at least one
if (pending.empty ()) {
errno = EAGAIN;

2
src/xpub.hpp
View File

@ -50,7 +50,7 @@ namespace zmq
void xattach_pipe (zmq::pipe_t *pipe_, bool icanhasall_ = false);
int xsend (zmq::msg_t *msg_);
bool xhas_out ();
int xrecv (zmq::msg_t *msg_, int flags_);
int xrecv (zmq::msg_t *msg_);
bool xhas_in ();
void xread_activated (zmq::pipe_t *pipe_);
void xwrite_activated (zmq::pipe_t *pipe_);

5
src/xsub.cpp
View File

@ -121,11 +121,8 @@ bool zmq::xsub_t::xhas_out ()
return true;
}
int zmq::xsub_t::xrecv (msg_t *msg_, int flags_)
int zmq::xsub_t::xrecv (msg_t *msg_)
{
// flags_ is unused
(void)flags_;
// If there's already a message prepared by a previous call to zmq_poll,
// return it straight ahead.
if (has_message) {

2
src/xsub.hpp
View File

@ -48,7 +48,7 @@ namespace zmq
void xattach_pipe (zmq::pipe_t *pipe_, bool icanhasall_);
int xsend (zmq::msg_t *msg_);
bool xhas_out ();
int xrecv (zmq::msg_t *msg_, int flags_);
int xrecv (zmq::msg_t *msg_);
bool xhas_in ();
void xread_activated (zmq::pipe_t *pipe_);
void xwrite_activated (zmq::pipe_t *pipe_);