Merged with the default branch.1.13.0-1

1 files changed, 49 insertions, 30 deletions

diff --git a/src/nxt_runtime.c b/src/nxt_runtime.c
index de41ba4d..096aabc4 100644
--- a/src/nxt_runtime.c
+++ b/src/nxt_runtime.c
@@ -37,10 +37,10 @@ static void nxt_runtime_thread_pool_destroy(nxt_task_t *task, nxt_runtime_t *rt,
 static void nxt_runtime_thread_pool_init(void);
 static void nxt_runtime_thread_pool_exit(nxt_task_t *task, void *obj,
     void *data);
-static void nxt_runtime_process_destroy(nxt_runtime_t *rt,
+static nxt_process_t *nxt_runtime_process_get(nxt_runtime_t *rt, nxt_pid_t pid);
+static void nxt_runtime_process_remove(nxt_runtime_t *rt,
     nxt_process_t *process);
-static nxt_process_t *nxt_runtime_process_remove_pid(nxt_runtime_t *rt,
-    nxt_pid_t pid);
+static void nxt_runtime_port_add(nxt_task_t *task, nxt_port_t *port);
 
 
 nxt_int_t
@@ -459,7 +459,7 @@ nxt_runtime_close_idle_connections(nxt_event_engine_t *engine)
 
     idle = &engine->idle_connections;
 
-    for (link = nxt_queue_head(idle);
+    for (link = nxt_queue_first(idle);
          link != nxt_queue_tail(idle);
          link = next)
     {
@@ -658,6 +658,8 @@ nxt_runtime_thread_pool_exit(nxt_task_t *task, void *obj, void *data)
         if (tp == thread_pools[i]) {
             nxt_array_remove(rt->thread_pools, &thread_pools[i]);
 
+            nxt_free(tp);
+
             if (n == 1) {
                 /* The last thread pool. */
                 rt->continuation(task, 0);
@@ -1296,11 +1298,15 @@ nxt_runtime_process_new(nxt_runtime_t *rt)
 }
 
 
-static void
-nxt_runtime_process_destroy(nxt_runtime_t *rt, nxt_process_t *process)
+void
+nxt_runtime_process_release(nxt_runtime_t *rt, nxt_process_t *process)
 {
     nxt_port_t  *port;
 
+    if (process->registered == 1) {
+        nxt_runtime_process_remove(rt, process);
+    }
+
     nxt_assert(process->use_count == 0);
     nxt_assert(process->registered == 0);
 
@@ -1316,6 +1322,10 @@ nxt_runtime_process_destroy(nxt_runtime_t *rt, nxt_process_t *process)
     nxt_thread_mutex_destroy(&process->outgoing.mutex);
     nxt_thread_mutex_destroy(&process->cp_mutex);
 
+    if (process->init != NULL) {
+        nxt_mp_free(rt->mem_pool, process->init);
+    }
+
     nxt_mp_free(rt->mem_pool, process);
 }
 
@@ -1379,7 +1389,7 @@ nxt_runtime_process_find(nxt_runtime_t *rt, nxt_pid_t pid)
 }
 
 
-nxt_process_t *
+static nxt_process_t *
 nxt_runtime_process_get(nxt_runtime_t *rt, nxt_pid_t pid)
 {
     nxt_process_t       *process;
@@ -1489,13 +1499,13 @@ nxt_runtime_process_add(nxt_task_t *task, nxt_process_t *process)
 }
 
 
-static nxt_process_t *
-nxt_runtime_process_remove_pid(nxt_runtime_t *rt, nxt_pid_t pid)
+static void
+nxt_runtime_process_remove(nxt_runtime_t *rt, nxt_process_t *process)
 {
-    nxt_process_t       *process;
+    nxt_pid_t           pid;
     nxt_lvlhsh_query_t  lhq;
 
-    process = NULL;
+    pid = process->pid;
 
     nxt_runtime_process_lhq_pid(&lhq, &pid);
 
@@ -1521,40 +1531,49 @@ nxt_runtime_process_remove_pid(nxt_runtime_t *rt, nxt_pid_t pid)
     }
 
     nxt_thread_mutex_unlock(&rt->processes_mutex);
-
-    return process;
 }
 
 
-void
-nxt_process_use(nxt_task_t *task, nxt_process_t *process, int i)
+nxt_process_t *
+nxt_runtime_process_first(nxt_runtime_t *rt, nxt_lvlhsh_each_t *lhe)
 {
-    nxt_runtime_t  *rt;
+    nxt_lvlhsh_each_init(lhe, &lvlhsh_processes_proto);
+
+    return nxt_runtime_process_next(rt, lhe);
+}
 
-    process->use_count += i;
 
-    if (process->use_count == 0) {
-        rt = task->thread->runtime;
+nxt_port_t *
+nxt_runtime_process_port_create(nxt_task_t *task, nxt_runtime_t *rt,
+    nxt_pid_t pid, nxt_port_id_t id, nxt_process_type_t type)
+{
+    nxt_port_t     *port;
+    nxt_process_t  *process;
 
-        if (process->registered == 1) {
-            nxt_runtime_process_remove_pid(rt, process->pid);
-        }
+    process = nxt_runtime_process_get(rt, pid);
+    if (nxt_slow_path(process == NULL)) {
+        return NULL;
+    }
 
-        nxt_runtime_process_destroy(rt, process);
+    port = nxt_port_new(task, id, pid, type);
+    if (nxt_slow_path(port == NULL)) {
+        nxt_process_use(task, process, -1);
+        return NULL;
     }
-}
 
+    nxt_process_port_add(task, process, port);
 
-nxt_process_t *
-nxt_runtime_process_first(nxt_runtime_t *rt, nxt_lvlhsh_each_t *lhe)
-{
-    nxt_lvlhsh_each_init(lhe, &lvlhsh_processes_proto);
+    nxt_process_use(task, process, -1);
 
-    return nxt_runtime_process_next(rt, lhe);
+    nxt_runtime_port_add(task, port);
+
+    nxt_port_use(task, port, -1);
+
+    return port;
 }
 
 
-void
+static void
 nxt_runtime_port_add(nxt_task_t *task, nxt_port_t *port)
 {
     nxt_int_t      res;