commit 134059c7b1daff7acc1a943c957f6277d4c87f47
author Greg Stein <gstein@apache.org> Sat Apr 27 05:10:18 2013 +0000
committer Greg Stein <gstein@apache.org> Sat Apr 27 05:10:18 2013 +0000
tree 8b359946e2f33468a845683235d1ff618795a853
parent 138a4496772d63e2b4af7409c800fef817069b0b

on the copy-bucket branch:

Continued work on the COPY bucket.

* buckets/copy_buckets.c:
  (serf_copy_readline): generally, just delegate to the wrapped bucket
  (serf_copy_read_iovec): the REQUESTED amount may be less than
    MIN_SIZE. return if we already have that. otherwise, use our
    buffer to reach REQUESTED bytes.
  (serf_copy_read_for_sendfile): add skeleton code to deal with held data
  (serf_copy_read_bucket): handle held data situation.
  (serf_copy_peek): handle held data situation.


git-svn-id: https://svn.apache.org/repos/asf/serf/branches/copy-bucket@1699348 13f79535-47bb-0310-9956-ffa450edef68

buckets/copy_buckets.c

diff --git a/buckets/copy_buckets.c b/buckets/copy_buckets.c
index 5ff46d2..fc87c68 100644
--- a/buckets/copy_buckets.c
+++ b/buckets/copy_buckets.c
@@ -87,16 +87,15 @@
 {
     copy_context_t *ctx = bucket->data;
 
-    /* ### disregard MIN_SIZE. a "line" could very well be shorter.  */
+    if (ctx->vecs_count > 0)
+    {
+        /* ### return held data  */
+    }
 
-    /* Returned data will be from current position. */
-    *data = ctx->current;
-    serf_util_readline(&ctx->current, &ctx->remaining, acceptable, found);
+    /* Disregard MIN_SIZE. a "line" could very well be shorter. Just
+       delegate this to the wrapped bucket.  */
 
-    /* See how much ctx->current moved forward. */
-    *len = ctx->current - *data;
-
-    return ctx->remaining ? APR_SUCCESS : APR_EOF;
+    return serf_bucket_readline(ctx->wrapped, acceptable, found, data, len);
 }
 
 
@@ -128,10 +127,14 @@
     for (total = 0, i = *vecs_used; i-- > 0; )
         total += vecs[i].iov_len;
 
-    /* The IOVEC holds at least MIN_SIZE data, so we're good.  */
-    if (total >= ctx->min_size)
+    /* The IOVEC holds at least MIN_SIZE data, so we're good. Or, it
+       holds the amount requested, so we shouldn't try to
+       gather/accumulate more data.  */
+    if (total >= ctx->min_size || total == requested)
         return status;
 
+    /* Use our buffer to get at least MIN_SIZE or REQUESTED bytes of data.  */
+
     /* ### copy into HOLD_BUF. then read/append some more.  */
 
     return status;
@@ -148,6 +151,12 @@
 {
     copy_context_t *ctx = bucket->data;
 
+    /* Any held data means we cannot provide a source for sendfile().  */
+    if (ctx->vecs_count > 0)
+    {
+        /* ### return the held data  */
+    }
+
     return serf_bucket_read_for_sendfile(ctx->wrapped, requested,
                                          hdtr, file, offset, len);
 }
@@ -159,6 +168,11 @@
 {
     copy_context_t *ctx = bucket->data;
 
+    /* If there is some held data (at the front of the read stream), then
+       we definitely don't have the requested bucket type.  */
+    if (ctx->vecs_count > 0)
+        return NULL;
+
     return serf_bucket_read_bucket(ctx->wrapped, type);
 }
 
@@ -169,6 +183,13 @@
 {
     copy_context_t *ctx = bucket->data;
 
+    if (ctx->vecs_count > 0)
+    {
+        *data = ctx->vecs[0].iov_base;
+        *len = ctx->vecs[0].iov_len;
+        return APR_SUCCESS;
+    }
+
     return serf_bucket_peek(ctx->wrapped, data, len);
 }