Просмотр исходного кода

Close sockets after deleting from poll

This will remove (non critical) debug message from QB about polling on
closed FD.

Signed-off-by: Jan Friesse <jfriesse@redhat.com>
Reviewed-by: Fabio M. Di Nitto <fdinitto@redhat.com>
Jan Friesse 13 лет назад
Родитель
Сommit
8014b2facf
2 измененных файлов с 6 добавлено и 6 удалено
  1. 4 4
      exec/totemudp.c
  2. 2 2
      exec/totemudpu.c

+ 4 - 4
exec/totemudp.c

@@ -374,17 +374,17 @@ int totemudp_finalize (
 	int res = 0;
 
 	if (instance->totemudp_sockets.mcast_recv > 0) {
-		close (instance->totemudp_sockets.mcast_recv);
 	 	qb_loop_poll_del (instance->totemudp_poll_handle,
 			instance->totemudp_sockets.mcast_recv);
+		close (instance->totemudp_sockets.mcast_recv);
 	}
 	if (instance->totemudp_sockets.mcast_send > 0) {
 		close (instance->totemudp_sockets.mcast_send);
 	}
 	if (instance->totemudp_sockets.token > 0) {
-		close (instance->totemudp_sockets.token);
 		qb_loop_poll_del (instance->totemudp_poll_handle,
 			instance->totemudp_sockets.token);
+		close (instance->totemudp_sockets.token);
 	}
 
 	return (res);
@@ -533,17 +533,17 @@ static void timer_function_netif_check_timeout (
 	}
 
 	if (instance->totemudp_sockets.mcast_recv > 0) {
-		close (instance->totemudp_sockets.mcast_recv);
 	 	qb_loop_poll_del (instance->totemudp_poll_handle,
 			instance->totemudp_sockets.mcast_recv);
+		close (instance->totemudp_sockets.mcast_recv);
 	}
 	if (instance->totemudp_sockets.mcast_send > 0) {
 		close (instance->totemudp_sockets.mcast_send);
 	}
 	if (instance->totemudp_sockets.token > 0) {
-		close (instance->totemudp_sockets.token);
 		qb_loop_poll_del (instance->totemudp_poll_handle,
 			instance->totemudp_sockets.token);
+		close (instance->totemudp_sockets.token);
 	}
 
 	if (interface_up == 0) {

+ 2 - 2
exec/totemudpu.c

@@ -377,9 +377,9 @@ int totemudpu_finalize (
 	int res = 0;
 
 	if (instance->token_socket > 0) {
-		close (instance->token_socket);
 		qb_loop_poll_del (instance->totemudpu_poll_handle,
 			instance->token_socket);
+		close (instance->token_socket);
 	}
 
 	return (res);
@@ -510,9 +510,9 @@ static void timer_function_netif_check_timeout (
 	}
 
 	if (instance->token_socket > 0) {
-		close (instance->token_socket);
 		qb_loop_poll_del (instance->totemudpu_poll_handle,
 			instance->token_socket);
+		close (instance->token_socket);
 	}
 
 	if (interface_up == 0) {