diff options
author | Max Romanov <max.romanov@nginx.com> | 2017-07-18 00:21:14 +0300 |
---|---|---|
committer | Max Romanov <max.romanov@nginx.com> | 2017-07-18 00:21:14 +0300 |
commit | eb675f2d78178b2cdd54d934022f9b739bfa8952 (patch) | |
tree | 0b072c752fff35cd5c4498cded7016a5738caa58 /src/nxt_master_process.c | |
parent | 47b359388cdf6348238e7fc05770426448049189 (diff) | |
download | unit-eb675f2d78178b2cdd54d934022f9b739bfa8952.tar.gz unit-eb675f2d78178b2cdd54d934022f9b739bfa8952.tar.bz2 |
Port allocation and destroy changed. Worker process stop introduced.
Diffstat (limited to '')
-rw-r--r-- | src/nxt_master_process.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/nxt_master_process.c b/src/nxt_master_process.c index 44cf8d8b..1a8b5ed8 100644 --- a/src/nxt_master_process.c +++ b/src/nxt_master_process.c @@ -207,12 +207,13 @@ nxt_master_process_port_create(nxt_task_t *task, nxt_runtime_t *rt) return NXT_ERROR; } - port = nxt_process_port_new(rt, process, nxt_port_get_next_id(), - NXT_PROCESS_MASTER); + port = nxt_port_new(0, nxt_pid, NXT_PROCESS_MASTER); if (nxt_slow_path(port == NULL)) { return NXT_ERROR; } + nxt_process_port_add(process, port); + ret = nxt_port_socket_init(task, port, 0); if (nxt_slow_path(ret != NXT_OK)) { return ret; @@ -373,15 +374,17 @@ nxt_master_create_worker_process(nxt_task_t *task, nxt_runtime_t *rt, process->init = init; - port = nxt_process_port_new(rt, process, 0, init->type); + port = nxt_port_new(0, 0, init->type); if (nxt_slow_path(port == NULL)) { nxt_runtime_process_destroy(rt, process); return NXT_ERROR; } + nxt_process_port_add(process, port); + ret = nxt_port_socket_init(task, port, 0); if (nxt_slow_path(ret != NXT_OK)) { - nxt_mp_free(rt->mem_pool, port); + nxt_mp_release(port->mem_pool, port); nxt_runtime_process_destroy(rt, process); return ret; } |