mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2024-12-25 18:14:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move select_cb list handling to functions (prepare for adding "poll")

Browse Source 
Signed-off-by: goldsimon <goldsimon@gmx.de>
This commit is contained in:
Kalle Olavi Niemitalo 2017-09-21 21:10:08 +02:00 committed by goldsimon
parent 61e0a42cce
commit 983eb8ebb4
1 changed files with 52 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
src/api/sockets.c
View File

@ -1692,6 +1692,55 @@ lwip_writev(int s, const struct iovec *iov, int iovcnt)
return lwip_sendmsg(s, &msg, 0); return lwip_sendmsg(s, &msg, 0);
} }
/* Add select_cb to select_cb_list. */
static void
lwip_link_select_cb(struct lwip_select_cb *select_cb)
{
LWIP_SOCKET_SELECT_DECL_PROTECT(lev);
/* Protect the select_cb_list */
LWIP_SOCKET_SELECT_PROTECT(lev);
/* Put this select_cb on top of list */
select_cb->next = select_cb_list;
if (select_cb_list != NULL) {
select_cb_list->prev = select_cb;
}
select_cb_list = select_cb;
#if !LWIP_TCPIP_CORE_LOCKING
/* Increasing this counter tells select_check_waiters that the list has changed. */
select_cb_ctr++;
#endif
/* Now we can safely unprotect */
LWIP_SOCKET_SELECT_UNPROTECT(lev);
}
/* Remove select_cb from select_cb_list. */
static void
lwip_unlink_select_cb(struct lwip_select_cb *select_cb)
{
LWIP_SOCKET_SELECT_DECL_PROTECT(lev);
/* Take us off the list */
LWIP_SOCKET_SELECT_PROTECT(lev);
if (select_cb->next != NULL) {
select_cb->next->prev = select_cb->prev;
}
if (select_cb_list == select_cb) {
LWIP_ASSERT("select_cb->prev == NULL", select_cb->prev == NULL);
select_cb_list = select_cb->next;
} else {
LWIP_ASSERT("select_cb->prev != NULL", select_cb->prev != NULL);
select_cb->prev->next = select_cb->next;
}
#if !LWIP_TCPIP_CORE_LOCKING
/* Increasing this counter tells select_check_waiters that the list has changed. */
select_cb_ctr++;
#endif
LWIP_SOCKET_SELECT_UNPROTECT(lev);
}
#if LWIP_SOCKET_SELECT #if LWIP_SOCKET_SELECT
/** /**
* Go through the readset and writeset lists and see which socket of the sockets * Go through the readset and writeset lists and see which socket of the sockets
@ -1853,7 +1902,6 @@ lwip_select(int maxfdp1, fd_set *readset, fd_set *writeset, fd_set *exceptset,
fd_set used_sockets; fd_set used_sockets;
#endif #endif
SYS_ARCH_DECL_PROTECT(lev); SYS_ARCH_DECL_PROTECT(lev);
LWIP_SOCKET_SELECT_DECL_PROTECT(lev2);
LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_select(%d, %p, %p, %p, tvsec=%"S32_F" tvusec=%"S32_F")\n", LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_select(%d, %p, %p, %p, tvsec=%"S32_F" tvusec=%"S32_F")\n",
maxfdp1, (void *)readset, (void *) writeset, (void *) exceptset, maxfdp1, (void *)readset, (void *) writeset, (void *) exceptset,
@ -1912,22 +1960,7 @@ lwip_select(int maxfdp1, fd_set *readset, fd_set *writeset, fd_set *exceptset,
} }
#endif /* LWIP_NETCONN_SEM_PER_THREAD */ #endif /* LWIP_NETCONN_SEM_PER_THREAD */
/* Protect the select_cb_list */ lwip_link_select_cb(&API_SELECT_CB_VAR_REF(select_cb));
LWIP_SOCKET_SELECT_PROTECT(lev2);
/* Put this select_cb on top of list */
API_SELECT_CB_VAR_REF(select_cb).next = select_cb_list;
if (select_cb_list != NULL) {
select_cb_list->prev = &API_SELECT_CB_VAR_REF(select_cb);
}
select_cb_list = &API_SELECT_CB_VAR_REF(select_cb);
#if !LWIP_TCPIP_CORE_LOCKING
/* Increasing this counter tells select_check_waiters that the list has changed. */
select_cb_ctr++;
#endif
/* Now we can safely unprotect */
LWIP_SOCKET_SELECT_UNPROTECT(lev2);
/* Increase select_waiting for each socket we are interested in */ /* Increase select_waiting for each socket we are interested in */
maxfdp2 = maxfdp1; maxfdp2 = maxfdp1;
@ -2012,23 +2045,8 @@ lwip_select(int maxfdp1, fd_set *readset, fd_set *writeset, fd_set *exceptset,
SYS_ARCH_UNPROTECT(lev); SYS_ARCH_UNPROTECT(lev);
} }
} }
/* Take us off the list */
LWIP_SOCKET_SELECT_PROTECT(lev2); lwip_unlink_select_cb(&API_SELECT_CB_VAR_REF(select_cb));
if (API_SELECT_CB_VAR_REF(select_cb).next != NULL) {
API_SELECT_CB_VAR_REF(select_cb).next->prev = API_SELECT_CB_VAR_REF(select_cb).prev;
}
if (select_cb_list == &API_SELECT_CB_VAR_REF(select_cb)) {
LWIP_ASSERT("select_cb.prev == NULL", API_SELECT_CB_VAR_REF(select_cb).prev == NULL);
select_cb_list = API_SELECT_CB_VAR_REF(select_cb).next;
} else {
LWIP_ASSERT("select_cb.prev != NULL", API_SELECT_CB_VAR_REF(select_cb).prev != NULL);
API_SELECT_CB_VAR_REF(select_cb).prev->next = API_SELECT_CB_VAR_REF(select_cb).next;
}
#if !LWIP_TCPIP_CORE_LOCKING
/* Increasing this counter tells select_check_waiters that the list has changed. */
select_cb_ctr++;
#endif
LWIP_SOCKET_SELECT_UNPROTECT(lev2);
#if LWIP_NETCONN_SEM_PER_THREAD #if LWIP_NETCONN_SEM_PER_THREAD
if (API_SELECT_CB_VAR_REF(select_cb).sem_signalled && (!waited || (waitres == SYS_ARCH_TIMEOUT))) { if (API_SELECT_CB_VAR_REF(select_cb).sem_signalled && (!waited || (waitres == SYS_ARCH_TIMEOUT))) {