pxcloud/spice
5
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/spice synced 2026-01-10 06:56:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Do not check for NULL calling red_watch_remove and red_timer_remove

Browse Source 
These functions already check for NULL.
They are used mainly for cleanup, so cold path of code so speed
in case of NULL is not important (and usually should not be NULL).

Signed-off-by: Frediano Ziglio <fziglio@redhat.com>
Acked-by: Uri Lublin <uril@redhat.com>
This commit is contained in:
Frediano Ziglio 2019-11-14 11:22:36 +00:00
parent 250d4480ff
commit 0fc5af3a06
2 changed files with 24 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
server/red-channel-client.c
View File

@ -326,14 +326,11 @@ red_channel_client_finalize(GObject *object)
{
RedChannelClient *self = RED_CHANNEL_CLIENT(object);
if (self->priv->latency_monitor.timer) {
red_timer_remove(self->priv->latency_monitor.timer);
self->priv->latency_monitor.timer = NULL;
}
if (self->priv->connectivity_monitor.timer) {
red_timer_remove(self->priv->connectivity_monitor.timer);
self->priv->connectivity_monitor.timer = NULL;
}
red_timer_remove(self->priv->latency_monitor.timer);
self->priv->latency_monitor.timer = NULL;
red_timer_remove(self->priv->connectivity_monitor.timer);
self->priv->connectivity_monitor.timer = NULL;
red_stream_free(self->priv->stream);
self->priv->stream = NULL;
@ -1010,15 +1007,13 @@ bool red_channel_client_is_waiting_for_migrate_data(RedChannelClient *rcc)
void red_channel_client_default_migrate(RedChannelClient *rcc)
{
if (rcc->priv->latency_monitor.timer) {
red_channel_client_cancel_ping_timer(rcc);
red_timer_remove(rcc->priv->latency_monitor.timer);
rcc->priv->latency_monitor.timer = NULL;
}
if (rcc->priv->connectivity_monitor.timer) {
red_timer_remove(rcc->priv->connectivity_monitor.timer);
rcc->priv->connectivity_monitor.timer = NULL;
}
red_channel_client_cancel_ping_timer(rcc);
red_timer_remove(rcc->priv->latency_monitor.timer);
rcc->priv->latency_monitor.timer = NULL;
red_timer_remove(rcc->priv->connectivity_monitor.timer);
rcc->priv->connectivity_monitor.timer = NULL;
red_channel_client_pipe_add_type(rcc, RED_PIPE_ITEM_TYPE_MIGRATE);
}
@ -1724,18 +1719,16 @@ void red_channel_client_disconnect(RedChannelClient *rcc)
return;
}
red_channel_client_pipe_clear(rcc);
if (rcc->priv->stream->watch) {
red_watch_remove(rcc->priv->stream->watch);
rcc->priv->stream->watch = NULL;
}
if (rcc->priv->latency_monitor.timer) {
red_timer_remove(rcc->priv->latency_monitor.timer);
rcc->priv->latency_monitor.timer = NULL;
}
if (rcc->priv->connectivity_monitor.timer) {
red_timer_remove(rcc->priv->connectivity_monitor.timer);
rcc->priv->connectivity_monitor.timer = NULL;
}
red_watch_remove(rcc->priv->stream->watch);
rcc->priv->stream->watch = NULL;
red_timer_remove(rcc->priv->latency_monitor.timer);
rcc->priv->latency_monitor.timer = NULL;
red_timer_remove(rcc->priv->connectivity_monitor.timer);
rcc->priv->connectivity_monitor.timer = NULL;
red_channel_remove_client(channel, rcc);
red_channel_client_on_disconnect(rcc);
}

6
server/red-stream.c
View File

@ -212,10 +212,8 @@ static ssize_t stream_ssl_read_cb(RedStream *s, void *buf, size_t size)
void red_stream_remove_watch(RedStream* s)
{
if (s->watch) {
red_watch_remove(s->watch);
s->watch = NULL;
}
red_watch_remove(s->watch);
s->watch = NULL;
}
#if HAVE_SASL