* Added experimental code to set the socket limit at runtime.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12803 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
FlavioJS
parent
233d15c130
commit
c9a3dc80bf
@ -3,6 +3,8 @@ Date Added
|
||||
AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
|
||||
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
|
||||
|
||||
2008/06/10
|
||||
* Added experimental code to set the socket limit at runtime. [FlavioJS]
|
||||
2008/06/09
|
||||
* Fixed SN_SHARPSHOOTING doing 100% atk less damage than it should, bugreport:1654
|
||||
* Fixed Active Guild skills not working when WoE is OFF, follow up on r12770, bugreport:1653 and bugreport:1637
|
||||
|
||||
93
configure
vendored
93
configure
vendored
@ -1,5 +1,5 @@
|
||||
#! /bin/sh
|
||||
# From configure.in Revision: 12729 .
|
||||
# From configure.in Revision: 12803 .
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.61.
|
||||
#
|
||||
@ -3986,6 +3986,97 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
#
|
||||
|
||||
|
||||
#
|
||||
# setrlimit - used to set the socket limit
|
||||
#
|
||||
{ echo "$as_me:$LINENO: checking for setrlimit" >&5
|
||||
echo $ECHO_N "checking for setrlimit... $ECHO_C" >&6; }
|
||||
if test "${ac_cv_func_setrlimit+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
/* Define setrlimit to an innocuous variant, in case <limits.h> declares setrlimit.
|
||||
For example, HP-UX 11i <limits.h> declares gettimeofday. */
|
||||
#define setrlimit innocuous_setrlimit
|
||||
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char setrlimit (); below.
|
||||
Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
|
||||
<limits.h> exists even on freestanding compilers. */
|
||||
|
||||
#ifdef __STDC__
|
||||
# include <limits.h>
|
||||
#else
|
||||
# include <assert.h>
|
||||
#endif
|
||||
|
||||
#undef setrlimit
|
||||
|
||||
/* Override any GCC internal prototype to avoid an error.
|
||||
Use char because int might match the return type of a GCC
|
||||
builtin and then its argument prototype would still apply. */
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
#endif
|
||||
char setrlimit ();
|
||||
/* The GNU C library defines this for functions which it implements
|
||||
to always fail with ENOSYS. Some functions are actually named
|
||||
something starting with __ and the normal name is an alias. */
|
||||
#if defined __stub_setrlimit || defined __stub___setrlimit
|
||||
choke me
|
||||
#endif
|
||||
|
||||
int
|
||||
main ()
|
||||
{
|
||||
return setrlimit ();
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext conftest$ac_exeext
|
||||
if { (ac_try="$ac_link"
|
||||
case "(($ac_try" in
|
||||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||||
*) ac_try_echo=$ac_try;;
|
||||
esac
|
||||
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||||
(eval "$ac_link") 2>conftest.er1
|
||||
ac_status=$?
|
||||
grep -v '^ *+' conftest.er1 >conftest.err
|
||||
rm -f conftest.er1
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } && {
|
||||
test -z "$ac_c_werror_flag" ||
|
||||
test ! -s conftest.err
|
||||
} && test -s conftest$ac_exeext &&
|
||||
$as_test_x conftest$ac_exeext; then
|
||||
ac_cv_func_setrlimit=yes
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
ac_cv_func_setrlimit=no
|
||||
fi
|
||||
|
||||
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
||||
conftest$ac_exeext conftest.$ac_ext
|
||||
fi
|
||||
{ echo "$as_me:$LINENO: result: $ac_cv_func_setrlimit" >&5
|
||||
echo "${ECHO_T}$ac_cv_func_setrlimit" >&6; }
|
||||
if test $ac_cv_func_setrlimit = yes; then
|
||||
CFLAGS="$CFLAGS -DHAVE_SETRLIMIT"
|
||||
fi
|
||||
|
||||
|
||||
|
||||
|
||||
#
|
||||
# Memory manager
|
||||
#
|
||||
|
||||
@ -291,6 +291,13 @@ AC_COMPILE_IFELSE(
|
||||
#
|
||||
|
||||
|
||||
#
|
||||
# setrlimit - used to set the socket limit
|
||||
#
|
||||
AC_CHECK_FUNC([setrlimit],[CFLAGS="$CFLAGS -DHAVE_SETRLIMIT"])
|
||||
|
||||
|
||||
|
||||
#
|
||||
# Memory manager
|
||||
#
|
||||
|
||||
@ -32,6 +32,10 @@
|
||||
#ifndef SIOCGIFCONF
|
||||
#include <sys/sockio.h> // SIOCGIFCONF on Solaris, maybe others? [Shinomori]
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_SETRLIMIT
|
||||
#include <sys/resource.h>
|
||||
#endif
|
||||
#endif
|
||||
|
||||
/////////////////////////////////////////////////////////////////////
|
||||
@ -1200,6 +1204,23 @@ void socket_init(void)
|
||||
return;
|
||||
}
|
||||
}
|
||||
#elif defined(HAVE_SETRLIMIT)
|
||||
{// set socket limit to FD_SETSIZE
|
||||
struct rlimit rlp;
|
||||
if( 0 == getrlimit(RLIMIT_NOFILE, &rlp) )
|
||||
{
|
||||
rlp.rlim_cur = FD_SETSIZE;
|
||||
if( 0 != setrlimit(RLIMIT_NOFILE, &rlp) )
|
||||
{// failed, try setting the maximum too (permission to change system limits is required)
|
||||
rlp.rlim_max = FD_SETSIZE;
|
||||
if( 0 != setrlimit(RLIMIT_NOFILE, &rlp) )
|
||||
{// failed
|
||||
getrlimit(RLIMIT_NOFILE, &rlp);
|
||||
ShowWarning("socket_init: %s - failed to set socket limit to %d (current limit %d).\n", strerror(errno), FD_SETSIZE, (int)rlp.rlim_cur);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
// Get initial local ips
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user