summaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@gmail.com>2013-09-17 16:36:29 +0200
committerFrediano Ziglio <fziglio@redhat.com>2015-11-19 12:43:33 +0000
commit1cbf6b3ab69a1e789ebb52c146d46f637a290e1f (patch)
tree506f4e669f7486da59a766c64a43e2ae8d5193cd /server
parent0e224d04fbd9a05a3289b19c32e9a8fd4afca086 (diff)
downloadspice-1cbf6b3ab69a1e789ebb52c146d46f637a290e1f.tar.gz
spice-1cbf6b3ab69a1e789ebb52c146d46f637a290e1f.tar.xz
spice-1cbf6b3ab69a1e789ebb52c146d46f637a290e1f.zip
worker: move display_channel_wait_for_migrate_data
Acked-by: Fabiano Fidêncio <fidencio@redhat.com>
Diffstat (limited to 'server')
-rw-r--r--server/display-channel.c31
-rw-r--r--server/display-channel.h1
-rw-r--r--server/red_worker.c31
3 files changed, 32 insertions, 31 deletions
diff --git a/server/display-channel.c b/server/display-channel.c
index 9990c710..37ba5c31 100644
--- a/server/display-channel.c
+++ b/server/display-channel.c
@@ -807,3 +807,34 @@ int display_channel_add_drawable(DisplayChannel *display, Drawable *drawable)
return ret;
}
+
+int display_channel_wait_for_migrate_data(DisplayChannel *display)
+{
+ uint64_t end_time = red_get_monotonic_time() + DISPLAY_CLIENT_MIGRATE_DATA_TIMEOUT;
+ RedChannel *channel = &display->common.base;
+ RedChannelClient *rcc;
+
+ spice_debug(NULL);
+ spice_assert(channel->clients_num == 1);
+
+ rcc = SPICE_CONTAINEROF(ring_get_head(&channel->clients), RedChannelClient, channel_link);
+ spice_assert(red_channel_client_waits_for_migrate_data(rcc));
+
+ for (;;) {
+ red_channel_client_receive(rcc);
+ if (!red_channel_client_is_connected(rcc)) {
+ break;
+ }
+
+ if (!red_channel_client_waits_for_migrate_data(rcc)) {
+ return TRUE;
+ }
+ if (red_get_monotonic_time() > end_time) {
+ spice_warning("timeout");
+ red_channel_client_disconnect(rcc);
+ break;
+ }
+ usleep(DISPLAY_CLIENT_RETRY_INTERVAL);
+ }
+ return FALSE;
+}
diff --git a/server/display-channel.h b/server/display-channel.h
index 8c53aefe..69ceb3c3 100644
--- a/server/display-channel.h
+++ b/server/display-channel.h
@@ -268,6 +268,7 @@ int display_channel_add_drawable (DisplayCha
Drawable *drawable);
void display_channel_current_flush (DisplayChannel *display,
int surface_id);
+int display_channel_wait_for_migrate_data (DisplayChannel *display);
static inline int is_equal_path(SpicePath *path1, SpicePath *path2)
{
diff --git a/server/red_worker.c b/server/red_worker.c
index a6e6b6a5..32612d50 100644
--- a/server/red_worker.c
+++ b/server/red_worker.c
@@ -6911,37 +6911,6 @@ static void handle_dev_stop(void *opaque, void *payload)
}
}
-static int display_channel_wait_for_migrate_data(DisplayChannel *display)
-{
- uint64_t end_time = red_get_monotonic_time() + DISPLAY_CLIENT_MIGRATE_DATA_TIMEOUT;
- RedChannel *channel = &display->common.base;
- RedChannelClient *rcc;
-
- spice_debug(NULL);
- spice_assert(channel->clients_num == 1);
-
- rcc = SPICE_CONTAINEROF(ring_get_head(&channel->clients), RedChannelClient, channel_link);
- spice_assert(red_channel_client_waits_for_migrate_data(rcc));
-
- for (;;) {
- red_channel_client_receive(rcc);
- if (!red_channel_client_is_connected(rcc)) {
- break;
- }
-
- if (!red_channel_client_waits_for_migrate_data(rcc)) {
- return TRUE;
- }
- if (red_get_monotonic_time() > end_time) {
- spice_warning("timeout");
- red_channel_client_disconnect(rcc);
- break;
- }
- usleep(DISPLAY_CLIENT_RETRY_INTERVAL);
- }
- return FALSE;
-}
-
static void handle_dev_start(void *opaque, void *payload)
{
RedWorker *worker = opaque;