ostream: If cork method isn't implemented, keep track of corking state internally.

--HG--
branch : HEAD

diff --git a/src/lib/ostream-file.c b/src/lib/ostream-file.c
index dbfa3a2d3a6695477660dc642b055c1dff5de9a9..1d2ee824f40fa141db9f230c2806547387cccfac 100644 (file)
--- a/src/lib/ostream-file.c
+++ b/src/lib/ostream-file.c
@@ -42,7 +42,6 @@ struct file_ostream {
 
        unsigned int full:1; /* if head == tail, is buffer empty or full? */
        unsigned int file:1;
-       unsigned int corked:1;
        unsigned int flush_pending:1;
        unsigned int socket_cork_set:1;
        unsigned int no_socket_cork:1;
@@ -132,7 +131,7 @@ static void update_buffer(struct file_ostream *fstream, size_t size)
 
 static void o_stream_socket_cork(struct file_ostream *fstream)
 {
-       if (fstream->corked && !fstream->socket_cork_set) {
+       if (fstream->ostream.corked && !fstream->socket_cork_set) {
                if (!fstream->no_socket_cork) {
                        if (net_set_cork(fstream->fd, TRUE) < 0)
                                fstream->no_socket_cork = TRUE;
@@ -324,7 +323,7 @@ static void o_stream_file_cork(struct ostream_private *stream, bool set)
        struct file_ostream *fstream = (struct file_ostream *)stream;
        int ret;
 
-       if (fstream->corked != set && !stream->ostream.closed) {
+       if (stream->corked != set && !stream->ostream.closed) {
                if (set && fstream->io != NULL)
                        io_remove(&fstream->io);
                else if (!set) {
@@ -344,7 +343,7 @@ static void o_stream_file_cork(struct ostream_private *stream, bool set)
                                fstream->no_socket_cork = TRUE;
                        fstream->socket_cork_set = FALSE;
                }
-               fstream->corked = set;
+               stream->corked = set;
        }
 }
 
@@ -361,7 +360,7 @@ o_stream_file_flush_pending(struct ostream_private *stream, bool set)
        struct file_ostream *fstream = (struct file_ostream *) stream;
 
        fstream->flush_pending = set;
-       if (set && !fstream->corked && fstream->io == NULL) {
+       if (set && !stream->corked && fstream->io == NULL) {
                fstream->io = io_add(fstream->fd, IO_WRITE,
                                     stream_send_io, fstream);
        }
@@ -414,7 +413,7 @@ static void o_stream_grow_buffer(struct file_ostream *fstream, size_t bytes)
        if (size > fstream->ostream.max_buffer_size) {
                /* limit the size */
                size = fstream->ostream.max_buffer_size;
-       } else if (fstream->corked) {
+       } else if (fstream->ostream.corked) {
                /* try to use optimal buffer size with corking */
                new_size = I_MIN(fstream->optimal_block_size,
                                 fstream->ostream.max_buffer_size);
@@ -509,7 +508,7 @@ static size_t o_stream_add(struct file_ostream *fstream,
        }
 
        if (sent != 0 && fstream->io == NULL &&
-           !fstream->corked && !fstream->file) {
+           !fstream->ostream.corked && !fstream->file) {
                fstream->io = io_add(fstream->fd, IO_WRITE, stream_send_io,
                                     fstream);
        }
@@ -538,7 +537,7 @@ static ssize_t o_stream_file_sendv(struct ostream_private *stream,
        optimal_size = I_MIN(fstream->optimal_block_size,
                             fstream->ostream.max_buffer_size);
        if (IS_STREAM_EMPTY(fstream) &&
-           (!fstream->corked || size >= optimal_size)) {
+           (!stream->corked || size >= optimal_size)) {
                /* send immediately */
                ret = o_stream_writev(fstream, iov, iov_count);
                if (ret < 0)

diff --git a/src/lib/ostream-internal.h b/src/lib/ostream-internal.h
index b81eeed432e63aba1c6e3616d84a3890f78517c5..59925ebd6a5cca0b5a39587a7fba937f4facaeb7 100644 (file)
--- a/src/lib/ostream-internal.h
+++ b/src/lib/ostream-internal.h
@@ -28,6 +28,8 @@ struct ostream_private {
 
        stream_flush_callback_t *callback;
        void *context;
+
+       unsigned int corked:1;
 };
 
 struct ostream *o_stream_create(struct ostream_private *_stream);

diff --git a/src/lib/ostream.c b/src/lib/ostream.c
index e3aa477dbccc936dc6fbdaef675597c6a3913d16..1e5a985c6d7f5798fbd3d07205fdf8a03c612ab9 100644 (file)
--- a/src/lib/ostream.c
+++ b/src/lib/ostream.c
@@ -65,6 +65,8 @@ void o_stream_cork(struct ostream *stream)
 
        if (_stream->cork != NULL)
                _stream->cork(_stream, TRUE);
+       else
+               _stream->corked = TRUE;
 }
 
 void o_stream_uncork(struct ostream *stream)
@@ -76,8 +78,10 @@ void o_stream_uncork(struct ostream *stream)
 
        if (_stream->cork != NULL)
                _stream->cork(_stream, FALSE);
-       else
+       else {
+               _stream->corked = FALSE;
                (void)o_stream_flush(stream);
+       }
 }
 
 int o_stream_flush(struct ostream *stream)