fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-03 10:08:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

libnm: avoid sleep in nm_vpn_service_plugin_read_vpn_details()

Browse source 
Polling with sleep() is really ugly. Use poll() instead.
This commit is contained in:
Thomas Haller 2021-05-25 14:23:10 +02:00
parent ddf1942bfb
commit 1338a2ef96
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/libnm-client-impl/nm-vpn-service-plugin.c
View file

@ -10,6 +10,7 @@
#include <signal.h>
#include <stdlib.h>
#include <poll.h>
#include "libnm-glib-aux/nm-secret-utils.h"
#include "libnm-glib-aux/nm-dbus-aux.h"
@ -779,8 +780,18 @@ nm_vpn_service_plugin_read_vpn_details(int fd, GHashTable **out_data, GHashTable
nr = read(fd, &c, 1);
if (nr < 0) {
if (errno == EAGAIN) {
g_usleep(100);
continue;
struct pollfd pfd;
int r;
memset(&pfd, 0, sizeof(pfd));
pfd.fd = fd;
pfd.events = POLLIN;
r = poll(&pfd, 1, -1);
if (r > 0)
continue;
/* error or timeout. Fall through and break. */
}
break;
}