sergiotarxz/nuttx
sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

net/usrsock: replace the common connect prologue

Browse Source 
Signed-off-by: chao.an <anchao@xiaomi.com>
This commit is contained in:
chao.an 2022-02-07 11:24:38 +08:00 committed by Alan Carvalho de Assis
parent 69c4f6651e
commit f7bf28deac
4 changed files with 15 additions and 20 deletions

9
net/usrsock/usrsock.h

@ -83,14 +83,7 @@ struct usrsock_conn_s
{ {
/* Common prologue of all connection structures. */ /* Common prologue of all connection structures. */
dq_entry_t node; /* Supports a doubly linked list */ struct socket_conn_s sconn;
/* This is a list of usrsock callbacks. Each callback represents a thread
* that is stalled, waiting for a specific event.
*/
FAR struct devif_callback_s *list; /* Usersock callbacks */
FAR struct devif_callback_s *list_tail;
/* usrsock-specific content follows */ /* usrsock-specific content follows */

18
net/usrsock/usrsock_conn.c

@ -112,7 +112,7 @@ FAR struct usrsock_conn_s *usrsock_alloc(void)
{ {
for (i = 0; i < CONFIG_NET_USRSOCK_CONNS; i++) for (i = 0; i < CONFIG_NET_USRSOCK_CONNS; i++)
{ {
dq_addlast(&conn[i].node, &g_free_usrsock_connections); dq_addlast(&conn[i].sconn.node, &g_free_usrsock_connections);
} }
} }
} }
@ -130,7 +130,7 @@ FAR struct usrsock_conn_s *usrsock_alloc(void)
/* Enqueue the connection into the active list */ /* Enqueue the connection into the active list */
dq_addlast(&conn->node, &g_active_usrsock_connections); dq_addlast(&conn->sconn.node, &g_active_usrsock_connections);
} }
_usrsock_semgive(&g_free_sem); _usrsock_semgive(&g_free_sem);
@ -156,7 +156,7 @@ void usrsock_free(FAR struct usrsock_conn_s *conn)
/* Remove the connection from the active list */ /* Remove the connection from the active list */
dq_rem(&conn->node, &g_active_usrsock_connections); dq_rem(&conn->sconn.node, &g_active_usrsock_connections);
/* Reset structure */ /* Reset structure */
@ -165,7 +165,7 @@ void usrsock_free(FAR struct usrsock_conn_s *conn)
/* Free the connection */ /* Free the connection */
dq_addlast(&conn->node, &g_free_usrsock_connections); dq_addlast(&conn->sconn.node, &g_free_usrsock_connections);
_usrsock_semgive(&g_free_sem); _usrsock_semgive(&g_free_sem);
} }
@ -188,7 +188,7 @@ FAR struct usrsock_conn_s *usrsock_nextconn(FAR struct usrsock_conn_s *conn)
} }
else else
{ {
return (FAR struct usrsock_conn_s *)conn->node.flink; return (FAR struct usrsock_conn_s *)conn->sconn.node.flink;
} }
} }
@ -237,7 +237,8 @@ int usrsock_setup_request_callback(FAR struct usrsock_conn_s *conn,
/* Set up the callback in the connection */ /* Set up the callback in the connection */
pstate->cb = devif_callback_alloc(NULL, &conn->list, &conn->list_tail); pstate->cb = devif_callback_alloc(NULL, &conn->sconn.list,
&conn->sconn.list_tail);
if (pstate->cb) if (pstate->cb)
{ {
/* Take a lock since only one outstanding request is allowed */ /* Take a lock since only one outstanding request is allowed */
@ -291,7 +292,8 @@ void usrsock_teardown_request_callback(FAR struct usrsock_reqstate_s *pstate)
/* Make sure that no further events are processed */ /* Make sure that no further events are processed */
devif_conn_callback_free(NULL, pstate->cb, &conn->list, &conn->list_tail); devif_conn_callback_free(NULL, pstate->cb, &conn->sconn.list,
&conn->sconn.list_tail);
nxsem_destroy(&pstate->recvsem); nxsem_destroy(&pstate->recvsem);
pstate->cb = NULL; pstate->cb = NULL;
@ -348,7 +350,7 @@ void usrsock_initialize(void)
conn->usockid = -1; conn->usockid = -1;
conn->state = USRSOCK_CONN_STATE_UNINITIALIZED; conn->state = USRSOCK_CONN_STATE_UNINITIALIZED;
dq_addlast(&conn->node, &g_free_usrsock_connections); dq_addlast(&conn->sconn.node, &g_free_usrsock_connections);
} }
#endif #endif

2
net/usrsock/usrsock_event.c

@ -110,7 +110,7 @@ int usrsock_event(FAR struct usrsock_conn_s *conn, uint16_t events)
/* Send events to callbacks */ /* Send events to callbacks */
devif_conn_event(NULL, conn, events, conn->list); devif_conn_event(NULL, conn, events, conn->sconn.list);
net_unlock(); net_unlock();
return OK; return OK;

6
net/usrsock/usrsock_poll.c

@ -172,7 +172,7 @@ static int usrsock_pollsetup(FAR struct socket *psock,
/* Allocate a usrsock callback structure */ /* Allocate a usrsock callback structure */
cb = devif_callback_alloc(NULL, &conn->list, &conn->list_tail); cb = devif_callback_alloc(NULL, &conn->sconn.list, &conn->sconn.list_tail);
if (cb == NULL) if (cb == NULL)
{ {
ret = -EBUSY; ret = -EBUSY;
@ -318,8 +318,8 @@ static int usrsock_pollteardown(FAR struct socket *psock,
devif_conn_callback_free(NULL, devif_conn_callback_free(NULL,
info->cb, info->cb,
&conn->list, &conn->sconn.list,
&conn->list_tail); &conn->sconn.list_tail);
/* Release the poll/select data slot */ /* Release the poll/select data slot */