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

fix hang of callback thread in server

This commit is contained in:
Thomas Schoebel-Theuer 2012-01-26 11:33:16 +01:00 committed by Thomas Schoebel-Theuer
parent f28d439dfb
commit 0e21a911a2
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
mars_server.c
View File

@ -31,6 +31,7 @@ int cb_thread(void *data)
{ {
struct server_brick *brick = data; struct server_brick *brick = data;
struct mars_socket *sock = &brick->handler_socket; struct mars_socket *sock = &brick->handler_socket;
bool aborted = false;
bool ok = mars_get_socket(sock); bool ok = mars_get_socket(sock);
int status = -EINVAL; int status = -EINVAL;
@ -50,9 +51,8 @@ int cb_thread(void *data)
wait_event_interruptible_timeout( wait_event_interruptible_timeout(
brick->cb_event, brick->cb_event,
!list_empty(&brick->cb_read_list) || !list_empty(&brick->cb_read_list) ||
!list_empty(&brick->cb_write_list) || !list_empty(&brick->cb_write_list),
kthread_should_stop(), 1 * HZ);
3 * HZ);
traced_lock(&brick->cb_lock, flags); traced_lock(&brick->cb_lock, flags);
tmp = brick->cb_write_list.next; tmp = brick->cb_write_list.next;
@ -60,6 +60,7 @@ int cb_thread(void *data)
tmp = brick->cb_read_list.next; tmp = brick->cb_read_list.next;
if (tmp == &brick->cb_read_list) { if (tmp == &brick->cb_read_list) {
traced_unlock(&brick->cb_lock, flags); traced_unlock(&brick->cb_lock, flags);
msleep(1000 / HZ);
continue; continue;
} }
} }
@ -76,20 +77,15 @@ int cb_thread(void *data)
up(&brick->socket_sem); up(&brick->socket_sem);
err: err:
if (unlikely(status < 0)) { if (unlikely(status < 0) && !aborted) {
aborted = true;
MARS_WRN("cannot send response, status = %d\n", status); MARS_WRN("cannot send response, status = %d\n", status);
#if 0 // THINK: not sure whether we need this at all. The _client_ should be responsible for resending any lost operations. Disable this for the next future. /* Just shutdown the socket and forget all pending
traced_lock(&brick->cb_lock, flags); * requests.
if (mref->ref_rw) { * The _client_ is responsible for resending
list_add(tmp, &brick->cb_write_list); * any lost operations.
} else { */
list_add(tmp, &brick->cb_read_list);
}
traced_unlock(&brick->cb_lock, flags);
continue;
#else
mars_shutdown_socket(sock); mars_shutdown_socket(sock);
#endif
} }
GENERIC_INPUT_CALL(brick->inputs[0], mref_put, mref); GENERIC_INPUT_CALL(brick->inputs[0], mref_put, mref);