libs/rt-thread
libs
/
rt-thread
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3030 from enkiller/pr 

[components][net][sal]修复多线程访问创建相同fd的问题
This commit is contained in:
Bernard Xiong 2019-09-05 08:04:13 +08:00 committed by GitHub
parent 03f8762e28 4219eb7fc3
commit 30c43a098a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 67 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
components/net/sal_socket/src/sal_socket.c
View File

@ -148,7 +148,7 @@ static void check_netdev_internet_up_work(struct rt_work *work, void *work_data)
char send_data[SAL_INTERNET_BUFF_LEN], recv_data = 0;
struct rt_delayed_work *delay_work = (struct rt_delayed_work *)work;
const char month[][SAL_INTERNET_MONTH_LEN] = {"Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"};
const char month[][SAL_INTERNET_MONTH_LEN] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
char date[SAL_INTERNET_DATE_LEN];
int moth_num = 0;
@ -175,7 +175,7 @@ static void check_netdev_internet_up_work(struct rt_work *work, void *work_data)
}
skt_ops = pf->skt_ops;
if((sockfd = skt_ops->socket(AF_INET, SOCK_DGRAM, 0)) < 0)
if ((sockfd = skt_ops->socket(AF_INET, SOCK_DGRAM, 0)) < 0)
{
result = -RT_ERROR;
goto __exit;
@ -316,10 +316,7 @@ struct sal_socket *sal_get_socket(int socket)
socket = socket - SAL_SOCKET_OFFSET;
/* check socket structure valid or not */
if (st->sockets[socket]->magic != SAL_SOCKET_MAGIC)
{
return RT_NULL;
}
RT_ASSERT(st->sockets[socket]->magic == SAL_SOCKET_MAGIC);
return st->sockets[socket];
}
@ -376,7 +373,8 @@ int sal_netdev_cleanup(struct netdev *netdev)
{
rt_thread_mdelay(rt_tick_from_millisecond(100));
}
} while (find_dev);
}
while (find_dev);
return 0;
}
@ -452,8 +450,7 @@ static int socket_alloc(struct sal_socket_table *st, int f_socket)
/* find an empty socket entry */
for (idx = f_socket; idx < (int) st->max_socket; idx++)
{
if (st->sockets[idx] == RT_NULL ||
st->sockets[idx]->netdev == RT_NULL)
if (st->sockets[idx] == RT_NULL)
{
break;
}
@ -497,6 +494,15 @@ __result:
return idx;
}
static void socket_free(struct sal_socket_table *st, int idx)
{
struct sal_socket *sock;
sock = st->sockets[idx];
st->sockets[idx] = RT_NULL;
rt_free(sock);
}
static int socket_new(void)
{
struct sal_socket *sock;
@ -529,6 +535,26 @@ __result:
return idx + SAL_SOCKET_OFFSET;
}
static void socket_delete(int socket)
{
struct sal_socket *sock;
struct sal_socket_table *st = &socket_table;
int idx;
idx = socket - SAL_SOCKET_OFFSET;
if (idx < 0 || idx >= (int) st->max_socket)
{
return;
}
sal_lock();
sock = sal_get_socket(socket);
RT_ASSERT(sock != RT_NULL);
sock->magic = 0;
sock->netdev = RT_NULL;
socket_free(st, idx);
sal_unlock();
}
int sal_accept(int socket, struct sockaddr *addr, socklen_t *addrlen)
{
int new_socket;
@ -550,18 +576,20 @@ int sal_accept(int socket, struct sockaddr *addr, socklen_t *addrlen)
/* allocate a new socket structure and registered socket options */
new_sal_socket = socket_new();
if (new_sal_socket < 0)
new_sock = sal_get_socket(new_sal_socket);
if (new_sock == RT_NULL)
{
pf->skt_ops->closesocket(new_socket);
return -1;
}
new_sock = sal_get_socket(new_sal_socket);
retval = socket_init(sock->domain, sock->type, sock->protocol, &new_sock);
if (retval < 0)
{
pf->skt_ops->closesocket(new_socket);
rt_memset(new_sock, 0x00, sizeof(struct sal_socket));
/* socket init failed, delete socket */
socket_delete(new_sal_socket);
LOG_E("New socket registered failed, return error %d.", retval);
return -1;
}
@ -673,9 +701,8 @@ int sal_shutdown(int socket, int how)
error = -1;
}
/* free socket */
rt_free(sock);
socket_table.sockets[socket] = RT_NULL;
/* delete socket */
socket_delete(socket);
return error;
}
@ -907,6 +934,7 @@ int sal_socket(int domain, int type, int protocol)
if (retval < 0)
{
LOG_E("SAL socket protocol family input failed, return error %d.", retval);
socket_delete(socket);
return -1;
}
@ -922,6 +950,7 @@ int sal_socket(int domain, int type, int protocol)
sock->user_data_tls = proto_tls->ops->socket(socket);
if (sock->user_data_tls == RT_NULL)
{
socket_delete(socket);
return -1;
}
}
@ -964,9 +993,8 @@ int sal_closesocket(int socket)
error = -1;
}
/* free socket */
rt_free(sock);
socket_table.sockets[socket] = RT_NULL;
/* delete socket */
socket_delete(socket);
return error;
}