technocloud-public/nginx-unit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fixing various router crashes on exit caused by runtime pool free.

Browse Source 
Currently, the router exits without waiting for the worker threads to stop.
There is a short gap between the runtime memory pool's free and the exit, during
which a worker thread may try to access a runtime structure.  In turn, this may
cause a crash.  For now, it is better to keep this memory allocated.
This commit is contained in:
Max Romanov
2020-07-23 14:25:21 +03:00
parent d3c8d62280
commit 9641fb0ef1
1 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/nxt_runtime.c
View File

@@ -527,7 +527,7 @@ nxt_runtime_stop_all_processes(nxt_task_t *task, nxt_runtime_t *rt)
static void static void
nxt_runtime_exit(nxt_task_t *task, void *obj, void *data) nxt_runtime_exit(nxt_task_t *task, void *obj, void *data)
{ {
int status; int status, engine_count;
nxt_runtime_t *rt; nxt_runtime_t *rt;
nxt_process_t *process; nxt_process_t *process;
nxt_event_engine_t *engine; nxt_event_engine_t *engine;
@@ -571,14 +571,25 @@ nxt_runtime_exit(nxt_task_t *task, void *obj, void *data)
} nxt_runtime_process_loop; } nxt_runtime_process_loop;
if (rt->port_by_type[rt->type] != NULL) {
nxt_port_use(task, rt->port_by_type[rt->type], -1);
}
nxt_thread_mutex_destroy(&rt->processes_mutex);
status = rt->status; status = rt->status;
nxt_mp_destroy(rt->mem_pool);
engine_count = 0;
nxt_queue_each(engine, &rt->engines, nxt_event_engine_t, link) {
engine_count++;
} nxt_queue_loop;
if (engine_count <= 1) {
if (rt->port_by_type[rt->type] != NULL) {
nxt_port_use(task, rt->port_by_type[rt->type], -1);
}
nxt_thread_mutex_destroy(&rt->processes_mutex);
nxt_mp_destroy(rt->mem_pool);
}
nxt_debug(task, "exit: %d", status); nxt_debug(task, "exit: %d", status);