From 1cbf6b3ab69a1e789ebb52c146d46f637a290e1f Mon Sep 17 00:00:00 2001 From: Marc-AndrĂ© Lureau Date: Tue, 17 Sep 2013 16:36:29 +0200 Subject: worker: move display_channel_wait_for_migrate_data MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Acked-by: Fabiano FidĂȘncio --- server/red_worker.c | 31 ------------------------------- 1 file changed, 31 deletions(-) (limited to 'server/red_worker.c') 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; -- cgit