RepoMirrors/mars
1
0
Fork 0
mirror of https://github.com/schoebel/mars synced 2025-02-26 01:20:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

server: fix memory leak on writes

Browse Source 
This was unnoticed for a long time because it simply did not occur
in ordinary MARS Light workloads.
This commit is contained in:
Thomas Schoebel-Theuer 2015-10-13 16:00:31 +02:00
parent ccb5021e0f
commit c1ee80f9f4
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/mars_net.c
View File

@ -1148,7 +1148,7 @@ int mars_recv_mref(struct mars_socket *msock, struct mref_object *mref, struct m
if (cmd->cmd_code & CMD_FLAG_HAS_DATA) { if (cmd->cmd_code & CMD_FLAG_HAS_DATA) {
if (!mref->ref_data) if (!mref->ref_data)
mref->ref_data = brick_zmem_alloc(mref->ref_len); mref->ref_data = brick_block_alloc(0, mref->ref_len);
if (!mref->ref_data) { if (!mref->ref_data) {
status = -ENOMEM; status = -ENOMEM;
goto done; goto done;

6
kernel/mars_server.c
View File

@ -124,6 +124,10 @@ int cb_thread(void *data)
mars_shutdown_socket(sock); mars_shutdown_socket(sock);
} }
if (mref_a->data) {
brick_block_free(mref_a->data, mref_a->len);
mref->ref_data = NULL;
}
if (mref_a->do_put) { if (mref_a->do_put) {
GENERIC_INPUT_CALL(brick->inputs[0], mref_put, mref); GENERIC_INPUT_CALL(brick->inputs[0], mref_put, mref);
atomic_dec(&brick->in_flight); atomic_dec(&brick->in_flight);
@ -210,6 +214,8 @@ int server_io(struct server_brick *brick, struct mars_socket *sock, struct mars_
} }
mref_a->brick = brick; mref_a->brick = brick;
mref_a->data = mref->ref_data;
mref_a->len = mref->ref_len;
SETUP_CALLBACK(mref, server_endio, mref_a); SETUP_CALLBACK(mref, server_endio, mref_a);
amount = 0; amount = 0;

2
kernel/mars_server.h
View File

@ -39,6 +39,8 @@ struct server_mref_aspect {
GENERIC_ASPECT(mref); GENERIC_ASPECT(mref);
struct server_brick *brick; struct server_brick *brick;
struct list_head cb_head; struct list_head cb_head;
void *data;
int len;
bool do_put; bool do_put;
}; };