libglusterfs: cleanup iovec functions

This patch cleans some iovec code and creates two additional helper
functions to simplify management of iovec structures.

  iov_range_copy(struct iovec *dst, uint32_t dst_count, uint32_t dst_offset,
                 struct iovec *src, uint32_t src_count, uint32_t src_offset,
                 uint32_t size);

    This function copies up to 'size' bytes from 'src' at offset
    'src_offset' to 'dst' at 'dst_offset'. It returns the number of
    bytes copied.

  iov_skip(struct iovec *iovec, uint32_t count, uint32_t size);

    This function removes the initial 'size' bytes from 'iovec' and
    returns the updated number of iovec vectors remaining.

The signature of iov_subset() has also been modified to make it safer
and easier to use. The new signature is:

  iov_subset(struct iovec *src, int src_count, uint32_t start, uint32_t size,
             struct iovec **dst, int32_t dst_count);

    This function creates a new iovec array containing the subset of the
    'src' vector starting at 'start' with size 'size'. The resulting
    array is allocated if '*dst' is NULL, or copied to '*dst' if it fits
    (based on 'dst_count'). It returns the number of iovec vectors used.

A new set of functions to iterate through an iovec array have been
created. They can be used to simplify the implementation of other
iovec-based helper functions.

Change-Id: Ia5fe57e388e23392a8d6cdab17670e337cadd587
Updates: bz#1193929
Signed-off-by: Xavi Hernandez <xhernandez@redhat.com>

4 files changed, 8 insertions, 35 deletions

diff --git a/xlators/performance/io-cache/src/io-cache.c b/xlators/performance/io-cache/src/io-cache.c
index 95ba2e19b9e..711afdf700d 100644
--- a/xlators/performance/io-cache/src/io-cache.c
+++ b/xlators/performance/io-cache/src/io-cache.c
@@ -87,14 +87,6 @@ ioc_update_pages(call_frame_t *frame, ioc_inode_t *ioc_inode,
           write_offset = 0;
     off_t page_offset = 0, page_end = 0;
     ioc_page_t *trav = NULL;
-    struct iovec pagevector =
-                     {
-                         0,
-                     },
-                 writevector = {
-                     0,
-                 };
-    int pvcount = 0, wvcount;
 
     size = iov_length(vector, count);
     size = min(size, op_ret);
@@ -120,16 +112,8 @@ ioc_update_pages(call_frame_t *frame, ioc_inode_t *ioc_inode,
                     page_end = trav->size;
                 }
 
-                wvcount = iov_subset(vector, count, write_offset,
-                                     write_offset + (page_end - page_offset),
-                                     &writevector);
-                if (wvcount) {
-                    pvcount = iov_subset(trav->vector, trav->count, page_offset,
-                                         page_end, &pagevector);
-                    if (pvcount) {
-                        iov_copy(&pagevector, pvcount, &writevector, wvcount);
-                    }
-                }
+                iov_range_copy(trav->vector, trav->count, page_offset, vector,
+                               count, write_offset, page_end - page_offset);
             } else if (trav) {
                 if (!trav->waitq)
                     ioc_inode->table->cache_used -= __ioc_page_destroy(trav);
diff --git a/xlators/performance/io-cache/src/page.c b/xlators/performance/io-cache/src/page.c
index 4a9679cf0ce..69b4fc0573f 100644
--- a/xlators/performance/io-cache/src/page.c
+++ b/xlators/performance/io-cache/src/page.c
@@ -727,11 +727,8 @@ __ioc_frame_fill(ioc_page_t *page, call_frame_t *frame, off_t offset,
             new->size = copy_size;
             new->iobref = iobref_ref(page->iobref);
             new->count = iov_subset(page->vector, page->count, src_offset,
-                                    src_offset + copy_size, NULL);
-
-            new->vector = GF_CALLOC(new->count, sizeof(struct iovec),
-                                    gf_ioc_mt_iovec);
-            if (new->vector == NULL) {
+                                    copy_size, &new->vector, 0);
+            if (new->count < 0) {
                 local->op_ret = -1;
                 local->op_errno = ENOMEM;
 
@@ -740,9 +737,6 @@ __ioc_frame_fill(ioc_page_t *page, call_frame_t *frame, off_t offset,
                 goto out;
             }
 
-            new->count = iov_subset(page->vector, page->count, src_offset,
-                                    src_offset + copy_size, new->vector);
-
             /* add the ioc_fill to fill_list for this frame */
             if (list_empty(&local->fill_list)) {
                 /* if list is empty, then this is the first
diff --git a/xlators/performance/read-ahead/src/page.c b/xlators/performance/read-ahead/src/page.c
index 344026352f9..8a58ad8bb7a 100644
--- a/xlators/performance/read-ahead/src/page.c
+++ b/xlators/performance/read-ahead/src/page.c
@@ -347,19 +347,15 @@ ra_frame_fill(ra_page_t *page, call_frame_t *frame)
         new->size = copy_size;
         new->iobref = iobref_ref(page->iobref);
         new->count = iov_subset(page->vector, page->count, src_offset,
-                                src_offset + copy_size, NULL);
-        new->vector = GF_CALLOC(new->count, sizeof(struct iovec),
-                                gf_ra_mt_iovec);
-        if (new->vector == NULL) {
+                                copy_size, &new->vector, 0);
+        if (new->count < 0) {
             local->op_ret = -1;
             local->op_errno = ENOMEM;
+            iobref_unref(new->iobref);
             GF_FREE(new);
             goto out;
         }
 
-        new->count = iov_subset(page->vector, page->count, src_offset,
-                                src_offset + copy_size, new->vector);
-
         new->next = fill;
         new->prev = new->next->prev;
         new->next->prev = new;
diff --git a/xlators/performance/write-behind/src/write-behind.c b/xlators/performance/write-behind/src/write-behind.c
index 70e281a3c79..aade1c9c563 100644
--- a/xlators/performance/write-behind/src/write-behind.c
+++ b/xlators/performance/write-behind/src/write-behind.c
@@ -971,8 +971,7 @@ __wb_modify_write_request(wb_request_t *req, int synced_size)
     vector = req->stub->args.vector;
     count = req->stub->args.count;
 
-    req->stub->args.count = iov_subset(vector, count, synced_size,
-                                       iov_length(vector, count), vector);
+    req->stub->args.count = iov_skip(vector, count, synced_size);
 
 out:
     return;