mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-23 22:25:25 +00:00
src: use closefrom() for mass closing of FDs
On FreeBSD 12 the default ulimit settings allow for 100,000 open file descriptors. As a result spawning processes in libvirt is abominably slow. Fortunately FreeBSD has long since provided a good solution in the form of closefrom(), which closes all FDs equal to or larger than the specified parameter. Reviewed-by: Ján Tomko <jtomko@redhat.com> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
parent
800aed4644
commit
59afd9764d
@ -494,6 +494,60 @@ virCommandMassCloseGetFDsGeneric(virCommandPtr cmd G_GNUC_UNUSED,
|
|||||||
}
|
}
|
||||||
# endif /* !__linux__ */
|
# endif /* !__linux__ */
|
||||||
|
|
||||||
|
# ifdef __FreeBSD__
|
||||||
|
|
||||||
|
static int
|
||||||
|
virCommandMassClose(virCommandPtr cmd,
|
||||||
|
int childin,
|
||||||
|
int childout,
|
||||||
|
int childerr)
|
||||||
|
{
|
||||||
|
int lastfd = -1;
|
||||||
|
int fd = -1;
|
||||||
|
size_t i;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Two phases of closing.
|
||||||
|
*
|
||||||
|
* The first (inefficient) phase iterates over FDs,
|
||||||
|
* preserving certain FDs we need to pass down, and
|
||||||
|
* closing others. The number of iterations is bounded
|
||||||
|
* to the number of the biggest FD we need to preserve.
|
||||||
|
*
|
||||||
|
* The second (speedy) phase uses closefrom() to cull
|
||||||
|
* all remaining FDs in the process.
|
||||||
|
*
|
||||||
|
* Usually the first phase will be fairly quick only
|
||||||
|
* processing a handful of low FD numbers, and thus using
|
||||||
|
* closefrom() is a massive win for high ulimit() NFILES
|
||||||
|
* values.
|
||||||
|
*/
|
||||||
|
lastfd = MAX(lastfd, childin);
|
||||||
|
lastfd = MAX(lastfd, childout);
|
||||||
|
lastfd = MAX(lastfd, childerr);
|
||||||
|
|
||||||
|
for (i = 0; i < cmd->npassfd; i++)
|
||||||
|
lastfd = MAX(lastfd, cmd->passfd[i].fd);
|
||||||
|
|
||||||
|
for (fd = 0; fd <= lastfd; fd++) {
|
||||||
|
if (fd == childin || fd == childout || fd == childerr)
|
||||||
|
continue;
|
||||||
|
if (!virCommandFDIsSet(cmd, fd)) {
|
||||||
|
int tmpfd = fd;
|
||||||
|
VIR_MASS_CLOSE(tmpfd);
|
||||||
|
} else if (virSetInherit(fd, true) < 0) {
|
||||||
|
virReportSystemError(errno, _("failed to preserve fd %d"), fd);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
closefrom(lastfd + 1);
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
# else /* ! __FreeBSD__ */
|
||||||
|
|
||||||
static int
|
static int
|
||||||
virCommandMassClose(virCommandPtr cmd,
|
virCommandMassClose(virCommandPtr cmd,
|
||||||
int childin,
|
int childin,
|
||||||
@ -544,6 +598,7 @@ virCommandMassClose(virCommandPtr cmd,
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# endif /* ! __FreeBSD__ */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* virExec:
|
* virExec:
|
||||||
|
Loading…
Reference in New Issue
Block a user