1
0
mirror of https://github.com/samba-team/samba.git synced 2025-12-12 12:23:50 +03:00

Re-added code to tell the user how many open files they

have. Needed for server diagnosis purposes...
Jeremy.
This commit is contained in:
Jeremy Allison
-
parent f69cf05ff5
commit 04d79a9ae5
4 changed files with 25 additions and 13 deletions

View File

@@ -4849,9 +4849,9 @@ void zero_free(void *p, size_t size)
/*****************************************************************
set our open file limit to the max and return the limit
set our open file limit to a requested max and return the limit
*****************************************************************/
int set_maxfiles(void)
int set_maxfiles(int requested_max)
{
#if (defined(HAVE_GETRLIMIT) && defined(RLIMIT_NOFILE))
struct rlimit rlp;
@@ -4860,13 +4860,15 @@ int set_maxfiles(void)
* account for the extra fd we need
* as well as the log files and standard
* handles etc. */
rlp.rlim_cur = rlp.rlim_max;
rlp.rlim_cur = MIN(requested_max,rlp.rlim_max);
setrlimit(RLIMIT_NOFILE, &rlp);
getrlimit(RLIMIT_NOFILE, &rlp);
return rlp.rlim_cur;
#else
/* just guess ... */
return 1024;
/*
* No way to know - just guess...
*/
return requested_max;
#endif
}