luchianmihai/walnux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

net/devif_callback: add support for CONFIG_NET_ALLOC_CONNS

Browse source 
Signed-off-by: chao.an <anchao@xiaomi.com>
This commit is contained in:
chao.an 2022-01-01 22:05:07 +08:00 • committed by Xiang Xiao
parent 3b490d4e3a
commit f345f3dc2e
2 changed files with 30 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
net/devif/devif_callback.c
View file

@ -31,6 +31,7 @@
#include <debug.h> #include <debug.h>
#include <assert.h> #include <assert.h>
#include <nuttx/kmalloc.h>
#include <nuttx/net/netconfig.h> #include <nuttx/net/netconfig.h>
#include <nuttx/net/net.h> #include <nuttx/net/net.h>
#include <nuttx/net/netdev.h> #include <nuttx/net/netdev.h>
@ -42,7 +43,9 @@
* Private Data * Private Data
****************************************************************************/ ****************************************************************************/
#ifndef CONFIG_NET_ALLOC_CONNS
static struct devif_callback_s g_cbprealloc[CONFIG_NET_NACTIVESOCKETS]; static struct devif_callback_s g_cbprealloc[CONFIG_NET_NACTIVESOCKETS];
#endif
static FAR struct devif_callback_s *g_cbfreelist = NULL; static FAR struct devif_callback_s *g_cbfreelist = NULL;
/**************************************************************************** /****************************************************************************
@ -227,6 +230,7 @@ static bool devif_event_trigger(uint16_t events, uint16_t triggers)
void devif_callback_init(void) void devif_callback_init(void)
{ {
#ifndef CONFIG_NET_ALLOC_CONNS
int i; int i;
for (i = 0; i < CONFIG_NET_NACTIVESOCKETS; i++) for (i = 0; i < CONFIG_NET_NACTIVESOCKETS; i++)
@ -234,6 +238,7 @@ void devif_callback_init(void)
g_cbprealloc[i].nxtconn = g_cbfreelist; g_cbprealloc[i].nxtconn = g_cbfreelist;
g_cbfreelist = &g_cbprealloc[i]; g_cbfreelist = &g_cbprealloc[i];
} }
#endif
} }
/**************************************************************************** /****************************************************************************
@ -258,11 +263,33 @@ FAR struct devif_callback_s *
FAR struct devif_callback_s **list_tail) FAR struct devif_callback_s **list_tail)
{ {
FAR struct devif_callback_s *ret; FAR struct devif_callback_s *ret;
#ifdef CONFIG_NET_ALLOC_CONNS
int i;
#endif
net_lock();
/* Allocate the callback entry from heap */
#ifdef CONFIG_NET_ALLOC_CONNS
if (g_cbfreelist == NULL)
{
ret = kmm_zalloc(sizeof(struct devif_callback_s) *
CONFIG_NET_NACTIVESOCKETS);
if (ret != NULL)
{
for (i = 0; i < CONFIG_NET_NACTIVESOCKETS; i++)
{
ret[i].nxtconn = g_cbfreelist;
g_cbfreelist = &ret[i];
}
}
}
#endif
/* Check the head of the free list */ /* Check the head of the free list */
net_lock(); ret = g_cbfreelist;
ret = g_cbfreelist;
if (ret) if (ret)
{ {
/* Remove the next instance from the head of the free list */ /* Remove the next instance from the head of the free list */

1
net/udp/udp_conn.c
View file

@ -55,6 +55,7 @@
#include <arch/irq.h> #include <arch/irq.h>
#include <nuttx/clock.h> #include <nuttx/clock.h>
#include <nuttx/kmalloc.h>
#include <nuttx/semaphore.h> #include <nuttx/semaphore.h>
#include <nuttx/net/netconfig.h> #include <nuttx/net/netconfig.h>
#include <nuttx/net/net.h> #include <nuttx/net/net.h>