/* timer for the duration; NULL while paused or cancelled */
GTimer *part_timer;
+
+ gint64 size;
} XferSourceRecovery;
/*
arglist_start(argp, fmt);
g_vsnprintf(msg, sizeof(msg), fmt, argp);
arglist_end(argp);
- g_debug("XSR thd-%p: %s", g_thread_self(), msg);
+ g_debug("XSR: %s", msg);
}
/*
_("error reading from %s: %s"),
self->device->device_name,
device_error_or_status(self->device));
+ g_mutex_unlock(self->start_part_mutex);
wait_until_xfer_cancelled(elt->xfer);
- goto error;
+ goto error_unlocked;
}
/* the device has signalled EOF (really end-of-part), so clean up instance
g_mutex_unlock(self->start_part_mutex);
+ if (elt->size > 0) {
+ /* initialize on first pass */
+ if (self->size == 0)
+ self->size = elt->size;
+
+ if (self->size == -1) {
+ *size = 0;
+ amfree(buf);
+ return NULL;
+ }
+
+ if (*size > (guint64)self->size) {
+ /* return only self->size bytes */
+ *size = self->size;
+ self->size = -1;
+ } else {
+ self->size -= *size;
+ }
+ }
+
return buf;
error:
g_mutex_unlock(self->start_part_mutex);
+error_unlocked:
*size = 0;
return NULL;
}