summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMax Romanov <max.romanov@nginx.com>2017-06-23 19:20:08 +0300
committerMax Romanov <max.romanov@nginx.com>2017-06-23 19:20:08 +0300
commit3b9aa27625e50dea5fed2644e80ea454605a3006 (patch)
tree91d3dafe87091205aea2ffa0bf6ef4fb1c43d025
parenteaf28db46e81787a89b7f962e8bb53b142747a5e (diff)
downloadunit-3b9aa27625e50dea5fed2644e80ea454605a3006.tar.gz
unit-3b9aa27625e50dea5fed2644e80ea454605a3006.tar.bz2
Added mem_pool pointer member to nxt_port_send_msg_t.
To decouple nxt_port_send_msg_t from port.
Diffstat (limited to '')
-rw-r--r--src/nxt_port.h1
-rw-r--r--src/nxt_port_socket.c3
2 files changed, 3 insertions, 1 deletions
diff --git a/src/nxt_port.h b/src/nxt_port.h
index 458aca17..66534cdc 100644
--- a/src/nxt_port.h
+++ b/src/nxt_port.h
@@ -36,6 +36,7 @@ typedef struct {
typedef struct {
nxt_queue_link_t link;
nxt_buf_t *buf;
+ nxt_mp_t *mem_pool;
size_t share;
nxt_fd_t fd;
nxt_port_msg_t port_msg;
diff --git a/src/nxt_port_socket.c b/src/nxt_port_socket.c
index 71ee315e..2a3a6594 100644
--- a/src/nxt_port_socket.c
+++ b/src/nxt_port_socket.c
@@ -167,6 +167,7 @@ nxt_port_socket_write(nxt_task_t *task, nxt_port_t *port, nxt_uint_t type,
msg->buf = b;
msg->fd = fd;
msg->share = 0;
+ msg->mem_pool = port->mem_pool;
msg->port_msg.stream = stream;
msg->port_msg.pid = nxt_pid;
@@ -289,7 +290,7 @@ nxt_port_write_handler(nxt_task_t *task, void *obj, void *data)
} else {
nxt_queue_remove(link);
- nxt_mp_free(port->mem_pool, msg);
+ nxt_mp_free(msg->mem_pool, msg);
}
} else if (nxt_slow_path(n == NXT_ERROR)) {