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

client: fix socket bundling deadlock

This commit is contained in:
Thomas Schoebel-Theuer 2015-10-14 08:58:04 +02:00 committed by Thomas Schoebel-Theuer
parent 4d6317af21
commit c42bbfec5d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
kernel/mars_client.c
View File

@ -95,6 +95,7 @@ void _kill_channel(struct client_channel *ch)
mars_put_socket(&ch->socket); mars_put_socket(&ch->socket);
} }
ch->recv_error = 0; ch->recv_error = 0;
ch->is_used = false;
ch->is_open = false; ch->is_open = false;
ch->is_connected = false; ch->is_connected = false;
/* Re-Submit any waiting requests /* Re-Submit any waiting requests
@ -191,7 +192,6 @@ void _maintain_bundle(struct client_bundle *bundle)
*/ */
for (i = 0; i < MAX_CLIENT_CHANNELS; i++) { for (i = 0; i < MAX_CLIENT_CHANNELS; i++) {
struct client_channel *ch = &bundle->channel[i]; struct client_channel *ch = &bundle->channel[i];
int status;
if (!ch->is_used || if (!ch->is_used ||
(!ch->recv_error && mars_socket_is_alive(&ch->socket))) (!ch->recv_error && mars_socket_is_alive(&ch->socket)))
@ -199,9 +199,8 @@ void _maintain_bundle(struct client_bundle *bundle)
MARS_DBG("killing channel %d\n", i); MARS_DBG("killing channel %d\n", i);
_kill_channel(ch); _kill_channel(ch);
/* Re-setup including connect optiona is done later.
status = _setup_channel(bundle, i); */
MARS_DBG("setup channel %d status=%d\n", i, status);
} }
} }
@ -787,6 +786,7 @@ static int sender_thread(void *data)
// timeouting is a rather expensive operation, don't do it too often // timeouting is a rather expensive operation, don't do it too often
if (do_timeout) { if (do_timeout) {
do_timeout = false; do_timeout = false;
_maintain_bundle(&output->bundle);
_do_timeout_all(output, false); _do_timeout_all(output, false);
} }