External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-24 06:53:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

ch: support poll with -1 in chSocketRecv

Browse Source 
chSocketRecv fn can be used by operations such as restore, which cannot
have a specific poll timeout. The runtime of these operations at server
side (vmm) cannot be determined or capped as it depends on the guest
configuration. Hence, add a new parameter 'use_timeout' which when set
will pass -1 as timeout to poll, otherwise the default PKT_TIMEOUT_MS is
used.

Signed-off-by: Purna Pavan Chandra <paekkaladevi@linux.microsoft.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Purna Pavan Chandra 2024-08-05 14:40:56 +00:00 committed by Michal Privoznik
parent ea271081dd
commit 4919f3a120
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/ch/ch_process.c
View File

@ -535,11 +535,12 @@ chMonitorSocketConnect(virCHMonitor *mon)
#define PKT_TIMEOUT_MS 500 /* ms */
static char *
chSocketRecv(int sock)
chSocketRecv(int sock, bool use_timeout)
{
struct pollfd pfds[1];
char *buf = NULL;
size_t buf_len = 1024;
int timeout = PKT_TIMEOUT_MS;
int ret;
buf = g_new0(char, buf_len);
@ -547,8 +548,11 @@ chSocketRecv(int sock)
pfds[0].fd = sock;
pfds[0].events = POLLIN;
if (!use_timeout)
timeout = -1;
do {
ret = poll(pfds, G_N_ELEMENTS(pfds), PKT_TIMEOUT_MS);
ret = poll(pfds, G_N_ELEMENTS(pfds), timeout);
} while (ret < 0 && errno == EINTR);
if (ret <= 0) {
@ -575,12 +579,12 @@ chSocketRecv(int sock)
#undef PKT_TIMEOUT_MS
static int
chSocketProcessHttpResponse(int sock)
chSocketProcessHttpResponse(int sock, bool use_poll_timeout)
{
g_autofree char *response = NULL;
int http_res;
response = chSocketRecv(sock);
response = chSocketRecv(sock, use_poll_timeout);
if (response == NULL) {
return -1;
}
@ -706,7 +710,7 @@ chProcessAddNetworkDevices(virCHDriver *driver,
return -1;
}
if (chSocketProcessHttpResponse(mon_sockfd) < 0)
if (chSocketProcessHttpResponse(mon_sockfd, true) < 0)
return -1;
}