X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=device-src%2Fxfer-dest-taper-cacher.c;h=faf8309a0ca21768ad3fd4a969b9c259325c7d6e;hb=HEAD;hp=99b91d4fe05faf7754c06751229826385da1c380;hpb=b116e9366c7b2ea2c2eb53b0a13df4090e176235;p=debian%2Famanda

diff --git a/device-src/xfer-dest-taper-cacher.c b/device-src/xfer-dest-taper-cacher.c
index 99b91d4..faf8309 100644
--- a/device-src/xfer-dest-taper-cacher.c
+++ b/device-src/xfer-dest-taper-cacher.c
@@ -1,10 +1,11 @@
 /*
  * Amanda, The Advanced Maryland Automatic Network Disk Archiver
- * 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
- * by the Free Software Foundation.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
@@ -270,7 +271,7 @@ _xdt_dbg(const char *fmt, ...)
     arglist_start(argp, fmt);
     g_vsnprintf(msg, sizeof(msg), fmt, argp);
     arglist_end(argp);
-    g_debug("XDT thd-%p: %s", g_thread_self(), msg);
+    g_debug("XDT: %s", msg);
 }
 
 /*
@@ -327,9 +328,9 @@ alloc_slab(
 	rv->refcount = 1;
 	rv->base = g_try_malloc(self->slab_size);
 	if (!rv->base) {
-	    g_free(rv);
 	    xfer_cancel_with_error(XFER_ELEMENT(self),
-		_("Could not allocate %zu bytes of memory"), self->slab_size);
+		_("Could not allocate %zu bytes of memory: %s"), self->slab_size, strerror(errno));
+	    g_free(rv);
 	    return NULL;
 	}
     }
@@ -878,16 +879,20 @@ device_thread_write_part(
 {
     GTimer *timer = g_timer_new();
     XMsg *msg;
-    slab_source_state src_state;
+    slab_source_state src_state = {0, 0};
     guint64 serial, stop_serial;
     gboolean eof = FALSE;
     int fileno = 0;
+    int failed = 0;
+    int slab_source_set = 0;
 
     self->last_part_successful = FALSE;
     self->bytes_written = 0;
 
-    if (!device_start_file(self->device, self->part_header))
+    if (!device_start_file(self->device, self->part_header)) {
+	failed = 1;
 	goto part_done;
+    }
 
     dumpfile_free(self->part_header);
     self->part_header = NULL;
@@ -897,6 +902,7 @@ device_thread_write_part(
 
     if (!slab_source_setup(self, &src_state))
 	goto part_done;
+    slab_source_set = 1;
 
     g_timer_start(timer);
 
@@ -906,13 +912,17 @@ device_thread_write_part(
 	Slab *slab = slab_source_get(self, &src_state, serial);
 	DBG(8, "writing slab %p (serial %ju) to device", slab, serial);
 	g_mutex_unlock(self->slab_mutex);
-	if (!slab)
+	if (!slab) {
+	    failed = 1;
 	    goto part_done;
+	}
 
 	eof = slab->size < self->slab_size;
 
-	if (!write_slab_to_device(self, slab))
+	if (!write_slab_to_device(self, slab)) {
+	    failed = 1;
 	    goto part_done;
+	}
 
 	g_mutex_lock(self->slab_mutex);
 	DBG(8, "wrote slab %p to device", slab);
@@ -924,18 +934,22 @@ device_thread_write_part(
     }
     g_mutex_unlock(self->slab_mutex);
 
+part_done:
     /* if we write all of the blocks, but the finish_file fails, then likely
      * there was some buffering going on in the device driver, and the blocks
      * did not all make it to permanent storage -- so it's a failed part. */
-    if (!device_finish_file(self->device))
-	goto part_done;
+    if (self->device->in_file && !device_finish_file(self->device))
+	failed = 1;
 
-    slab_source_free(self, &src_state);
+    if (slab_source_set) {
+	slab_source_free(self, &src_state);
+    }
 
-    self->last_part_successful = TRUE;
-    self->no_more_parts = eof;
+    if (!failed) {
+	self->last_part_successful = TRUE;
+	self->no_more_parts = eof;
+    }
 
-part_done:
     g_timer_stop(timer);
 
     msg = xmsg_new(XFER_ELEMENT(self), XMSG_PART_DONE, 0);
@@ -1211,15 +1225,15 @@ cancel_impl(
 
     /* then signal all of our condition variables, so that threads waiting on them
      * wake up and see elt->cancelled. */
-    g_mutex_lock(self->state_mutex);
-    g_cond_broadcast(self->state_cond);
-    g_mutex_unlock(self->state_mutex);
-
     g_mutex_lock(self->slab_mutex);
     g_cond_broadcast(self->slab_cond);
     g_cond_broadcast(self->slab_free_cond);
     g_mutex_unlock(self->slab_mutex);
 
+    g_mutex_lock(self->state_mutex);
+    g_cond_broadcast(self->state_cond);
+    g_mutex_unlock(self->state_mutex);
+
     return rv;
 }
 
@@ -1315,7 +1329,12 @@ get_part_bytes_written_impl(
     /* NOTE: this access is unsafe and may return inconsistent results (e.g, a
      * partial write to the 64-bit value on a 32-bit system).  This is ok for
      * the moment, as it's only informational, but be warned. */
-    return self->bytes_written + self->slab_bytes_written;
+    if (self->device) {
+	return device_get_bytes_written(self->device);
+    } else {
+	return self->bytes_written + self->slab_bytes_written;
+    }
+
 }
 
 static void