From 6a83cc5d17645fbf7a2efed0a0d4942d3f53cf5a Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Thu, 5 Jun 2014 13:26:38 -0600 Subject: [PATCH] Add iob_freechain --- include/nuttx/net/iob.h | 13 +++++- net/iob/Make.defs | 4 +- net/iob/iob_freechain.c | 101 ++++++++++++++++++++++++++++++++++++++++ net/iob/iob_freeq.c | 2 +- 4 files changed, 116 insertions(+), 4 deletions(-) create mode 100644 net/iob/iob_freechain.c diff --git a/include/nuttx/net/iob.h b/include/nuttx/net/iob.h index 7b69d25ca1..839d78b8bf 100644 --- a/include/nuttx/net/iob.h +++ b/include/nuttx/net/iob.h @@ -123,11 +123,22 @@ FAR struct iob_s *iob_alloc(void); FAR struct iob_s *iob_free(FAR struct iob_s *iob); +/**************************************************************************** + * Name: iob_freechain + * + * Description: + * Free an entire buffer chain, starting at the beginning of the I/O + * buffer chain + * + ****************************************************************************/ + +void iob_freechain(FAR struct iob_s *iob); + /**************************************************************************** * Name: iob_freeq * * Description: - * Free an entire buffer chain + * Free an entire buffer chain, starting at a queue head * ****************************************************************************/ diff --git a/net/iob/Make.defs b/net/iob/Make.defs index 4f9a52c236..f70b7821ac 100644 --- a/net/iob/Make.defs +++ b/net/iob/Make.defs @@ -41,8 +41,8 @@ ifeq ($(CONFIG_NET_IOB),y) # Include IOB src files NET_CSRCS += iob_alloc.c iob_clone.c iob_concat.c iob_copyin.c iob_copyout.c -NET_CSRCS += iob_free.c iob_freeq.c iob_initialize.c iob_pack.c -NET_CSRCS += iob_trimhead.c iob_trimtail.c +NET_CSRCS += iob_free.c iob_freechain.c iob_freeq.c iob_initialize.c +NET_CSRCS += iob_pack.c iob_trimhead.c iob_trimtail.c # Include iob build support diff --git a/net/iob/iob_freechain.c b/net/iob/iob_freechain.c new file mode 100644 index 0000000000..bc66365f72 --- /dev/null +++ b/net/iob/iob_freechain.c @@ -0,0 +1,101 @@ +/**************************************************************************** + * net/iob/iob_freechain.c + * + * Copyright (C) 2014 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * 3. Neither the name NuttX nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include + +#include + +#include + +#include "iob.h" + +/**************************************************************************** + * Pre-processor Definitions + ****************************************************************************/ + +/**************************************************************************** + * Private Types + ****************************************************************************/ + +/**************************************************************************** + * Private Data + ****************************************************************************/ + +/**************************************************************************** + * Public Data + ****************************************************************************/ + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: iob_freechain + * + * Description: + * Free an entire buffer chain, starting at the beginning of the I/O + * buffer chain + * + ****************************************************************************/ + +void iob_freechain(FAR struct iob_s *iob) +{ + FAR sq_entry_t *first = (sq_entry_t *)&iob->io_link; + FAR sq_entry_t *last; + + /* Find the last entry in the I/O buffer list */ + + for (last = first; last->flink; last = last->flink); + + /* If the free list is empty, then just move the I/O buffer chain to the + * free list. Otherwise, append the I/O buffer chain to the end of the + * free list. + */ + + if (g_iob_freelist.tail) + { + g_iob_freelist.tail->flink = first; + } + else + { + g_iob_freelist.head = first; + } + + g_iob_freelist.tail = last; +} diff --git a/net/iob/iob_freeq.c b/net/iob/iob_freeq.c index 5d99c38f6c..12eb8021ec 100644 --- a/net/iob/iob_freeq.c +++ b/net/iob/iob_freeq.c @@ -69,7 +69,7 @@ * Name: iob_freeq * * Description: - * Free an entire buffer chain + * Free an entire buffer chain, starting at a queue head * ****************************************************************************/