/*
* Amanda, The Advanced Maryland Automatic Network Disk Archiver
- * Copyright (c) 2008, 2009, 2010 Zmanda, Inc. All Rights Reserved.
+ * Copyright (c) 2008-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
* Sunnyvale, CA 94085, USA, or: http://www.zmanda.com
*/
-#include "amxfer.h"
#include "amanda.h"
+#include "amxfer.h"
/* parent class for XferElement */
static GObjectClass *parent_class = NULL;
xe->output_mech = XFER_MECH_NONE;
xe->input_mech = XFER_MECH_NONE;
xe->upstream = xe->downstream = NULL;
- xe->input_fd = xe->output_fd = -1;
+ xe->_input_fd = xe->_output_fd = -1;
xe->repr = NULL;
}
return TRUE; /* success */
}
+static gboolean
+xfer_element_set_size_impl(
+ XferElement *elt G_GNUC_UNUSED,
+ gint64 size G_GNUC_UNUSED)
+{
+ elt->size = size;
+
+ return TRUE; /* success */
+}
+
static gboolean
xfer_element_start_impl(
XferElement *elt G_GNUC_UNUSED)
GObject * obj_self)
{
XferElement *elt = XFER_ELEMENT(obj_self);
+ gint fd;
/* free the repr cache */
if (elt->repr) g_free(elt->repr);
+ /* close up the input/output file descriptors, being careful to do so
+ * atomically, and making any errors doing so into mere warnings */
+ fd = xfer_element_swap_input_fd(elt, -1);
+ if (fd != -1 && close(fd) != 0)
+ g_warning("error closing fd %d: %s", fd, strerror(errno));
+ fd = xfer_element_swap_output_fd(elt, -1);
+ if (fd != -1 && close(fd) != 0)
+ g_warning("error closing fd %d: %s", fd, strerror(errno));
+
/* chain up */
G_OBJECT_CLASS(parent_class)->finalize(obj_self);
}
klass->repr = xfer_element_repr_impl;
klass->setup = xfer_element_setup_impl;
+ klass->set_size = xfer_element_set_size_impl;
klass->start = xfer_element_start_impl;
klass->cancel = xfer_element_cancel_impl;
klass->pull_buffer = xfer_element_pull_buffer_impl;
return XFER_ELEMENT_GET_CLASS(elt)->setup(elt);
}
+gboolean
+xfer_element_set_size(
+ XferElement *elt,
+ gint64 size)
+{
+ return XFER_ELEMENT_GET_CLASS(elt)->set_size(elt, size);
+}
+
gboolean
xfer_element_start(
XferElement *elt)
XferElement *elt,
size_t *size)
{
+ xfer_status status;
/* Make sure that the xfer is running before calling upstream's
* pull_buffer method; this avoids a race condition where upstream
* hasn't finished its xfer_element_start yet, and isn't ready for
* a pull */
- if (elt->xfer->status == XFER_START)
+ g_mutex_lock(elt->xfer->status_mutex);
+ status = elt->xfer->status;
+ g_mutex_unlock(elt->xfer->status_mutex);
+ if (status == XFER_START)
wait_until_xfer_running(elt->xfer);
return XFER_ELEMENT_GET_CLASS(elt)->pull_buffer(elt, size);
*/
void
-xfer_element_drain_by_pulling(
+xfer_element_drain_buffers(
XferElement *upstream)
{
gpointer buf;
}
void
-xfer_element_drain_by_reading(
+xfer_element_drain_fd(
int fd)
{
size_t len;