mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2024-10-04 05:39:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added define LWIP_TCPIP_CORE_LOCKING_INPUT that lets tcpip_input omit the thread-change to tcpip_thread and instead lock the core

Browse Source
This commit is contained in:
goldsimon 2010-02-21 12:38:08 +00:00
parent 1d8538bca4
commit db38ee6630
2 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/api/tcpip.c
View File

@ -94,6 +94,7 @@ tcpip_thread(void *arg)
break; break;
#endif /* LWIP_NETCONN */ #endif /* LWIP_NETCONN */
#if LWIP_TCPIP_CORE_LOCKING_INPUT
case TCPIP_MSG_INPKT: case TCPIP_MSG_INPKT:
LWIP_DEBUGF(TCPIP_DEBUG, ("tcpip_thread: PACKET %p\n", (void *)msg)); LWIP_DEBUGF(TCPIP_DEBUG, ("tcpip_thread: PACKET %p\n", (void *)msg));
#if LWIP_ETHERNET #if LWIP_ETHERNET
@ -101,10 +102,12 @@ tcpip_thread(void *arg)
ethernet_input(msg->msg.inp.p, msg->msg.inp.netif); ethernet_input(msg->msg.inp.p, msg->msg.inp.netif);
} else } else
#endif /* LWIP_ETHERNET */ #endif /* LWIP_ETHERNET */
{ ip_input(msg->msg.inp.p, msg->msg.inp.netif); {
ip_input(msg->msg.inp.p, msg->msg.inp.netif);
} }
memp_free(MEMP_TCPIP_MSG_INPKT, msg); memp_free(MEMP_TCPIP_MSG_INPKT, msg);
break; break;
#endif /* LWIP_TCPIP_CORE_LOCKING_INPUT */
#if LWIP_NETIF_API #if LWIP_NETIF_API
case TCPIP_MSG_NETIFAPI: case TCPIP_MSG_NETIFAPI:
@ -131,6 +134,8 @@ tcpip_thread(void *arg)
break; break;
default: default:
LWIP_DEBUGF(TCPIP_DEBUG, ("tcpip_thread: invalid message: %d\n", msg->type));
LWIP_ASSERT("tcpip_thread: invalid message", 0);
break; break;
} }
} }
@ -147,6 +152,21 @@ tcpip_thread(void *arg)
err_t err_t
tcpip_input(struct pbuf *p, struct netif *inp) tcpip_input(struct pbuf *p, struct netif *inp)
{ {
#if LWIP_TCPIP_CORE_LOCKING_INPUT
err_t ret;
LWIP_DEBUGF(TCPIP_DEBUG, ("tcpip_input: PACKET %p/%p\n", (void *)p, (void *)inp));
LOCK_TCPIP_CORE();
#if LWIP_ETHERNET
if (inp->flags & (NETIF_FLAG_ETHARP | NETIF_FLAG_ETHERNET)) {
ret = ethernet_input(p, inp);
} else
#endif /* LWIP_ETHERNET */
{
ret = ip_input(p, inp);
}
UNLOCK_TCPIP_CORE();
return ret;
#else /* LWIP_TCPIP_CORE_LOCKING_INPUT */
struct tcpip_msg *msg; struct tcpip_msg *msg;
if (sys_mbox_valid(&mbox)) { if (sys_mbox_valid(&mbox)) {
@ -165,6 +185,7 @@ tcpip_input(struct pbuf *p, struct netif *inp)
return ERR_OK; return ERR_OK;
} }
return ERR_VAL; return ERR_VAL;
#endif /* LWIP_TCPIP_CORE_LOCKING_INPUT */
} }
/** /**

8
src/include/lwip/opt.h
View File

@ -1271,6 +1271,14 @@
#define LWIP_TCPIP_CORE_LOCKING 0 #define LWIP_TCPIP_CORE_LOCKING 0
#endif #endif
/**
* LWIP_TCPIP_CORE_LOCKING_INPUT: (EXPERIMENTAL!)
* Don't use it if you're not an active lwIP project member
*/
#ifndef LWIP_TCPIP_CORE_LOCKING_INPUT
#define LWIP_TCPIP_CORE_LOCKING_INPUT 0
#endif
/** /**
* LWIP_NETCONN==1: Enable Netconn API (require to use api_lib.c) * LWIP_NETCONN==1: Enable Netconn API (require to use api_lib.c)
*/ */