phpged/unit
1
0
Fork 0
Code Issues 1 Pull requests Projects 1 Releases Packages Wiki Activity

Removing mem_pool from port_hash interface.

Browse source 
Memory pool is not used by port_hash and it was a mistake to pass it into
'add' and 'remove' functions.  port_hash enrties are allocated from heap.
This commit is contained in:
Max Romanov 2017-10-04 14:57:56 +03:00
parent 4ae76249ed
commit ba31199786
5 changed files with 30 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/nxt_port_hash.c
View file

@ -52,9 +52,19 @@ nxt_port_hash_first(nxt_lvlhsh_t *port_hash, nxt_lvlhsh_each_t *lhe)
}
nxt_inline void
nxt_port_hash_lhq(nxt_lvlhsh_query_t *lhq, nxt_pid_port_id_t *pid_port)
{
lhq->key_hash = nxt_murmur_hash2(pid_port, sizeof(nxt_pid_port_id_t));
lhq->key.length = sizeof(nxt_pid_port_id_t);
lhq->key.start = (u_char *) pid_port;
lhq->proto = &lvlhsh_ports_proto;
lhq->pool = NULL;
}
void
nxt_port_hash_add(nxt_lvlhsh_t *port_hash, nxt_mp_t *mem_pool,
nxt_port_t *port)
nxt_port_hash_add(nxt_lvlhsh_t *port_hash, nxt_port_t *port)
{
nxt_pid_port_id_t pid_port;
nxt_lvlhsh_query_t lhq;
@ -62,13 +72,9 @@ nxt_port_hash_add(nxt_lvlhsh_t *port_hash, nxt_mp_t *mem_pool,
pid_port.pid = port->pid;
pid_port.port_id = port->id;
lhq.key_hash = nxt_murmur_hash2(&pid_port, sizeof(pid_port));
lhq.key.length = sizeof(pid_port);
lhq.key.start = (u_char *) &pid_port;
lhq.proto = &lvlhsh_ports_proto;
nxt_port_hash_lhq(&lhq, &pid_port);
lhq.replace = 0;
lhq.value = port;
lhq.pool = mem_pool;
switch (nxt_lvlhsh_insert(port_hash, &lhq)) {
@ -84,8 +90,7 @@ nxt_port_hash_add(nxt_lvlhsh_t *port_hash, nxt_mp_t *mem_pool,
void
nxt_port_hash_remove(nxt_lvlhsh_t *port_hash, nxt_mp_t *mem_pool,
nxt_port_t *port)
nxt_port_hash_remove(nxt_lvlhsh_t *port_hash, nxt_port_t *port)
{
nxt_pid_port_id_t pid_port;
nxt_lvlhsh_query_t lhq;
@ -93,13 +98,7 @@ nxt_port_hash_remove(nxt_lvlhsh_t *port_hash, nxt_mp_t *mem_pool,
pid_port.pid = port->pid;
pid_port.port_id = port->id;
lhq.key_hash = nxt_murmur_hash2(&pid_port, sizeof(pid_port));
lhq.key.length = sizeof(pid_port);
lhq.key.start = (u_char *) &pid_port;
lhq.proto = &lvlhsh_ports_proto;
lhq.replace = 0;
lhq.value = port;
lhq.pool = mem_pool;
nxt_port_hash_lhq(&lhq, &pid_port);
switch (nxt_lvlhsh_delete(port_hash, &lhq)) {
@ -122,12 +121,7 @@ nxt_port_hash_find(nxt_lvlhsh_t *port_hash, nxt_pid_t pid,
pid_port.pid = pid;
pid_port.port_id = port_id;
lhq.key_hash = nxt_murmur_hash2(&pid_port, sizeof(pid_port));
lhq.key.length = sizeof(pid_port);
lhq.key.start = (u_char *) &pid_port;
lhq.proto = &lvlhsh_ports_proto;
/* TODO lock ports */
nxt_port_hash_lhq(&lhq, &pid_port);
if (nxt_lvlhsh_find(port_hash, &lhq) == NXT_OK) {
nxt_thread_log_debug("process port (%PI, %d) found", pid, port_id);

6
src/nxt_port_hash.h
View file

@ -11,11 +11,9 @@
#include <nxt_main.h>
void nxt_port_hash_add(nxt_lvlhsh_t *port_hash, nxt_mp_t *mem_pool,
nxt_port_t *port);
void nxt_port_hash_add(nxt_lvlhsh_t *port_hash, nxt_port_t *port);
void nxt_port_hash_remove(nxt_lvlhsh_t *port_hash, nxt_mp_t *mem_pool,
nxt_port_t *port);
void nxt_port_hash_remove(nxt_lvlhsh_t *port_hash, nxt_port_t *port);
nxt_port_t *nxt_port_hash_find(nxt_lvlhsh_t *port_hash, nxt_pid_t pid,
nxt_port_id_t port_id);

15
src/nxt_process.c
View file

@ -619,13 +619,7 @@ nxt_process_connected_port_add(nxt_process_t *process, nxt_port_t *port)
{
nxt_thread_mutex_lock(&process->cp_mutex);
if (process->cp_mem_pool == NULL) {
process->cp_mem_pool = nxt_mp_create(1024, 128, 256, 32);
}
nxt_mp_thread_adopt(process->cp_mem_pool);
nxt_port_hash_add(&process->connected_ports, process->cp_mem_pool, port);
nxt_port_hash_add(&process->connected_ports, port);
nxt_thread_mutex_unlock(&process->cp_mutex);
}
@ -635,12 +629,7 @@ nxt_process_connected_port_remove(nxt_process_t *process, nxt_port_t *port)
{
nxt_thread_mutex_lock(&process->cp_mutex);
if (process->cp_mem_pool != NULL) {
nxt_mp_thread_adopt(process->cp_mem_pool);
nxt_port_hash_remove(&process->connected_ports, process->cp_mem_pool,
port);
}
nxt_port_hash_remove(&process->connected_ports, port);
nxt_thread_mutex_unlock(&process->cp_mutex);
}

1
src/nxt_process.h
View file

@ -58,7 +58,6 @@ typedef struct {
nxt_array_t *outgoing; /* of nxt_port_mmap_t */
nxt_thread_mutex_t cp_mutex;
nxt_mp_t *cp_mem_pool;
nxt_lvlhsh_t connected_ports; /* of nxt_port_t */
} nxt_process_t;

15
src/nxt_runtime.c
View file

@ -1586,16 +1586,21 @@ nxt_runtime_process_new(nxt_runtime_t *rt)
static void
nxt_runtime_process_destroy(nxt_runtime_t *rt, nxt_process_t *process)
{
nxt_port_t *port;
nxt_lvlhsh_each_t lhe;
nxt_assert(process->port_cleanups == 0);
nxt_assert(process->registered == 0);
nxt_port_mmaps_destroy(process->incoming, 1);
nxt_port_mmaps_destroy(process->outgoing, 1);
if (process->cp_mem_pool != NULL) {
nxt_mp_thread_adopt(process->cp_mem_pool);
port = nxt_port_hash_first(&process->connected_ports, &lhe);
nxt_mp_destroy(process->cp_mem_pool);
while(port != NULL) {
nxt_port_hash_remove(&process->connected_ports, port);
port = nxt_port_hash_first(&process->connected_ports, &lhe);
}
nxt_thread_mutex_destroy(&process->incoming_mutex);
@ -1847,7 +1852,7 @@ nxt_runtime_port_first(nxt_runtime_t *rt, nxt_lvlhsh_each_t *lhe)
void
nxt_runtime_port_add(nxt_runtime_t *rt, nxt_port_t *port)
{
nxt_port_hash_add(&rt->ports, rt->mem_pool, port);
nxt_port_hash_add(&rt->ports, port);
rt->port_by_type[port->type] = port;
}
@ -1856,7 +1861,7 @@ nxt_runtime_port_add(nxt_runtime_t *rt, nxt_port_t *port)
void
nxt_runtime_port_remove(nxt_runtime_t *rt, nxt_port_t *port)
{
nxt_port_hash_remove(&rt->ports, rt->mem_pool, port);
nxt_port_hash_remove(&rt->ports, port);
if (rt->port_by_type[port->type] == port) {
rt->port_by_type[port->type] = NULL;