ZMQ_LINGER socket option added.

    1. ZMQ_LINGER option can be set/get
    2. options are part of own_t base class rather than being declared
       separately by individual objects
    3. Linger option is propagated with "term" command so that the
       newest value of it is used rather than the stored old one.
    4. Session sets the linger timer if needed and terminates
       as soon as it expires.
    5. Corresponding documentation updated.

Signed-off-by: Martin Sustrik <sustrik@250bpm.com>

1 files changed, 12 insertions, 5 deletions

diff --git a/src/session.hpp b/src/session.hpp
index 0f90e80..8adda5e 100644
--- a/src/session.hpp
+++ b/src/session.hpp
@@ -22,7 +22,7 @@
 
 #include "own.hpp"
 #include "i_inout.hpp"
-#include "options.hpp"
+#include "io_object.hpp"
 #include "blob.hpp"
 #include "pipe.hpp"
 
@@ -31,6 +31,7 @@ namespace zmq
 
     class session_t :
         public own_t,
+        public io_object_t,
         public i_inout,
         public i_reader_events,
         public i_writer_events
@@ -79,16 +80,16 @@ namespace zmq
 
         ~session_t ();
 
-        //  Inherited socket options. These are visible to all session classes.
-        options_t options;
-
     private:
 
         //  Handlers for incoming commands.
         void process_plug ();
         void process_attach (struct i_engine *engine_,
             const blob_t &peer_identity_);
-        void process_term ();
+        void process_term (int linger_);
+
+        //  i_poll_events handlers.
+        void timer_event (int id_);
 
         //  Remove any half processed messages. Flush unflushed messages.
         //  Call this function when engine disconnect to get rid of leftovers.
@@ -127,6 +128,12 @@ namespace zmq
         //  pending messages in the inbound pipe.
         bool force_terminate;
 
+        //  ID of the linger timer
+        enum {linger_timer_id = 0x20};
+
+        //  True is linger timer is running.
+        bool has_linger_timer;
+
         enum {
             active,
             pending,