mirror of
git://git.gnupg.org/gnupg.git
synced 2025-01-21 14:47:03 +01:00
common: Speedup closing fds before an exec.
* common/exechelp-posix.c [__linux__]: Include dirent.h. (get_max_fds) [__linux__]: Return the actual used highest fd. -- Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
parent
ad75ca9c96
commit
512c56af43
@ -67,6 +67,11 @@
|
|||||||
# include <sys/stat.h>
|
# include <sys/stat.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if __linux__
|
||||||
|
# include <sys/types.h>
|
||||||
|
# include <dirent.h>
|
||||||
|
#endif /*__linux__ */
|
||||||
|
|
||||||
#include "util.h"
|
#include "util.h"
|
||||||
#include "i18n.h"
|
#include "i18n.h"
|
||||||
#include "sysutils.h"
|
#include "sysutils.h"
|
||||||
@ -97,6 +102,45 @@ get_max_fds (void)
|
|||||||
#ifdef HAVE_GETRLIMIT
|
#ifdef HAVE_GETRLIMIT
|
||||||
struct rlimit rl;
|
struct rlimit rl;
|
||||||
|
|
||||||
|
/* Under Linux we can figure out the highest used file descriptor by
|
||||||
|
* reading /proc/PID/fd. This is in the common cases much fast than
|
||||||
|
* for example doing 4096 close calls where almost all of them will
|
||||||
|
* fail. On a system with a limit of 4096 files and only 8 files
|
||||||
|
* open with the highest number being 10, we speedup close_all_fds
|
||||||
|
* from 125ms to 0.4ms including readdir.
|
||||||
|
*
|
||||||
|
* Another option would be to close the file descriptors as returned
|
||||||
|
* from reading that directory - however then we need to snapshot
|
||||||
|
* that list before starting to close them. */
|
||||||
|
#ifdef __linux__
|
||||||
|
{
|
||||||
|
char dirname[50];
|
||||||
|
DIR *dir = NULL;
|
||||||
|
struct dirent *dir_entry;
|
||||||
|
const char *s;
|
||||||
|
int x;
|
||||||
|
|
||||||
|
snprintf (dirname, sizeof dirname, "/proc/%u/fd", (unsigned int)getpid ());
|
||||||
|
dir = opendir (dirname);
|
||||||
|
if (dir)
|
||||||
|
{
|
||||||
|
while ((dir_entry = readdir (dir)))
|
||||||
|
{
|
||||||
|
s = dir_entry->d_name;
|
||||||
|
if ( *s < '0' || *s > '9')
|
||||||
|
continue;
|
||||||
|
x = atoi (s);
|
||||||
|
if (x > max_fds)
|
||||||
|
max_fds = x;
|
||||||
|
}
|
||||||
|
closedir (dir);
|
||||||
|
}
|
||||||
|
if (max_fds != -1)
|
||||||
|
return max_fds + 1;
|
||||||
|
}
|
||||||
|
#endif /* __linux__ */
|
||||||
|
|
||||||
|
|
||||||
# ifdef RLIMIT_NOFILE
|
# ifdef RLIMIT_NOFILE
|
||||||
if (!getrlimit (RLIMIT_NOFILE, &rl))
|
if (!getrlimit (RLIMIT_NOFILE, &rl))
|
||||||
max_fds = rl.rlim_max;
|
max_fds = rl.rlim_max;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user