abc/lwip
1
0
Fork 0
mirror of https://git.savannah.nongnu.org/git/lwip.git synced 2025-08-07 15:04:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

sockets.c: refactor event_callback() a bit

Browse Source
This commit is contained in:
goldsimon 2017-04-11 20:55:47 +02:00
parent b0af09ec45
commit b6fdb61654
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/api/sockets.c
View File

@ -2006,6 +2006,7 @@ event_callback(struct netconn *conn, enum netconn_evt evt, u16_t len)
int s; int s;
struct lwip_sock *sock; struct lwip_sock *sock;
struct lwip_select_cb *scb; struct lwip_select_cb *scb;
int has_recvevent, has_sendevent, has_errevent;
#if !LWIP_TCPIP_CORE_LOCKING #if !LWIP_TCPIP_CORE_LOCKING
int last_select_cb_ctr; int last_select_cb_ctr;
#endif #endif
@ -2080,7 +2081,12 @@ event_callback(struct netconn *conn, enum netconn_evt evt, u16_t len)
of waiting select calls + 1. This list is expected to be small. */ of waiting select calls + 1. This list is expected to be small. */
/* At this point, SYS_ARCH is still protected! */ /* At this point, SYS_ARCH is still protected! */
#if !LWIP_TCPIP_CORE_LOCKING has_recvevent = sock->rcvevent > 0;
has_sendevent = sock->sendevent != 0;
has_errevent = sock->errevent != 0;
#if LWIP_TCPIP_CORE_LOCKING
SYS_ARCH_UNPROTECT(lev);
#else
again: again:
/* remember the state of select_cb_list to detect changes */ /* remember the state of select_cb_list to detect changes */
last_select_cb_ctr = select_cb_ctr; last_select_cb_ctr = select_cb_ctr;
@ -2090,51 +2096,44 @@ again:
/* semaphore not signalled yet */ /* semaphore not signalled yet */
int do_signal = 0; int do_signal = 0;
/* Test this select call for our socket */ /* Test this select call for our socket */
if (sock->rcvevent > 0) { if (has_recvevent) {
if (scb->readset && FD_ISSET(s, scb->readset)) { if (scb->readset && FD_ISSET(s, scb->readset)) {
do_signal = 1; do_signal = 1;
} }
} }
if (sock->sendevent != 0) { if (has_sendevent) {
if (!do_signal && scb->writeset && FD_ISSET(s, scb->writeset)) { if (!do_signal && scb->writeset && FD_ISSET(s, scb->writeset)) {
do_signal = 1; do_signal = 1;
} }
} }
if (sock->errevent != 0) { if (has_errevent) {
if (!do_signal && scb->exceptset && FD_ISSET(s, scb->exceptset)) { if (!do_signal && scb->exceptset && FD_ISSET(s, scb->exceptset)) {
do_signal = 1; do_signal = 1;
} }
} }
if (do_signal) { if (do_signal) {
scb->sem_signalled = 1; scb->sem_signalled = 1;
#if LWIP_TCPIP_CORE_LOCKING
/* We are called with core lock held, so we can unlock interrupts here
(last_select_cb_ctr is protected by core lock) */
SYS_ARCH_UNPROTECT(lev);
#else
/* Don't call SYS_ARCH_UNPROTECT() before signaling the semaphore, as this might /* Don't call SYS_ARCH_UNPROTECT() before signaling the semaphore, as this might
lead to the select thread taking itself off the list, invalidating the semaphore. */ lead to the select thread taking itself off the list, invalidating the semaphore. */
#endif
sys_sem_signal(SELECT_SEM_PTR(scb->sem)); sys_sem_signal(SELECT_SEM_PTR(scb->sem));
}
}
#if LWIP_TCPIP_CORE_LOCKING #if LWIP_TCPIP_CORE_LOCKING
SYS_ARCH_PROTECT(lev);
#endif
}
} }
#else
/* unlock interrupts with each step */ /* unlock interrupts with each step */
SYS_ARCH_UNPROTECT(lev); SYS_ARCH_UNPROTECT(lev);
/* this makes sure interrupt protection time is short */ /* this makes sure interrupt protection time is short */
SYS_ARCH_PROTECT(lev); SYS_ARCH_PROTECT(lev);
#if !LWIP_TCPIP_CORE_LOCKING
if (last_select_cb_ctr != select_cb_ctr) { if (last_select_cb_ctr != select_cb_ctr) {
/* someone has changed select_cb_list, restart at the beginning */ /* someone has changed select_cb_list, restart at the beginning */
goto again; goto again;
} }
/* remember the state of select_cb_list to detect changes */ /* remember the state of select_cb_list to detect changes */
last_select_cb_ctr = select_cb_ctr; last_select_cb_ctr = select_cb_ctr;
#endif
} }
SYS_ARCH_UNPROTECT(lev); SYS_ARCH_UNPROTECT(lev);
#endif
done_socket(sock); done_socket(sock);
} }
#endif /* LWIP_SOCKET_SELECT */ #endif /* LWIP_SOCKET_SELECT */