diff options
Diffstat (limited to 'src/os/unix/ngx_process_cycle.c')
-rw-r--r-- | src/os/unix/ngx_process_cycle.c | 91 |
1 files changed, 0 insertions, 91 deletions
diff --git a/src/os/unix/ngx_process_cycle.c b/src/os/unix/ngx_process_cycle.c index 1b10cfc72..6ee6dbec6 100644 --- a/src/os/unix/ngx_process_cycle.c +++ b/src/os/unix/ngx_process_cycle.c @@ -12,8 +12,6 @@ static void ngx_worker_process_cycle(ngx_cycle_t *cycle, void *data); static int ngx_worker_thread_cycle(void *data); #endif -static void ngx_delete_pidfile(ngx_cycle_t *cycle); - ngx_int_t ngx_process; ngx_pid_t ngx_pid; @@ -76,10 +74,6 @@ void ngx_master_process_cycle(ngx_cycle_t *cycle, ngx_master_ctx_t *ctx) ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module); - if (ccf->worker_processes == NGX_CONF_UNSET) { - ccf->worker_processes = 1; - } - if (ngx_process == NGX_PROCESS_MASTER) { for (i = 0; i < (ngx_uint_t) ccf->worker_processes; i++) { ngx_spawn_process(cycle, ngx_worker_process_cycle, NULL, @@ -524,88 +518,3 @@ int ngx_worker_thread_cycle(void *data) } #endif - - -static ngx_int_t ngx_create_pidfile(ngx_cycle_t *cycle, ngx_master_ctx_t *ctx) -{ - size_t len; - u_char pid[NGX_INT64_LEN + 1]; - ngx_str_t name; - ngx_core_conf_t *ccf; - - ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module); - - if (ctx->pid.len) { - if (ccf->pid.len == 0) { - return NGX_OK; - } - - if (ctx->pid.len == ccf->pid.len - && ngx_strcmp(ctx->pid.data, ccf->pid.data) == 0) - { - return NGX_OK; - } - } - - if (ccf->pid.len == 0) { - ccf->pid.len = sizeof(NGINX_PID) - 1; - ccf->pid.data = NGINX_PID; - ccf->newpid.len = sizeof(NGINX_NEWPID) - 1; - ccf->newpid.data = NGINX_NEWPID; - - } else { - ccf->newpid.len = ccf->pid.len + sizeof(NGINX_NEWPID_EXT); - if (!(ccf->newpid.data = ngx_alloc(ccf->newpid.len, cycle->log))) { - return NGX_ERROR; - } - - ngx_memcpy(ngx_cpymem(ccf->newpid.data, ccf->pid.data, ccf->pid.len), - NGINX_NEWPID_EXT, sizeof(NGINX_NEWPID_EXT)); - } - - len = ngx_snprintf((char *) pid, NGX_INT64_LEN + 1, PID_T_FMT, ngx_pid); - ngx_memzero(&ctx->pid, sizeof(ngx_file_t)); - ctx->pid.name = ngx_inherited ? ccf->newpid : ccf->pid; - ctx->name = ccf->pid.data; - - ctx->pid.fd = ngx_open_file(ctx->pid.name.data, NGX_FILE_RDWR, - NGX_FILE_CREATE_OR_OPEN); - - if (ctx->pid.fd == NGX_INVALID_FILE) { - ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_errno, - ngx_open_file_n " \"%s\" failed", ctx->pid.name.data); - return NGX_ERROR; - } - - if (ngx_write_file(&ctx->pid, pid, len, 0) == NGX_ERROR) { - return NGX_ERROR; - } - - if (ngx_close_file(ctx->pid.fd) == NGX_FILE_ERROR) { - ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno, - ngx_close_file_n " \"%s\" failed", ctx->pid.name.data); - } - - return NGX_OK; -} - - -static void ngx_delete_pidfile(ngx_cycle_t *cycle) -{ - u_char *name; - ngx_core_conf_t *ccf; - - ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module); - - if (ngx_inherited && getppid() > 1) { - name = ccf->newpid.data; - - } else { - name = ccf->pid.data; - } - - if (ngx_delete_file(name) == NGX_FILE_ERROR) { - ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno, - ngx_delete_file_n " \"%s\" failed", name); - } -} |