Merge branch 'master' into squeeze

[debian/amanda] / xfer-src / source-pattern.c

diff --git a/xfer-src/source-pattern.c b/xfer-src/source-pattern.c
index dccf087cfa0290826c549d467d2128eb95698065..5a4aad836625c593341876f951845439898b757f 100644 (file)
--- a/xfer-src/source-pattern.c
+++ b/xfer-src/source-pattern.c
@@ -1,24 +1,26 @@
 /*
  * Amanda, The Advanced Maryland Automatic Network Disk Archiver
- * Copyright (c) 2008 Zmanda Inc.
+ * Copyright (c) 2008, 2009, 2011 Zmanda, Inc.  All Rights Reserved.
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
  *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * for more details.
  *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ *
+ * Contact information: Zmanda Inc., 465 S. Mathilda Ave., Suite 300
+ * Sunnyvale, CA 94085, USA, or: http://www.zmanda.com
  */
 
-#include "amxfer.h"
 #include "amanda.h"
+#include "amxfer.h"
 #include "simpleprng.h"
 
 /*
@@ -64,6 +66,41 @@ typedef struct {
  * Implementation
  */
 
+/*
+ * Utility function to fill a buffer buf of size len with the pattern defined
+ * for this instance. We start each copying from the offset where we left the
+ * previous one.
+ *
+ * Note that performance is important: amtapetype uses this very source and
+ * source-random.c to determine whether a tape device uses compression, and
+ * expects the two to run about the same speed.  This is why this is a byte
+ * loop and does not use mempcy() and friends: the random source is also byte
+ * per byte.
+ */
+
+static void fill_buffer_with_pattern(XferSourcePattern *self, char *buf,
+    size_t len)
+{
+    char *src = self->pattern, *dst = buf;
+    size_t plen = self->pattern_buffer_length, offset = self->current_offset;
+    size_t pos = 0;
+
+    src += offset;
+
+    while (pos < len) {
+        *dst++ = *src++;
+        pos++, offset++;
+
+        if (G_LIKELY(offset < plen))
+            continue;
+
+        offset = 0;
+        src = self->pattern;
+    }
+
+    self->current_offset = offset;
+}
+
 static gpointer
 pull_buffer_impl(
     XferElement *elt,
@@ -71,12 +108,9 @@ pull_buffer_impl(
 {
     XferSourcePattern *self = (XferSourcePattern *)elt;
     char *rval;
-    char *s, *d;
-    size_t l;
-    size_t offset;
 
     /* indicate EOF on an cancel */
-    if (elt->cancelled || (self->limited_length && self->length == 0)) {
+    if (elt->cancelled) {
        *size = 0;
        return NULL;
     }
@@ -95,17 +129,7 @@ pull_buffer_impl(
 
     rval = malloc(*size);
 
-    /* fill the buffer "manually", instead of using fancy memcpy techniques, so
-     * that this runs at about the same speed as the random source */
-    l = *size;
-    s = self->pattern;
-    offset = self->current_offset;
-    d = rval;
-    while (l--) {
-       *(d++) = *(s + offset++);
-       if (offset > self->pattern_buffer_length) offset = 0;
-    }
-    self->current_offset = offset;
+    fill_buffer_with_pattern(self, rval, *size);
 
     return rval;
 }
@@ -123,8 +147,8 @@ class_init(
 {
     XferElementClass *klass = XFER_ELEMENT_CLASS(selfc);
     static xfer_element_mech_pair_t mech_pairs[] = {
-       { XFER_MECH_NONE, XFER_MECH_PULL_BUFFER, 1, 0},
-       { XFER_MECH_NONE, XFER_MECH_NONE, 0, 0},
+       { XFER_MECH_NONE, XFER_MECH_PULL_BUFFER, XFER_NROPS(1), XFER_NTHREADS(0) },
+       { XFER_MECH_NONE, XFER_MECH_NONE, XFER_NROPS(0), XFER_NTHREADS(0) },
     };
 
     klass->pull_buffer = pull_buffer_impl;