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

Change from doubly- to singly-linked lists

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1297 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2008-11-21 12:47:36 +00:00
parent c5a9c36751
commit 55bdcc37ab
2 changed files with 32 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/net/uip/uip-tcp.h
View File

@ -231,14 +231,14 @@ struct uip_readahead_s
#ifdef CONFIG_NET_TCPBACKLOG
struct uip_blcontainer_s
{
dq_entry_t bc_node; /* Implements a doubly linked list */
sq_entry_t bc_node; /* Implements a singly linked list */
FAR struct uip_conn *bc_conn; /* Holds reference to the new connection structure */
};
struct uip_backlog_s
{
dq_queue_t bl_free; /* Implements a doubly-linked list of free containers */
dq_queue_t bl_pending; /* Implements a doubly-linked list of pending connections */
sq_queue_t bl_free; /* Implements a singly-linked list of free containers */
sq_queue_t bl_pending; /* Implements a singly-linked list of pending connections */
};
#endif

39
net/uip/uip-tcpbacklog.c
View File

@ -125,7 +125,7 @@ int uip_backlogcreate(FAR struct uip_conn *conn, int nblg)
blc = (FAR struct uip_blcontainer_s*)(((FAR ubyte*)bls) + offset);
for (i = 0; i < nblg; i++)
{
dq_addfirst(&blc->bc_node, &bls->bl_free);
sq_addfirst(&blc->bc_node, &bls->bl_free);
}
}
@ -187,7 +187,7 @@ int uip_backlogdestroy(FAR struct uip_conn *conn)
/* Handle any pending connections in the backlog */
while ((blc = (FAR struct uip_blcontainer_s*)dq_remfirst(&blg->bl_pending)) != NULL)
while ((blc = (FAR struct uip_blcontainer_s*)sq_remfirst(&blg->bl_pending)) != NULL)
{
blconn = blc->bc_conn;
if (blconn)
@ -241,7 +241,7 @@ int uip_backlogadd(FAR struct uip_conn *conn, FAR struct uip_conn *blconn)
{
/* Allocate a container for the connection from the free list */
blc = (FAR struct uip_blcontainer_s *)dq_remfirst(&bls->bl_free);
blc = (FAR struct uip_blcontainer_s *)sq_remfirst(&bls->bl_free);
if (!blc)
{
ndbg("Failed to allocate container\n");
@ -254,7 +254,7 @@ int uip_backlogadd(FAR struct uip_conn *conn, FAR struct uip_conn *blconn)
*/
blc->bc_conn = blconn;
dq_addlast(&blc->bc_node, &bls->bl_pending);
sq_addlast(&blc->bc_node, &bls->bl_pending);
ret = OK;
}
}
@ -293,7 +293,7 @@ struct uip_conn *uip_backlogremove(FAR struct uip_conn *conn)
* (FIFO)
*/
blc = (FAR struct uip_blcontainer_s *)dq_remfirst(&bls->bl_pending);
blc = (FAR struct uip_blcontainer_s *)sq_remfirst(&bls->bl_pending);
if (blc)
{
/* Extract the connection reference from the container and put
@ -302,7 +302,7 @@ struct uip_conn *uip_backlogremove(FAR struct uip_conn *conn)
blconn = blc->bc_conn;
blc->bc_conn = NULL;
dq_addlast(&blc->bc_node, &bls->bl_free);
sq_addlast(&blc->bc_node, &bls->bl_free);
}
}
@ -327,6 +327,7 @@ int uip_backlogdelete(FAR struct uip_conn *conn, FAR struct uip_conn *blconn)
{
FAR struct uip_backlog_s *bls;
FAR struct uip_blcontainer_s *blc;
FAR struct uip_blcontainer_s *prev;
nvdbg("conn=%p blconn=%p\n", conn, blconn);
@ -342,15 +343,33 @@ int uip_backlogdelete(FAR struct uip_conn *conn, FAR struct uip_conn *blconn)
{
/* Find the container hold the connection */
for (blc = (FAR struct uip_blcontainer_s *)dq_peek(&bls->bl_pending);
for (blc = (FAR struct uip_blcontainer_s *)sq_peek(&bls->bl_pending), prev = NULL;
blc;
blc = (FAR struct uip_blcontainer_s *)dq_next(&blc->bc_node))
prev = blc, blc = (FAR struct uip_blcontainer_s *)sq_next(&blc->bc_node))
{
if (blc->bc_conn == blconn)
{
/* Remove the a container from the list of pending connections */
if (prev)
{
/* Remove the a container from the middle of the list of
* pending connections
*/
dq_rem(&blc->bc_node, &bls->bl_pending);
(void)sq_remafter(&prev->bc_node, &bls->bl_pending);
}
else
{
/* Remove the a container from the head of the list of
* pending connections
*/
(void)sq_remfirst(&bls->bl_pending);
}
/* Put container in the free list */
blc->bc_conn = NULL;
sq_addlast(&blc->bc_node, &bls->bl_free);
return OK;
}
}