From f6072e678ea5e4f81a7f684ff4c69a8b926f7f3c Mon Sep 17 00:00:00 2001 From: Victor Toso Date: Thu, 23 Jun 2016 14:27:09 +0200 Subject: [PATCH] file-xfer: move debug to SpiceFileTransferTask This debug information is simple way to check that the file-transfer is not stalled. Now that we are using the read-async functions, we can move this debug info there and avoid accessing object internals in channel-main.c Acked-by: Jonathon Jongsma --- src/channel-main.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/channel-main.c b/src/channel-main.c index c5722f3..31b01a3 100644 --- a/src/channel-main.c +++ b/src/channel-main.c @@ -1892,19 +1892,6 @@ static void file_xfer_data_flushed_cb(GObject *source_object, file_transfer_operation_send_progress(self); - if (spice_util_get_debug()) { - const GTimeSpan interval = 20 * G_TIME_SPAN_SECOND; - gint64 now = g_get_monotonic_time(); - - if (interval < now - self->last_update) { - gchar *basename = g_file_get_basename(self->file); - self->last_update = now; - SPICE_DEBUG("transferred %.2f%% of the file %s", - 100.0 * self->read_bytes / self->file_size, basename); - g_free(basename); - } - } - /* Read more data */ spice_file_transfer_task_read_async(self, file_xfer_read_async_cb, NULL); } @@ -3505,6 +3492,19 @@ static void spice_file_transfer_task_read_stream_cb(GObject *source_object, self->read_bytes += nbytes; + if (spice_util_get_debug()) { + const GTimeSpan interval = 20 * G_TIME_SPAN_SECOND; + gint64 now = g_get_monotonic_time(); + + if (interval < now - self->last_update) { + gchar *basename = g_file_get_basename(self->file); + self->last_update = now; + SPICE_DEBUG("transferred %.2f%% of the file %s", + 100.0 * self->read_bytes / self->file_size, basename); + g_free(basename); + } + } + g_task_return_int(task, nbytes); }