mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-08-31 06:15:47 +00:00
Code Issues Releases Wiki Activity

socket-util: Tolerate missing RLIM_SAVED_CUR and RLIM_SAVED_MAX.

Browse Source 
POSIX requires these macros, but FreeBSD 8.0 doesn't have them.
This commit is contained in:
Ben Pfaff
2010-05-26 10:07:22 -07:00
parent 3762274e63
commit 0ec6cfb13b
1 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
lib/socket-util.c
View File

@@ -55,6 +55,28 @@ set_nonblocking(int fd)
}
}
static bool
rlim_is_finite(rlim_t limit)
{
if (limit == RLIM_INFINITY) {
return false;
}
#ifdef RLIM_SAVED_CUR /* FreeBSD 8.0 lacks RLIM_SAVED_CUR. */
if (limit == RLIM_SAVED_CUR) {
return false;
}
#endif
#ifdef RLIM_SAVED_MAX /* FreeBSD 8.0 lacks RLIM_SAVED_MAX. */
if (limit == RLIM_SAVED_MAX) {
return false;
}
#endif
return true;
}
/* Returns the maximum valid FD value, plus 1. */
int
get_max_fds(void)
@@ -62,10 +84,7 @@ get_max_fds(void)
static int max_fds = -1;
if (max_fds < 0) {
struct rlimit r;
if (!getrlimit(RLIMIT_NOFILE, &r)
&& r.rlim_cur != RLIM_INFINITY
&& r.rlim_cur != RLIM_SAVED_MAX
&& r.rlim_cur != RLIM_SAVED_CUR) {
if (!getrlimit(RLIMIT_NOFILE, &r) && rlim_is_finite(r.rlim_cur)) {
max_fds = r.rlim_cur;
} else {
VLOG_WARN("failed to obtain fd limit, defaulting to 1024");