RepoMirrors
/
mars
mirror of https://github.com/schoebel/mars
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

import mars-123.tgz

This commit is contained in:
Thomas Schoebel-Theuer 2011-08-12 13:25:10 +01:00
parent b7326a74a7
commit cc2354f92d
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mars_client.c
View File

@ -238,7 +238,7 @@ int receiver_thread(void *data)
struct client_output *output = data;
int status = 0;
while (!kthread_should_stop() && output->socket) {
while (status >= 0 && output->socket && !kthread_should_stop()) {
struct mars_cmd cmd = {};
struct list_head *tmp;
struct client_mref_aspect *mref_a = NULL;
@ -269,6 +269,7 @@ int receiver_thread(void *data)
mref_a = container_of(tmp, struct client_mref_aspect, hash_head);
tmp_mref = mref_a->object;
if (unlikely(!tmp_mref)) {
traced_unlock(&output->hash_lock[hash_index], flags);
MARS_ERR("bad internal mref pointer\n");
status = -EBADR;
goto done;
@ -324,9 +325,10 @@ int receiver_thread(void *data)
status = -EBADR;
goto done;
}
done:
brick_string_free(cmd.cmd_str1);
}
done:
if (status < 0) {
MARS_ERR("receiver thread terminated with status = %d\n", status);
}

2
mars_net.c
View File

@ -321,7 +321,7 @@ int _mars_send_struct(struct socket **sock, void *data, const struct meta *meta,
item = *(void**)item;
len = 0;
if (item)
len = strlen(item);
len = strlen(item) + 1;
break;
case FIELD_REF:
if (!meta->field_ref) {