From patchwork Wed Jan 21 15:15:39 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petri Savolainen X-Patchwork-Id: 43456 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f72.google.com (mail-la0-f72.google.com [209.85.215.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id C4AAF218DB for ; Wed, 21 Jan 2015 15:18:10 +0000 (UTC) Received: by mail-la0-f72.google.com with SMTP id gq15sf826928lab.3 for ; Wed, 21 Jan 2015 07:18:09 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:subject:precedence:list-id:list-unsubscribe:list-archive :list-post:list-help:list-subscribe:mime-version:content-type :content-transfer-encoding:errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=eddL7flRCXiDVpYwLRp67VNPL/+XCl/HlE0zGBa5iOs=; b=QMwy02CWmN9EO69vm90S2gfgXmREvrS8yxBOMlFposy2IJFUF8xNVgNlWNiS9+nU+P ATeKNnp8cGBfOK0E9eveqPUzbo0mLDslXl5QehFKTM43GQBwRCmlxGzFbtKedNjhbGAj SirkFUltO/63owm9euuVDRS2FannTQd2Hv/NkbNyOqM/ScQ6LOLrr34eKvxsgu7VXFaH gG5Exc5SqOfY8jSm8lc9xCH808Q0n8LcICHtW/psyWGtNkyRzU77V420M9qi7IA8yGX8 3kExGsJAneIoq0Yq50gsLzeHJ2OQX6bWbgVhMx1mDuqeu574nEQf8KMkzojEw9PBkekj fheA== X-Gm-Message-State: ALoCoQmH7pCJrFXrrULjU6cTD6PUBfhdhH03rkyV8wu0k8/vZbDSssuu/SNCP2dSuKvztnACy57B X-Received: by 10.194.86.1 with SMTP id l1mr3810338wjz.0.1421853489755; Wed, 21 Jan 2015 07:18:09 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.36.100 with SMTP id p4ls53903laj.24.gmail; Wed, 21 Jan 2015 07:18:09 -0800 (PST) X-Received: by 10.112.90.170 with SMTP id bx10mr44676212lbb.69.1421853489586; Wed, 21 Jan 2015 07:18:09 -0800 (PST) Received: from mail-lb0-f177.google.com (mail-lb0-f177.google.com. [209.85.217.177]) by mx.google.com with ESMTPS id bn7si18108077lbc.124.2015.01.21.07.18.09 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 21 Jan 2015 07:18:09 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.177 as permitted sender) client-ip=209.85.217.177; Received: by mail-lb0-f177.google.com with SMTP id p9so16463730lbv.8 for ; Wed, 21 Jan 2015 07:18:09 -0800 (PST) X-Received: by 10.152.43.103 with SMTP id v7mr44908999lal.29.1421853489431; Wed, 21 Jan 2015 07:18:09 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.9.200 with SMTP id c8csp1810400lbb; Wed, 21 Jan 2015 07:18:08 -0800 (PST) X-Received: by 10.140.86.99 with SMTP id o90mr64353936qgd.21.1421853487044; Wed, 21 Jan 2015 07:18:07 -0800 (PST) Received: from ip-10-35-177-41.ec2.internal (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTPS id w5si4936993qad.21.2015.01.21.07.18.05 (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 21 Jan 2015 07:18:07 -0800 (PST) Received-SPF: none (google.com: lng-odp-bounces@lists.linaro.org does not designate permitted sender hosts) client-ip=54.225.227.206; Received: from localhost ([127.0.0.1] helo=ip-10-35-177-41.ec2.internal) by ip-10-35-177-41.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1YDx2h-00086m-0f; Wed, 21 Jan 2015 15:18:03 +0000 Received: from mail-qc0-f171.google.com ([209.85.216.171]) by ip-10-35-177-41.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1YDx2B-0007xX-0m for lng-odp@lists.linaro.org; Wed, 21 Jan 2015 15:17:31 +0000 Received: by mail-qc0-f171.google.com with SMTP id s11so17593866qcv.2 for ; Wed, 21 Jan 2015 07:17:25 -0800 (PST) X-Received: by 10.140.32.166 with SMTP id h35mr38236658qgh.22.1421853445834; Wed, 21 Jan 2015 07:17:25 -0800 (PST) Received: from mcpro03.emea.nsn-net.net (ec2-23-23-178-99.compute-1.amazonaws.com. [23.23.178.99]) by mx.google.com with ESMTPSA id 91sm415056qgf.1.2015.01.21.07.17.23 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 21 Jan 2015 07:17:24 -0800 (PST) From: Petri Savolainen To: lng-odp@lists.linaro.org Date: Wed, 21 Jan 2015 17:15:39 +0200 Message-Id: <1421853343-22138-13-git-send-email-petri.savolainen@linaro.org> X-Mailer: git-send-email 2.2.2 In-Reply-To: <1421853343-22138-1-git-send-email-petri.savolainen@linaro.org> References: <1421853343-22138-1-git-send-email-petri.savolainen@linaro.org> X-Topics: patch Subject: [lng-odp] [PATCH v3 12/16] api: buffer_pool: Rename odp_buffer_pool.h to odp_pool.h X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Errors-To: lng-odp-bounces@lists.linaro.org Sender: lng-odp-bounces@lists.linaro.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: petri.savolainen@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.177 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 Renamed pool API header file. Signed-off-by: Petri Savolainen --- platform/linux-generic/Makefile.am | 2 +- platform/linux-generic/include/api/odp.h | 2 +- .../linux-generic/include/api/odp_buffer_pool.h | 182 --------------------- .../linux-generic/include/api/odp_classification.h | 2 +- platform/linux-generic/include/api/odp_crypto.h | 2 +- platform/linux-generic/include/api/odp_packet_io.h | 2 +- platform/linux-generic/include/api/odp_pool.h | 182 +++++++++++++++++++++ .../linux-generic/include/odp_buffer_internal.h | 2 +- .../include/odp_buffer_pool_internal.h | 2 +- platform/linux-generic/include/odp_packet_socket.h | 2 +- platform/linux-generic/odp_buffer_pool.c | 2 +- platform/linux-generic/odp_event.c | 2 +- platform/linux-generic/odp_schedule.c | 2 +- platform/linux-generic/odp_timer.c | 2 +- 14 files changed, 194 insertions(+), 194 deletions(-) delete mode 100644 platform/linux-generic/include/api/odp_buffer_pool.h create mode 100644 platform/linux-generic/include/api/odp_pool.h diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 712d75c..6bf940c 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -11,7 +11,7 @@ include_HEADERS = \ $(top_srcdir)/platform/linux-generic/include/api/odp_atomic.h \ $(top_srcdir)/platform/linux-generic/include/api/odp_barrier.h \ $(top_srcdir)/platform/linux-generic/include/api/odp_buffer.h \ - $(top_srcdir)/platform/linux-generic/include/api/odp_buffer_pool.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp_pool.h \ $(top_srcdir)/platform/linux-generic/include/api/odp_byteorder.h \ $(top_srcdir)/platform/linux-generic/include/api/odp_classification.h \ $(top_srcdir)/platform/linux-generic/include/api/odp_compiler.h \ diff --git a/platform/linux-generic/include/api/odp.h b/platform/linux-generic/include/api/odp.h index 49357b0..2a4075f 100644 --- a/platform/linux-generic/include/api/odp.h +++ b/platform/linux-generic/include/api/odp.h @@ -36,7 +36,7 @@ extern "C" { #include #include #include -#include +#include #include #include #include diff --git a/platform/linux-generic/include/api/odp_buffer_pool.h b/platform/linux-generic/include/api/odp_buffer_pool.h deleted file mode 100644 index 5c771f4..0000000 --- a/platform/linux-generic/include/api/odp_buffer_pool.h +++ /dev/null @@ -1,182 +0,0 @@ -/* Copyright (c) 2013, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - - -/** - * @file - * - * ODP buffer pool - */ - -#ifndef ODP_BUFFER_POOL_H_ -#define ODP_BUFFER_POOL_H_ - -#ifdef __cplusplus -extern "C" { -#endif - - - -#include -#include -#include -#include - -/** @addtogroup odp_buffer - * Operations on a buffer pool. - * @{ - */ - -/** Maximum queue name lenght in chars */ -#define ODP_BUFFER_POOL_NAME_LEN 32 - -/** - * Buffer pool parameters - * Used to communicate buffer pool creation options. - */ -typedef struct odp_buffer_pool_param_t { - uint32_t buf_size; /**< Buffer size in bytes. The maximum - number of bytes application will - store in each buffer. For packets, this - is the maximum packet data length, and - configured headroom and tailroom will be - added to this number */ - uint32_t buf_align; /**< Minimum buffer alignment in bytes. - Valid values are powers of two. Use 0 - for default alignment. Default will - always be a multiple of 8. */ - uint32_t num_bufs; /**< Number of buffers in the pool */ - int buf_type; /**< Buffer type */ -} odp_buffer_pool_param_t; - -#define ODP_BUFFER_TYPE_RAW ODP_EVENT_BUFFER -#define ODP_BUFFER_TYPE_PACKET ODP_EVENT_PACKET -#define ODP_BUFFER_TYPE_TIMEOUT ODP_EVENT_TIMEOUT - -/** - * Create a buffer pool - * This routine is used to create a buffer pool. It take three - * arguments: the optional name of the pool to be created, an optional shared - * memory handle, and a parameter struct that describes the pool to be - * created. If a name is not specified the result is an anonymous pool that - * cannot be referenced by odp_buffer_pool_lookup(). - * - * @param name Name of the pool, max ODP_BUFFER_POOL_NAME_LEN-1 chars. - * May be specified as NULL for anonymous pools. - * - * @param shm The shared memory object in which to create the pool. - * Use ODP_SHM_NULL to reserve default memory type - * for the buffer type. - * - * @param params Buffer pool parameters. - * - * @return Handle of the created buffer pool - * @retval ODP_BUFFER_POOL_INVALID Buffer pool could not be created - */ - -odp_buffer_pool_t odp_buffer_pool_create(const char *name, - odp_shm_t shm, - odp_buffer_pool_param_t *params); - -/** - * Destroy a buffer pool previously created by odp_buffer_pool_create() - * - * @param pool Handle of the buffer pool to be destroyed - * - * @retval 0 Success - * @retval -1 Failure - * - * @note This routine destroys a previously created buffer pool. This call - * does not destroy any shared memory object passed to - * odp_buffer_pool_create() used to store the buffer pool contents. The caller - * takes responsibility for that. If no shared memory object was passed as - * part of the create call, then this routine will destroy any internal shared - * memory objects associated with the buffer pool. Results are undefined if - * an attempt is made to destroy a buffer pool that contains allocated or - * otherwise active buffers. - */ -int odp_buffer_pool_destroy(odp_buffer_pool_t pool); - -/** - * Find a buffer pool by name - * - * @param name Name of the pool - * - * @return Handle of found buffer pool - * @retval ODP_BUFFER_POOL_INVALID Buffer pool could not be found - * - * @note This routine cannot be used to look up an anonymous pool (one created - * with no name). - */ -odp_buffer_pool_t odp_buffer_pool_lookup(const char *name); - -/** - * Buffer pool information struct - * Used to get information about a buffer pool. - */ -typedef struct odp_buffer_pool_info_t { - const char *name; /**< pool name */ - odp_shm_t shm; /**< handle of shared memory area - supplied by application to - contain buffer pool, or - ODP_SHM_INVALID if this pool is - managed by ODP */ - odp_buffer_pool_param_t params; /**< pool parameters */ -} odp_buffer_pool_info_t; - -/** - * Retrieve information about a buffer pool - * - * @param pool Buffer pool handle - * - * @param[out] info Receives an odp_buffer_pool_info_t object - * that describes the pool. - * - * @retval 0 Success - * @retval -1 Failure. Info could not be retrieved. - */ - -int odp_buffer_pool_info(odp_buffer_pool_t pool, - odp_buffer_pool_info_t *info); - -/** - * Print buffer pool info - * - * @param pool Pool handle - * - * @note This routine writes implementation-defined information about the - * specified buffer pool to the ODP log. The intended use is for debugging. - */ -void odp_buffer_pool_print(odp_buffer_pool_t pool); - -/** - * Buffer alloc - * - * The validity of a buffer can be cheked at any time with odp_buffer_is_valid() - * @param pool Pool handle - * - * @return Handle of allocated buffer - * @retval ODP_BUFFER_INVALID Buffer could not be allocated - */ -odp_buffer_t odp_buffer_alloc(odp_buffer_pool_t pool); - -/** - * Buffer free - * - * @param buf Buffer handle - * - */ -void odp_buffer_free(odp_buffer_t buf); - -/** - * @} - */ - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/platform/linux-generic/include/api/odp_classification.h b/platform/linux-generic/include/api/odp_classification.h index 46189bc..5b2108a 100644 --- a/platform/linux-generic/include/api/odp_classification.h +++ b/platform/linux-generic/include/api/odp_classification.h @@ -20,7 +20,7 @@ extern "C" { #include -#include +#include #include #include diff --git a/platform/linux-generic/include/api/odp_crypto.h b/platform/linux-generic/include/api/odp_crypto.h index 00a0090..4183442 100644 --- a/platform/linux-generic/include/api/odp_crypto.h +++ b/platform/linux-generic/include/api/odp_crypto.h @@ -20,7 +20,7 @@ extern "C" { #include #include -#include +#include #include #include diff --git a/platform/linux-generic/include/api/odp_packet_io.h b/platform/linux-generic/include/api/odp_packet_io.h index 4835f4d..7dfcc4f 100644 --- a/platform/linux-generic/include/api/odp_packet_io.h +++ b/platform/linux-generic/include/api/odp_packet_io.h @@ -20,7 +20,7 @@ extern "C" { #include #include -#include +#include #include #include diff --git a/platform/linux-generic/include/api/odp_pool.h b/platform/linux-generic/include/api/odp_pool.h new file mode 100644 index 0000000..3b9b384 --- /dev/null +++ b/platform/linux-generic/include/api/odp_pool.h @@ -0,0 +1,182 @@ +/* Copyright (c) 2015, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + + +/** + * @file + * + * ODP pool + */ + +#ifndef ODP_POOL_H_ +#define ODP_POOL_H_ + +#ifdef __cplusplus +extern "C" { +#endif + + + +#include +#include +#include +#include + +/** @addtogroup odp_buffer + * Operations on a buffer pool. + * @{ + */ + +/** Maximum queue name lenght in chars */ +#define ODP_BUFFER_POOL_NAME_LEN 32 + +/** + * Buffer pool parameters + * Used to communicate buffer pool creation options. + */ +typedef struct odp_buffer_pool_param_t { + uint32_t buf_size; /**< Buffer size in bytes. The maximum + number of bytes application will + store in each buffer. For packets, this + is the maximum packet data length, and + configured headroom and tailroom will be + added to this number */ + uint32_t buf_align; /**< Minimum buffer alignment in bytes. + Valid values are powers of two. Use 0 + for default alignment. Default will + always be a multiple of 8. */ + uint32_t num_bufs; /**< Number of buffers in the pool */ + int buf_type; /**< Buffer type */ +} odp_buffer_pool_param_t; + +#define ODP_BUFFER_TYPE_RAW ODP_EVENT_BUFFER +#define ODP_BUFFER_TYPE_PACKET ODP_EVENT_PACKET +#define ODP_BUFFER_TYPE_TIMEOUT ODP_EVENT_TIMEOUT + +/** + * Create a buffer pool + * This routine is used to create a buffer pool. It take three + * arguments: the optional name of the pool to be created, an optional shared + * memory handle, and a parameter struct that describes the pool to be + * created. If a name is not specified the result is an anonymous pool that + * cannot be referenced by odp_buffer_pool_lookup(). + * + * @param name Name of the pool, max ODP_BUFFER_POOL_NAME_LEN-1 chars. + * May be specified as NULL for anonymous pools. + * + * @param shm The shared memory object in which to create the pool. + * Use ODP_SHM_NULL to reserve default memory type + * for the buffer type. + * + * @param params Buffer pool parameters. + * + * @return Handle of the created buffer pool + * @retval ODP_BUFFER_POOL_INVALID Buffer pool could not be created + */ + +odp_buffer_pool_t odp_buffer_pool_create(const char *name, + odp_shm_t shm, + odp_buffer_pool_param_t *params); + +/** + * Destroy a buffer pool previously created by odp_buffer_pool_create() + * + * @param pool Handle of the buffer pool to be destroyed + * + * @retval 0 Success + * @retval -1 Failure + * + * @note This routine destroys a previously created buffer pool. This call + * does not destroy any shared memory object passed to + * odp_buffer_pool_create() used to store the buffer pool contents. The caller + * takes responsibility for that. If no shared memory object was passed as + * part of the create call, then this routine will destroy any internal shared + * memory objects associated with the buffer pool. Results are undefined if + * an attempt is made to destroy a buffer pool that contains allocated or + * otherwise active buffers. + */ +int odp_buffer_pool_destroy(odp_buffer_pool_t pool); + +/** + * Find a buffer pool by name + * + * @param name Name of the pool + * + * @return Handle of found buffer pool + * @retval ODP_BUFFER_POOL_INVALID Buffer pool could not be found + * + * @note This routine cannot be used to look up an anonymous pool (one created + * with no name). + */ +odp_buffer_pool_t odp_buffer_pool_lookup(const char *name); + +/** + * Buffer pool information struct + * Used to get information about a buffer pool. + */ +typedef struct odp_buffer_pool_info_t { + const char *name; /**< pool name */ + odp_shm_t shm; /**< handle of shared memory area + supplied by application to + contain buffer pool, or + ODP_SHM_INVALID if this pool is + managed by ODP */ + odp_buffer_pool_param_t params; /**< pool parameters */ +} odp_buffer_pool_info_t; + +/** + * Retrieve information about a buffer pool + * + * @param pool Buffer pool handle + * + * @param[out] info Receives an odp_buffer_pool_info_t object + * that describes the pool. + * + * @retval 0 Success + * @retval -1 Failure. Info could not be retrieved. + */ + +int odp_buffer_pool_info(odp_buffer_pool_t pool, + odp_buffer_pool_info_t *info); + +/** + * Print buffer pool info + * + * @param pool Pool handle + * + * @note This routine writes implementation-defined information about the + * specified buffer pool to the ODP log. The intended use is for debugging. + */ +void odp_buffer_pool_print(odp_buffer_pool_t pool); + +/** + * Buffer alloc + * + * The validity of a buffer can be cheked at any time with odp_buffer_is_valid() + * @param pool Pool handle + * + * @return Handle of allocated buffer + * @retval ODP_BUFFER_INVALID Buffer could not be allocated + */ +odp_buffer_t odp_buffer_alloc(odp_buffer_pool_t pool); + +/** + * Buffer free + * + * @param buf Buffer handle + * + */ +void odp_buffer_free(odp_buffer_t buf); + +/** + * @} + */ + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/platform/linux-generic/include/odp_buffer_internal.h b/platform/linux-generic/include/odp_buffer_internal.h index 9b2c810..9475c8b 100644 --- a/platform/linux-generic/include/odp_buffer_internal.h +++ b/platform/linux-generic/include/odp_buffer_internal.h @@ -20,7 +20,7 @@ extern "C" { #include #include -#include +#include #include #include #include diff --git a/platform/linux-generic/include/odp_buffer_pool_internal.h b/platform/linux-generic/include/odp_buffer_pool_internal.h index 2e48ac3..b0e696e 100644 --- a/platform/linux-generic/include/odp_buffer_pool_internal.h +++ b/platform/linux-generic/include/odp_buffer_pool_internal.h @@ -21,7 +21,7 @@ extern "C" { #include #include #include -#include +#include #include #include #include diff --git a/platform/linux-generic/include/odp_packet_socket.h b/platform/linux-generic/include/odp_packet_socket.h index c4f8af1..0c4ad0b 100644 --- a/platform/linux-generic/include/odp_packet_socket.h +++ b/platform/linux-generic/include/odp_packet_socket.h @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include diff --git a/platform/linux-generic/odp_buffer_pool.c b/platform/linux-generic/odp_buffer_pool.c index 202d1c7..d243045 100644 --- a/platform/linux-generic/odp_buffer_pool.c +++ b/platform/linux-generic/odp_buffer_pool.c @@ -5,7 +5,7 @@ */ #include -#include +#include #include #include #include diff --git a/platform/linux-generic/odp_event.c b/platform/linux-generic/odp_event.c index 285a19b..f3e70b9 100644 --- a/platform/linux-generic/odp_event.c +++ b/platform/linux-generic/odp_event.c @@ -6,7 +6,7 @@ #include #include -#include +#include #include int odp_event_type(odp_event_t event) diff --git a/platform/linux-generic/odp_schedule.c b/platform/linux-generic/odp_schedule.c index 505acec..2968cd0 100644 --- a/platform/linux-generic/odp_schedule.c +++ b/platform/linux-generic/odp_schedule.c @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/platform/linux-generic/odp_timer.c b/platform/linux-generic/odp_timer.c index 120954c..107cf3d 100644 --- a/platform/linux-generic/odp_timer.c +++ b/platform/linux-generic/odp_timer.c @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include