pxcloud/spice
6
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/spice synced 2026-08-12 21:44:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

reds: Make mig_wait_disconnect_clients a std::forward_list

Browse Source 
In the meanwhile remove a leak on the program.

Signed-off-by: Frediano Ziglio <fziglio@redhat.com>
This commit is contained in:
Frediano Ziglio 2020-03-07 10:01:42 +00:00 committed by Frediano Ziglio
parent 9dcf937767
commit b28db35af5
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/reds-private.h
View File

@ -91,7 +91,8 @@ struct RedsState {
int mig_wait_connect; /* src waits for clients to establish connection to dest
(before migration starts) */
int mig_wait_disconnect; /* src waits for clients to disconnect (after migration completes) */
GList *mig_wait_disconnect_clients;/* List of RedsMigWaitDisconnectClient. Holds the clients
std::forward_list<RedClient*, red::Mallocator<RedClient*>>
mig_wait_disconnect_clients;/* List of RedsMigWaitDisconnectClient. Holds the clients
which the src waits for their disconnection */

12
server/reds.cpp
View File

@ -2988,7 +2988,7 @@ static void reds_mig_fill_wait_disconnect(RedsState *reds)
/* tracking the clients, in order to ignore disconnection
* of clients that got connected to the src after migration completion.*/
for (auto client: reds->clients) {
reds->mig_wait_disconnect_clients = g_list_append(reds->mig_wait_disconnect_clients, client);
reds->mig_wait_disconnect_clients.push_front(client);
}
reds->mig_wait_connect = FALSE;
reds->mig_wait_disconnect = TRUE;
@ -2997,16 +2997,17 @@ static void reds_mig_fill_wait_disconnect(RedsState *reds)
static void reds_mig_cleanup_wait_disconnect(RedsState *reds)
{
g_list_free(reds->mig_wait_disconnect_clients);
reds->mig_wait_disconnect_clients.clear();
reds->mig_wait_disconnect = FALSE;
}
static void reds_mig_remove_wait_disconnect_client(RedsState *reds, RedClient *client)
{
g_warn_if_fail(g_list_find(reds->mig_wait_disconnect_clients, client) != NULL);
auto &clients(reds->mig_wait_disconnect_clients);
g_warn_if_fail(std::find(clients.begin(), clients.end(), client) != clients.end());
reds->mig_wait_disconnect_clients = g_list_remove(reds->mig_wait_disconnect_clients, client);
if (reds->mig_wait_disconnect_clients == NULL) {
clients.remove(client);
if (clients.empty()) {
reds_mig_cleanup(reds);
}
}
@ -3428,7 +3429,6 @@ static int do_spice_init(RedsState *reds, SpiceCoreInterface *core_interface)
reds_update_agent_properties(reds);
reds->main_dispatcher = new MainDispatcher(reds);
reds->mig_target_clients = NULL;
reds->mig_wait_disconnect_clients = NULL;
reds->vm_running = TRUE; /* for backward compatibility */
if (!(reds->mig_timer = reds->core.timer_new(migrate_timeout, reds))) {