Changeset 08f5bd75ad170e6b8177b93e98f40d0f8a51b9d2 for tls/session.hh

Timestamp:

08/14/10 20:42:42 (22 months ago)

Author:

Antti-Juhani Kaijanaho <antti-juhani@…>

Children:

994811461679afe70ab81e079fd87191d609be9d

Parents:

61975465b66e572def6105480f10917981b1ef0d

git-committer:

Antti-Juhani Kaijanaho <antti-juhani@…> (08/14/10 20:42:42)

Message:

[tls::session] Use ring buffers instead of dynamically growing buffers

This way enbuffering cannot throw bad_alloc.

Closes #69.

Signed-off-by: Antti-Juhani Kaijanaho <antti-juhani@…>

Files:

• tls/session.hh (modified) (5 diffs)

tls/session.hh

@@ -21 +21 @@
 #define GUARD_TLS_SESSION_HH
 
+#include "ringbuf.hh"
 #include "error_category.hh"
 #include "init.hh"
@@ -40 +41 @@
                 public boost::enable_shared_from_this<session_impl<Stream> >
         {
+                enum { ringbufsize = 4096 };
         public:
                 typedef boost::shared_ptr<session_impl<Stream> > ptr;
@@ -49 +51 @@
                         , stream(si)
                         , strand(stream.get_io_service())
-                        , ins_low(0)
-                        , ins_high(0)
+                        , ins(ringbufsize)
                         , read_active(false)
-                        , outs_low(0)
+                        , outs(ringbufsize)
                         , write_active(false)
                         { init(tls_init, ce); }
@@ -61 +62 @@
                         , stream(si)
                         , strand(stream.get_io_service())
-                        , ins_low(0)
-                        , ins_high(0)
+                        , ins(ringbufsize)
                         , read_active(false)
-                        , outs_low(0)
+                        , outs(ringbufsize)
                         , write_active(false)
                         { init(tls_init, ce); }
@@ -102 +102 @@
                 gnutls_session_t gs;
 
-                /* the stuff that has been read but not yet passed on
-                 * is between ins_low and ins_high */
-                std::vector<unsigned char> ins;
-                size_t ins_low, ins_high;
+                ringbuf ins;
                 bool read_active;
                 
-                /* the stuff that has been buffered for sending but
-                 * not yet sent is between outs_low and the end of
-                 * outs */
-                std::vector<unsigned char> outs;
-                size_t outs_low;
+                ringbuf outs;
                 bool write_active;