Merge tag 'upstream/3.3.2'

[debian/amanda] / perl / Amanda / XferServer.swg

diff --git a/perl/Amanda/XferServer.swg b/perl/Amanda/XferServer.swg
index 22b98a0bd2e95753ea5370e4797201644a132715..4f25a21926ff54440569c77409933601f70f68af 100644 (file)
--- a/perl/Amanda/XferServer.swg
+++ b/perl/Amanda/XferServer.swg
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2010 Zmanda, Inc.  All Rights Reserved.
+ * Copyright (c) 2009-2012 Zmanda, Inc.  All Rights Reserved.
  *
  * 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
@@ -41,14 +41,24 @@ XferElement *xfer_source_device(
 %newobject xfer_dest_device;
 XferElement *xfer_dest_device(
     Device *device,
-    size_t max_memory);
+    gboolean cancel_at_leom);
 
 %newobject xfer_source_holding;
 XferElement * xfer_source_holding(
     const char *filename);
 
+guint64 xfer_source_holding_get_bytes_read(
+    XferElement *self);
+
 %newobject xfer_dest_taper_splitter;
 XferElement *xfer_dest_taper_splitter(
+    Device *first_device,
+    size_t max_memory,
+    guint64 part_size,
+    gboolean expect_cache_inform);
+
+%newobject xfer_dest_taper_cacher;
+XferElement *xfer_dest_taper_cacher(
     Device *first_device,
     size_t max_memory,
     guint64 part_size,
@@ -89,6 +99,10 @@ void xfer_source_recovery_use_device(
     XferElement *self,
     Device *device);
 
+guint64 xfer_source_recovery_get_bytes_read(
+    XferElement *self);
+
+
 /* ---- */
 
 PACKAGE(Amanda::Xfer::Source::Device)
@@ -106,6 +120,7 @@ DECLARE_CONSTRUCTOR(Amanda::XferServer::xfer_dest_device)
 PACKAGE(Amanda::Xfer::Source::Holding)
 XFER_ELEMENT_SUBCLASS()
 DECLARE_CONSTRUCTOR(Amanda::XferServer::xfer_source_holding)
+DECLARE_METHOD(get_bytes_read, Amanda::XferServer::xfer_source_holding_get_bytes_read)
 
 /* ---- */
 
@@ -124,6 +139,12 @@ DECLARE_CONSTRUCTOR(Amanda::XferServer::xfer_dest_taper_splitter)
 
 /* ---- */
 
+PACKAGE(Amanda::Xfer::Dest::Taper::Cacher)
+XFER_ELEMENT_SUBCLASS_OF(Amanda::Xfer::Dest::Taper)
+DECLARE_CONSTRUCTOR(Amanda::XferServer::xfer_dest_taper_cacher)
+
+/* ---- */
+
 PACKAGE(Amanda::Xfer::Dest::Taper::DirectTCP)
 XFER_ELEMENT_SUBCLASS_OF(Amanda::Xfer::Dest::Taper)
 DECLARE_CONSTRUCTOR(Amanda::XferServer::xfer_dest_taper_directtcp)
@@ -135,3 +156,5 @@ XFER_ELEMENT_SUBCLASS()
 DECLARE_CONSTRUCTOR(Amanda::XferServer::xfer_source_recovery)
 DECLARE_METHOD(start_part, Amanda::XferServer::xfer_source_recovery_start_part)
 DECLARE_METHOD(use_device, Amanda::XferServer::xfer_source_recovery_use_device)
+DECLARE_METHOD(get_bytes_read, Amanda::XferServer::xfer_source_recovery_get_bytes_read)
+