generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-01-09 19:17:41 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #588 from hurtonm/master

Browse Source 
Small code cleanup
This commit is contained in:
Pieter Hintjens 2013-06-22 07:25:26 -07:00
commit 73e195279a
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/pipe.cpp
View File

@ -113,7 +113,7 @@ bool zmq::pipe_t::check_read ()
msg_t msg; msg_t msg;
bool ok = inpipe->read (&msg); bool ok = inpipe->read (&msg);
zmq_assert (ok); zmq_assert (ok);
delimit (); process_delimiter ();
return false; return false;
} }
@ -134,7 +134,7 @@ bool zmq::pipe_t::read (msg_t *msg_)
// If delimiter was read, start termination process of the pipe. // If delimiter was read, start termination process of the pipe.
if (msg_->is_delimiter ()) { if (msg_->is_delimiter ()) {
delimit (); process_delimiter ();
return false; return false;
} }
@ -414,22 +414,18 @@ int zmq::pipe_t::compute_lwm (int hwm_)
return result; return result;
} }
void zmq::pipe_t::delimit () void zmq::pipe_t::process_delimiter ()
{ {
if (state == active) { zmq_assert (state == active
state = delimiter_received; || state == waiting_for_delimiter);
return;
}
if (state == waiting_for_delimiter) { if (state == active)
state = delimiter_received;
else {
outpipe = NULL; outpipe = NULL;
send_pipe_term_ack (peer); send_pipe_term_ack (peer);
state = term_ack_sent; state = term_ack_sent;
return;
} }
// Delimiter in any other state is invalid.
zmq_assert (false);
} }
void zmq::pipe_t::hiccup () void zmq::pipe_t::hiccup ()

2
src/pipe.hpp
View File

@ -120,7 +120,7 @@ namespace zmq
void process_pipe_term_ack (); void process_pipe_term_ack ();
// Handler for delimiter read from the pipe. // Handler for delimiter read from the pipe.
void delimit (); void process_delimiter ();
// Constructor is private. Pipe can only be created using // Constructor is private. Pipe can only be created using
// pipepair function. // pipepair function.