mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-08 02:02:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

worker_rlimit_core supports size in K, M, and G

Browse Source
This commit is contained in:
Igor Sysoev 2006-12-24 18:13:06 +00:00
parent b4887b289e
commit 888ea84ce0
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/nginx.c
View File

@ -109,7 +109,7 @@ static ngx_command_t ngx_core_commands[] = {
{ ngx_string("worker_rlimit_core"), { ngx_string("worker_rlimit_core"),
NGX_MAIN_CONF|NGX_DIRECT_CONF|NGX_CONF_TAKE1, NGX_MAIN_CONF|NGX_DIRECT_CONF|NGX_CONF_TAKE1,
ngx_conf_set_num_slot, ngx_conf_set_size_slot,
0, 0,
offsetof(ngx_core_conf_t, rlimit_core), offsetof(ngx_core_conf_t, rlimit_core),
NULL }, NULL },
@ -620,7 +620,7 @@ ngx_core_module_create_conf(ngx_cycle_t *cycle)
ccf->debug_points = NGX_CONF_UNSET; ccf->debug_points = NGX_CONF_UNSET;
ccf->rlimit_nofile = NGX_CONF_UNSET; ccf->rlimit_nofile = NGX_CONF_UNSET;
ccf->rlimit_core = NGX_CONF_UNSET; ccf->rlimit_core = NGX_CONF_UNSET_SIZE;
ccf->rlimit_sigpending = NGX_CONF_UNSET; ccf->rlimit_sigpending = NGX_CONF_UNSET;
ccf->user = (ngx_uid_t) NGX_CONF_UNSET_UINT; ccf->user = (ngx_uid_t) NGX_CONF_UNSET_UINT;

2
src/core/ngx_cycle.h
View File

@ -68,8 +68,8 @@ typedef struct {
ngx_int_t debug_points; ngx_int_t debug_points;
ngx_int_t rlimit_nofile; ngx_int_t rlimit_nofile;
ngx_int_t rlimit_core;
ngx_int_t rlimit_sigpending; ngx_int_t rlimit_sigpending;
size_t rlimit_core;
int priority; int priority;

2
src/os/unix/ngx_process_cycle.c
View File

@ -787,7 +787,7 @@ ngx_worker_process_init(ngx_cycle_t *cycle, ngx_uint_t priority)
} }
} }
if (ccf->rlimit_core != NGX_CONF_UNSET) { if (ccf->rlimit_core != NGX_CONF_UNSET_SIZE) {
rlmt.rlim_cur = (rlim_t) ccf->rlimit_core; rlmt.rlim_cur = (rlim_t) ccf->rlimit_core;
rlmt.rlim_max = (rlim_t) ccf->rlimit_core; rlmt.rlim_max = (rlim_t) ccf->rlimit_core;