net: use g_clear_handle_id() for GSource cleanup
PATCH 4/8 net: use g_clear_handle_id() for GSource cleanup
Use g_clear_handle_id() instead of g_source_remove() with manual ID checking and zeroing.
This simplifies the code and ensures consistent handling of GSource IDs, since g_clear_handle_id() checks for a non-zero ID before calling the cleanup function and zeros it afterwards.
No functional change intended.
Signed-off-by Matthew Penney <[email protected]>
--- net/passt.c | 8 ++------ net/stream.c | 15 +++------------ net/stream_data.c | 10 ++-------- net/vhost-user.c | 8 ++------ 4 files changed, 9 insertions(+), 32 deletions(-)
net/passt.c +2 -6
@@ -90,10 +90,7 @@ static void net_passt_cleanup(NetClientState *nc)g_free (s->vhost_net); s->vhost_net =NULL ; } -if (s->vhost_watch) { -g_source_remove (s->vhost_watch); - s->vhost_watch =0 ; - } +g_clear_handle_id (&s->vhost_watch, g_source_remove);qemu_chr_fe_deinit (&s->vhost_chr, true);if (s->vhost_user) {vhost_user_cleanup (s->vhost_user);
@@ -421,8 +418,7 @@ static void passt_vhost_user_event(void *opaque, QEMUChrEvent event)if (s->vhost_watch) {AioContext *ctx =qemu_get_current_aio_context (); -g_source_remove (s->vhost_watch); - s->vhost_watch =0 ; +g_clear_handle_id (&s->vhost_watch, g_source_remove);qemu_chr_fe_set_handlers (&s->vhost_chr,NULL ,NULL ,NULL ,NULL ,NULL ,NULL , false);
net/stream.c +3 -12
@@ -71,24 +71,15 @@ static gboolean net_stream_send(QIOChannel *ioc,static void net_stream_cleanup (NetClientState *nc) {NetStreamState *s =DO_UPCAST (NetStreamState, data.nc, nc); -if (s->timer_tag) { -g_source_remove (s->timer_tag); - s->timer_tag =0 ; - } +g_clear_handle_id (&s->timer_tag, g_source_remove);if (s->addr) {qapi_free_SocketAddress (s->addr); s->addr =NULL ; }if (s->data.ioc) {if (QIO_CHANNEL_SOCKET (s->data.ioc)->fd !=-1 ) { -if (s->data.ioc_read_tag) { -g_source_remove (s->data.ioc_read_tag); - s->data.ioc_read_tag =0 ; - } -if (s->data.ioc_write_tag) { -g_source_remove (s->data.ioc_write_tag); - s->data.ioc_write_tag =0 ; - } +g_clear_handle_id (&s->data.ioc_read_tag, g_source_remove); +g_clear_handle_id (&s->data.ioc_write_tag, g_source_remove); }object_unref (OBJECT (s->data.ioc)); s->data.ioc =NULL ;
net/stream_data.c +2 -8
@@ -84,10 +84,7 @@ void net_stream_data_rs_finalize(SocketReadState *rs)if (qemu_send_packet_async (&d->nc, rs->buf, rs->packet_len, net_stream_data_send_completed) ==0 ) { -if (d->ioc_read_tag) { -g_source_remove (d->ioc_read_tag); - d->ioc_read_tag =0 ; - } +g_clear_handle_id (&d->ioc_read_tag, g_source_remove); } }
@@ -108,10 +105,7 @@ gboolean net_stream_data_send(QIOChannel *ioc, GIOCondition condition,/* end of connection */ eoc: d->ioc_read_tag =0 ; -if (d->ioc_write_tag) { -g_source_remove (d->ioc_write_tag); - d->ioc_write_tag =0 ; - } +g_clear_handle_id (&d->ioc_write_tag, g_source_remove);if (d->listener) {qemu_set_info_str (&d->nc,"listening" ); qio_net_listener_set_client_func(d->listener,
net/vhost-user.c +2 -6
@@ -215,10 +215,7 @@ static void net_vhost_user_cleanup(NetClientState *nc) s->vhost_net =NULL ; }if (nc->queue_index ==0 ) { -if (s->watch) { -g_source_remove (s->watch); - s->watch =0 ; - } +g_clear_handle_id (&s->watch, g_source_remove);qemu_chr_fe_deinit (&s->chr, true);if (s->vhost_user) {vhost_user_cleanup (s->vhost_user);
@@ -356,8 +353,7 @@ static void net_vhost_user_event(void *opaque, QEMUChrEvent event)if (s->watch) {AioContext *ctx =qemu_get_current_aio_context (); -g_source_remove (s->watch); - s->watch =0 ; +g_clear_handle_id (&s->watch, g_source_remove);qemu_chr_fe_set_handlers (&s->chr,NULL ,NULL ,NULL ,NULL ,NULL ,NULL , false);
Signature · 1 line
2.53.0