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

nxt_port_create() use task instead of thread.

Browse Source 
Write socket close() call moved out from nxt_port_create().
This commit is contained in:
Max Romanov
2017-06-23 19:19:41 +03:00
parent 89ab9a9d05
commit e5fe254e1e
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/nxt_port.c
View File

@@ -15,16 +15,15 @@ static void nxt_port_new_port_buf_completion(nxt_task_t *task, void *obj,
void void
nxt_port_create(nxt_thread_t *thread, nxt_port_t *port, nxt_port_create(nxt_task_t *task, nxt_port_t *port,
nxt_port_handler_t *handlers) nxt_port_handler_t *handlers)
{ {
port->pid = nxt_pid; port->pid = nxt_pid;
port->engine = thread->engine->id; port->engine = task->thread->engine->id;
port->handler = nxt_port_handler; port->handler = nxt_port_handler;
port->data = handlers; port->data = handlers;
nxt_port_write_close(port); nxt_port_read_enable(task, port);
nxt_port_read_enable(&thread->engine->task, port);
} }

2
src/nxt_port.h
View File

@@ -110,7 +110,7 @@ nxt_int_t nxt_port_socket_write(nxt_task_t *task, nxt_port_t *port,
nxt_uint_t type, nxt_fd_t fd, uint32_t stream, nxt_port_id_t reply_port, nxt_uint_t type, nxt_fd_t fd, uint32_t stream, nxt_port_id_t reply_port,
nxt_buf_t *b); nxt_buf_t *b);
void nxt_port_create(nxt_thread_t *thread, nxt_port_t *port, void nxt_port_create(nxt_task_t *task, nxt_port_t *port,
nxt_port_handler_t *handlers); nxt_port_handler_t *handlers);
void nxt_port_write(nxt_task_t *task, nxt_runtime_t *rt, nxt_uint_t type, void nxt_port_write(nxt_task_t *task, nxt_runtime_t *rt, nxt_uint_t type,
nxt_fd_t fd, uint32_t stream, nxt_buf_t *b); nxt_fd_t fd, uint32_t stream, nxt_buf_t *b);

3
src/nxt_process.c
View File

@@ -100,7 +100,8 @@ nxt_process_start(nxt_task_t *task, nxt_process_init_t *process)
nxt_port_write_enable(task, process->master_port); nxt_port_write_enable(task, process->master_port);
/* A worker process port. */ /* A worker process port. */
nxt_port_create(thread, process->port, process->port_handlers); nxt_port_write_close(process->port);
nxt_port_create(task, process->port, process->port_handlers);
ret = nxt_runtime_thread_pool_create(thread, rt, rt->auxiliary_threads, ret = nxt_runtime_thread_pool_create(thread, rt, rt->auxiliary_threads,
60000 * 1000000LL); 60000 * 1000000LL);