kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-04 20:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

OpenBSD does not have RLIMIT_AS or RLIMIT_VMEM so until someone finds the right rlimit to use then let's not support the -v option on OpenBSD. (issue #8543 reported by jtodd)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48591 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2006-12-19 21:59:33 +00:00
parent 201e752e50
commit 3830f08dc5
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
res/res_limit.c
View File

@@ -25,6 +25,15 @@
#include "asterisk/module.h" #include "asterisk/module.h"
#include "asterisk/cli.h" #include "asterisk/cli.h"
/* Find proper rlimit for virtual memory */
#ifdef RLIMIT_AS
#define VMEM_DEF RLIMIT_AS
#else
#ifdef RLIMIT_VMEM
#define VMEM_DEF RLIMIT_VMEM
#endif
#endif
static struct limits { static struct limits {
int resource; int resource;
char limit[3]; char limit[3];
@@ -41,10 +50,9 @@ static struct limits {
{ RLIMIT_MEMLOCK, "-l", "amount of memory locked into RAM" }, { RLIMIT_MEMLOCK, "-l", "amount of memory locked into RAM" },
#endif #endif
{ RLIMIT_NOFILE, "-n", "number of file descriptors" }, { RLIMIT_NOFILE, "-n", "number of file descriptors" },
#ifndef RLIMIT_AS /* *BSD use RLIMIT_VMEM */ #ifdef VMEM_DEF
#define RLIMIT_AS RLIMIT_VMEM { VMEM_DEF, "-v", "virtual memory" },
#endif #endif
{ RLIMIT_AS, "-v", "virtual memory" },
}; };
static int str2limit(const char *string) static int str2limit(const char *string)
@@ -143,7 +151,9 @@ static const char ulimit_usage[] =
" -s Process stack size [readonly]\n" " -s Process stack size [readonly]\n"
" -t CPU usage [readonly]\n" " -t CPU usage [readonly]\n"
" -u Child processes\n" " -u Child processes\n"
#ifdef VMEM_DEF
" -v Process virtual memory [readonly]\n" " -v Process virtual memory [readonly]\n"
#endif
" -c Core dump file size\n" " -c Core dump file size\n"
" -n Number of file descriptors\n"; " -n Number of file descriptors\n";