RepoMirrors/mars
1
0
Fork 0
mirror of https://github.com/schoebel/mars synced 2025-02-06 07:11:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix socket options

Browse Source
This commit is contained in:
Thomas Schoebel-Theuer 2012-01-18 15:33:39 +01:00 committed by Thomas Schoebel-Theuer
parent e7f3ee69ba
commit f949ca7873
2 changed files with 61 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
mars_net.c
View File

@ -96,33 +96,11 @@ EXPORT_SYMBOL_GPL(mars_create_sockaddr);
static int current_debug_nr = 0; // no locking, just for debugging static int current_debug_nr = 0; // no locking, just for debugging
int mars_create_socket(struct mars_socket *msock, struct sockaddr_storage *addr, bool is_server) static
void _set_socketopts(struct socket *sock)
{ {
struct socket *sock;
struct sockaddr *sockaddr = (void*)addr;
int x_true = 1; int x_true = 1;
int status = -EEXIST; int status;
if (unlikely(atomic_read(&msock->s_count))) {
MARS_WRN("#%d socket already in use\n", msock->s_debug_nr);
goto final;
}
if (unlikely(msock->s_socket)) {
MARS_WRN("#%d socket already open\n", msock->s_debug_nr);
goto final;
}
status = sock_create_kern(AF_INET, SOCK_STREAM, IPPROTO_TCP, &msock->s_socket);
if (unlikely(status < 0)) {
msock->s_socket = NULL;
MARS_WRN("cannot create socket, status = %d\n", status);
goto final;
}
atomic_set(&msock->s_count, 1);
msock->s_debug_nr = ++current_debug_nr;
sock = msock->s_socket;
status = -EINVAL;
CHECK_PTR(sock, done);
/* TODO: improve this by a table-driven approach /* TODO: improve this by a table-driven approach
*/ */
sock->sk->sk_rcvtimeo = sock->sk->sk_sndtimeo = default_tcp_params.tcp_timeout * HZ; sock->sk->sk_rcvtimeo = sock->sk->sk_sndtimeo = default_tcp_params.tcp_timeout * HZ;
@ -146,6 +124,51 @@ int mars_create_socket(struct mars_socket *msock, struct sockaddr_storage *addr,
status = kernel_setsockopt(sock, IPPROTO_TCP, TCP_KEEPIDLE, (char*)&default_tcp_params.tcp_keepidle, sizeof(default_tcp_params.tcp_keepidle)); status = kernel_setsockopt(sock, IPPROTO_TCP, TCP_KEEPIDLE, (char*)&default_tcp_params.tcp_keepidle, sizeof(default_tcp_params.tcp_keepidle));
_check(status); _check(status);
#if 1
{
struct timeval t = {
.tv_sec = default_tcp_params.tcp_timeout,
};
status = kernel_setsockopt(sock, SOL_SOCKET, SO_SNDTIMEO, (char*)&t, sizeof(t));
status = kernel_setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO, (char*)&t, sizeof(t));
_check(status);
}
#endif
#if 0 // do not use for now
if (!do_block && sock->file) { // switch back to blocking mode
sock->file->f_flags &= ~O_NONBLOCK;
}
#endif
}
int mars_create_socket(struct mars_socket *msock, struct sockaddr_storage *addr, bool is_server)
{
struct socket *sock;
struct sockaddr *sockaddr = (void*)addr;
int status = -EEXIST;
if (unlikely(atomic_read(&msock->s_count))) {
MARS_WRN("#%d socket already in use\n", msock->s_debug_nr);
goto final;
}
if (unlikely(msock->s_socket)) {
MARS_WRN("#%d socket already open\n", msock->s_debug_nr);
goto final;
}
status = sock_create_kern(AF_INET, SOCK_STREAM, IPPROTO_TCP, &msock->s_socket);
if (unlikely(status < 0)) {
msock->s_socket = NULL;
MARS_WRN("cannot create socket, status = %d\n", status);
goto final;
}
atomic_set(&msock->s_count, 1);
msock->s_debug_nr = ++current_debug_nr;
sock = msock->s_socket;
CHECK_PTR(sock, done);
_set_socketopts(sock);
if (is_server) { if (is_server) {
status = kernel_bind(sock, sockaddr, sizeof(*sockaddr)); status = kernel_bind(sock, sockaddr, sizeof(*sockaddr));
if (unlikely(status < 0)) { if (unlikely(status < 0)) {
@ -193,12 +216,8 @@ int mars_accept_socket(struct mars_socket *new_msock, struct mars_socket *old_ms
MARS_IO("old#%d status = %d file = %p flags = 0x%x\n", old_msock->s_debug_nr, status, new_socket->file, new_socket->file ? new_socket->file->f_flags : 0); MARS_IO("old#%d status = %d file = %p flags = 0x%x\n", old_msock->s_debug_nr, status, new_socket->file, new_socket->file ? new_socket->file->f_flags : 0);
#if 0 // do not use for now _set_socketopts(new_socket);
if (!do_block && new_socket->file) { // switch back to blocking mode
new_socket->file->f_flags &= ~O_NONBLOCK;
}
#endif
memset(new_msock, 0, sizeof(struct mars_socket)); memset(new_msock, 0, sizeof(struct mars_socket));
new_msock->s_socket = new_socket; new_msock->s_socket = new_socket;
atomic_set(&new_msock->s_count, 1); atomic_set(&new_msock->s_count, 1);

24
sy_old/mars_light.c
View File

@ -1086,20 +1086,18 @@ int peer_thread(void *data)
continue; continue;
} }
if (list_empty(&tmp_list)) { if (likely(!list_empty(&tmp_list))) {
msleep(5000); //MARS_DBG("AHA!!!!!!!!!!!!!!!!!!!!\n");
continue;
traced_lock(&peer->lock, flags);
list_replace_init(&peer->remote_dent_list, &old_list);
list_replace_init(&tmp_list, &peer->remote_dent_list);
traced_unlock(&peer->lock, flags);
mars_free_dent_all(NULL, &old_list);
} }
//MARS_DBG("AHA!!!!!!!!!!!!!!!!!!!!\n");
traced_lock(&peer->lock, flags);
list_replace_init(&peer->remote_dent_list, &old_list);
list_replace_init(&tmp_list, &peer->remote_dent_list);
traced_unlock(&peer->lock, flags);
mars_free_dent_all(NULL, &old_list);
msleep(1000); msleep(1000);
if (!kthread_should_stop()) if (!kthread_should_stop())