diff options
author | Martin Sustrik <sustrik@250bpm.com> | 2012-06-13 10:25:18 +0200 |
---|---|---|
committer | Martin Sustrik <sustrik@250bpm.com> | 2012-06-13 10:25:18 +0200 |
commit | 0a2f88984a4543aa69c15d8d8639180816857a6b (patch) | |
tree | 759f4d025d4cb95e010081839197045a7fde9826 /src/pipe.cpp | |
parent | b018208d5901873a374d08a98cf31e3bb89d12d0 (diff) |
Revert "Implement SP wire protocol"
This reverts commit a34ea4d80609395150742259fd8c9caa4409e961.
Diffstat (limited to 'src/pipe.cpp')
-rw-r--r-- | src/pipe.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/pipe.cpp b/src/pipe.cpp index c14642f..0a15cc0 100644 --- a/src/pipe.cpp +++ b/src/pipe.cpp @@ -27,7 +27,7 @@ #include "err.hpp" int xs::pipepair (class object_t *parents_ [2], class pipe_t* pipes_ [2], - int hwms_ [2], bool delays_ [2], int sp_version_) + int hwms_ [2], bool delays_ [2], int protocol_) { // Creates two pipe objects. These objects are connected by two ypipes, // each to pass messages in one direction. @@ -38,10 +38,10 @@ int xs::pipepair (class object_t *parents_ [2], class pipe_t* pipes_ [2], alloc_assert (upipe2); pipes_ [0] = new (std::nothrow) pipe_t (parents_ [0], upipe1, upipe2, - hwms_ [1], hwms_ [0], delays_ [0], sp_version_); + hwms_ [1], hwms_ [0], delays_ [0], protocol_); alloc_assert (pipes_ [0]); pipes_ [1] = new (std::nothrow) pipe_t (parents_ [1], upipe2, upipe1, - hwms_ [0], hwms_ [1], delays_ [1], sp_version_); + hwms_ [0], hwms_ [1], delays_ [1], protocol_); alloc_assert (pipes_ [1]); pipes_ [0]->set_peer (pipes_ [1]); @@ -51,7 +51,7 @@ int xs::pipepair (class object_t *parents_ [2], class pipe_t* pipes_ [2], } xs::pipe_t::pipe_t (object_t *parent_, upipe_t *inpipe_, upipe_t *outpipe_, - int inhwm_, int outhwm_, bool delay_, int sp_version_) : + int inhwm_, int outhwm_, bool delay_, int protocol_) : object_t (parent_), inpipe (inpipe_), outpipe (outpipe_), @@ -66,7 +66,7 @@ xs::pipe_t::pipe_t (object_t *parent_, upipe_t *inpipe_, upipe_t *outpipe_, sink (NULL), state (active), delay (delay_), - sp_version (sp_version_) + protocol (protocol_) { } @@ -386,9 +386,9 @@ void xs::pipe_t::terminate (bool delay_) } } -int xs::pipe_t::get_sp_version () +int xs::pipe_t::get_protocol () { - return sp_version; + return protocol; } bool xs::pipe_t::is_delimiter (msg_t &msg_) |