RepoMirrors/mars
1
0
Fork 0
mirror of https://github.com/schoebel/mars synced 2025-04-04 23:39:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

add automatic socket shutdown on errors

Browse Source
This commit is contained in:
Thomas Schoebel-Theuer 2012-01-18 15:31:39 +01:00 committed by Thomas Schoebel-Theuer
parent 2440176bda
commit e7f3ee69ba
5 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mars_client.c
View File

@ -93,6 +93,7 @@ static int _connect(struct client_output *output, const char *str)
MARS_DBG("no socket, status = %d\n", status); MARS_DBG("no socket, status = %d\n", status);
goto really_done; goto really_done;
} }
output->socket.s_shutdown_on_err = true;
output->receiver.thread = kthread_create(receiver_thread, output, "mars_receiver%d", thread_count++); output->receiver.thread = kthread_create(receiver_thread, output, "mars_receiver%d", thread_count++);
if (unlikely(IS_ERR(output->receiver.thread))) { if (unlikely(IS_ERR(output->receiver.thread))) {

4
mars_net.c
View File

@ -345,6 +345,8 @@ int mars_send_raw(struct mars_socket *msock, void *buf, int len, bool cork)
MARS_IO("#%d sent %d\n", msock->s_debug_nr, sent); MARS_IO("#%d sent %d\n", msock->s_debug_nr, sent);
done: done:
if (status < 0 && msock->s_shutdown_on_err)
mars_shutdown_socket(msock);
mars_put_socket(msock); mars_put_socket(msock);
final: final:
return status; return status;
@ -410,6 +412,8 @@ int mars_recv_raw(struct mars_socket *msock, void *buf, int minlen, int maxlen)
status = done; status = done;
err: err:
if (status < 0 && msock->s_shutdown_on_err)
mars_shutdown_socket(msock);
mars_put_socket(msock); mars_put_socket(msock);
final: final:
return status; return status;

1
mars_net.h
View File

@ -19,6 +19,7 @@ struct mars_socket {
atomic_t s_count; atomic_t s_count;
int s_debug_nr; int s_debug_nr;
bool s_dead; bool s_dead;
bool s_shutdown_on_err;
}; };
struct mars_tcp_params { struct mars_tcp_params {

1
mars_server.c
View File

@ -596,6 +596,7 @@ static int _server_thread(void *data)
msleep(2000); msleep(2000);
continue; continue;
} }
brick->handler_socket.s_shutdown_on_err = true;
MARS_DBG("got new connection #%d\n", brick->handler_socket.s_debug_nr); MARS_DBG("got new connection #%d\n", brick->handler_socket.s_debug_nr);

1
sy_old/mars_light.c
View File

@ -1053,6 +1053,7 @@ int peer_thread(void *data)
msleep(5000); msleep(5000);
continue; continue;
} }
peer->socket.s_shutdown_on_err = true;
MARS_DBG("successfully opened socket to '%s'\n", real_peer); MARS_DBG("successfully opened socket to '%s'\n", real_peer);
msleep(100); msleep(100);
continue; continue;