diff options
| author | Max Romanov <max.romanov@nginx.com> | 2017-10-04 14:58:47 +0300 |
|---|---|---|
| committer | Max Romanov <max.romanov@nginx.com> | 2017-10-04 14:58:47 +0300 |
| commit | 6a64533fa3b96bb64bfde4615e40376d65a292cb (patch) | |
| tree | a18ed8059158d833290519e1135209747e28af21 /src/nxt_main_process.c | |
| parent | 414d508e04d26ebef0e3e1ba4ed518b11d3af1a0 (diff) | |
| download | unit-6a64533fa3b96bb64bfde4615e40376d65a292cb.tar.gz unit-6a64533fa3b96bb64bfde4615e40376d65a292cb.tar.bz2 | |
Introducing use counters for port and app. Thread safe port write.
Use counter helps to simplify logic around port and application free.
Port 'post' function introduced to simplify post execution of particular
function to original port engine's thread.
Write message queue is protected by mutex which makes port write operation
thread safe.
Diffstat (limited to '')
| -rw-r--r-- | src/nxt_main_process.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/nxt_main_process.c b/src/nxt_main_process.c index 90c06a05..9c27a89b 100644 --- a/src/nxt_main_process.c +++ b/src/nxt_main_process.c @@ -260,14 +260,17 @@ nxt_main_process_port_create(nxt_task_t *task, nxt_runtime_t *rt) return NXT_ERROR; } + nxt_process_port_add(task, process, port); + ret = nxt_port_socket_init(task, port, 0); if (nxt_slow_path(ret != NXT_OK)) { + nxt_port_use(task, port, -1); return ret; } - nxt_process_port_add(task, process, port); + nxt_runtime_port_add(task, port); - nxt_runtime_port_add(rt, port); + nxt_port_use(task, port, -1); /* * A main process port. A write port is not closed @@ -508,7 +511,7 @@ nxt_main_create_worker_process(nxt_task_t *task, nxt_runtime_t *rt, port = nxt_port_new(task, 0, 0, init->type); if (nxt_slow_path(port == NULL)) { - nxt_runtime_process_remove(rt, process); + nxt_runtime_process_remove(task, process); return NXT_ERROR; } @@ -516,12 +519,14 @@ nxt_main_create_worker_process(nxt_task_t *task, nxt_runtime_t *rt, ret = nxt_port_socket_init(task, port, 0); if (nxt_slow_path(ret != NXT_OK)) { - nxt_mp_release(port->mem_pool, port); + nxt_port_use(task, port, -1); return ret; } pid = nxt_process_create(task, process); + nxt_port_use(task, port, -1); + switch (pid) { case -1: @@ -755,7 +760,7 @@ nxt_main_cleanup_worker_process(nxt_task_t *task, nxt_pid_t pid) if (process) { init = process->init; - nxt_runtime_process_remove(rt, process); + nxt_runtime_process_remove(task, process); if (!nxt_exiting) { nxt_runtime_process_each(rt, process) { |