ViewVC Help

View File | Revision Log | Show Annotations | View Changeset | Root Listing

root/svn/ircd-hybrid/trunk/src/fdlist.c

Comparing ircd-hybrid-8/src/fdlist.c (file contents):
Revision 1156 by michael, Tue Aug 9 20:29:20 2011 UTC vs.
Revision 1312 by michael, Mon Mar 26 16:07:20 2012 UTC

#	Line 21 | Line 21
21		*
22		*  $Id$
23		*/
24	+
25		#include "stdinc.h"
26		#include "fdlist.h"
27		#include "client.h"  /* struct Client */
27	–	#include "common.h"
28		#include "event.h"
29		#include "ircd.h"    /* GlobalSetOptions */
30		#include "irc_string.h"
31	–	#include "rlimits.h"
31		#include "s_bsd.h"   /* comm_setselect */
32	<	#include "s_conf.h"  /* ServerInfo */
32	>	#include "conf.h"  /* ServerInfo */
33		#include "send.h"
34		#include "memory.h"
35		#include "numeric.h"
36	+	#include "s_misc.h"
37	+	#include "irc_res.h"
38
39		fde_t *fd_hash[FD_HASH_SIZE];
40		fde_t *fd_next_in_loop = NULL;
#	Line 77 | Line 78 | recalc_fdlimit(void *unused)
78		int fdmax;
79		struct rlimit limit;
80
81	<	if (!getrlimit(RLIMIT_FD_MAX, &limit))
81	>	if (!getrlimit(RLIMIT_NOFILE, &limit))
82		{
83		limit.rlim_cur = limit.rlim_max;
84	<	setrlimit(RLIMIT_FD_MAX, &limit);
84	>	setrlimit(RLIMIT_NOFILE, &limit);
85		}
86
87		fdmax = getdtablesize();

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)