cadey
/
elemental-ircd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[svn] Make the code that raises fd rlimit to hard limit work.

This commit is contained in:
jilles 2007-04-03 15:25:11 -07:00
parent f32e30ddd8
commit 1aa8ffcbfd
3 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
nenolod 2007/04/03 11:45:22 UTC (20070403-3378)
Log:
- note the I/O reworking
Changes: Modified:
+2 -0 trunk/NEWS (File Modified)
nenolod 2007/04/03 11:37:39 UTC (20070403-3376) nenolod 2007/04/03 11:37:39 UTC (20070403-3376)
Log: Log:
- use mkdir -p - use mkdir -p

2
include/serno.h
View File

@ -1 +1 @@
#define SERNO "20070403-3376" #define SERNO "20070403-3378"

12
src/ircd.c
View File

@ -21,7 +21,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA * USA
* *
* $Id: ircd.c 3354 2007-04-03 09:21:31Z nenolod $ * $Id: ircd.c 3380 2007-04-03 22:25:11Z jilles $
*/ */
#include "stdinc.h" #include "stdinc.h"
@ -139,19 +139,19 @@ ircd_die_cb(const char *str)
static void static void
init_sys(void) init_sys(void)
{ {
#if defined(RLIMIT_FD_MAX) && defined(HAVE_SYS_RLIMIT_H) #if defined(RLIMIT_NOFILE) && defined(HAVE_SYS_RESOURCE_H)
struct rlimit limit; struct rlimit limit;
if(!getrlimit(RLIMIT_FD_MAX, &limit)) if(!getrlimit(RLIMIT_NOFILE, &limit))
{ {
limit.rlim_cur = limit.rlim_max; /* make soft limit the max */ limit.rlim_cur = limit.rlim_max; /* make soft limit the max */
if(setrlimit(RLIMIT_FD_MAX, &limit) == -1) if(setrlimit(RLIMIT_NOFILE, &limit) == -1)
{ {
fprintf(stderr, "error setting max fd's to %ld\n", (long) limit.rlim_cur); fprintf(stderr, "error setting max fd's to %ld\n", (long) limit.rlim_cur);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
} }
#endif /* RLIMIT_FD_MAX */ #endif /* RLIMIT_NOFILE */
} }
static int static int
@ -552,8 +552,8 @@ main(int argc, char *argv[])
} }
/* Init the event subsystem */ /* Init the event subsystem */
libcharybdis_init(ircd_log_cb, restart, ircd_die_cb);
init_sys(); init_sys();
libcharybdis_init(ircd_log_cb, restart, ircd_die_cb);
fdlist_init(); fdlist_init();
if(!server_state_foreground) if(!server_state_foreground)