From 971cbeda3de6691b212ad18bed9e9f08b278cfe1 Mon Sep 17 00:00:00 2001 From: Martin Sustrik Date: Tue, 1 May 2012 16:41:04 +0200 Subject: Revert "Implement protocol versioning (except PGM)" This reverts commit 512f3a604924fec9d89e2b4bfd6f73aa66309fa7. --- src/pipe.hpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/pipe.hpp') diff --git a/src/pipe.hpp b/src/pipe.hpp index dbc6b7e..c298154 100644 --- a/src/pipe.hpp +++ b/src/pipe.hpp @@ -44,7 +44,7 @@ namespace xs // pipe receives all the pending messages before terminating, otherwise it // terminates straight away. int pipepair (xs::object_t *parents_ [2], xs::pipe_t* pipes_ [2], - int hwms_ [2], bool delays_ [2], int sp_version_); + int hwms_ [2], bool delays_ [2], int protocol_); struct i_pipe_events { @@ -69,7 +69,7 @@ namespace xs // This allows pipepair to create pipe objects. friend int pipepair (xs::object_t *parents_ [2], xs::pipe_t* pipes_ [2], int hwms_ [2], bool delays_ [2], - int sp_version_); + int protocol_); public: @@ -111,8 +111,8 @@ namespace xs // before actual shutdown. void terminate (bool delay_); - // Returns the SP pattern version in use on this pipe. - int get_sp_version (); + // Returns the ID of the protocol associated with the pipe. + int get_protocol (); private: @@ -132,7 +132,7 @@ namespace xs // Constructor is private. Pipe can only be created using // pipepair function. 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_); // Pipepair uses this function to let us know about // the peer pipe object. @@ -192,9 +192,9 @@ namespace xs // asks us to. bool delay; - // SP pattern version in use on this pipe. This value is used by the - // pattern classes using the pipe, not the pipe itself. - int sp_version; + // ID of the protocol to use. This value is not used by the pipe + // itself, rather it's used by the users of the pipe. + int protocol; // Identity of the writer. Used uniquely by the reader side. blob_t identity; -- cgit v1.2.3