From patchwork Mon Feb 16 19:55:16 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Holmes X-Patchwork-Id: 44731 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f198.google.com (mail-wi0-f198.google.com [209.85.212.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 601C721544 for ; Mon, 16 Feb 2015 19:56:31 +0000 (UTC) Received: by mail-wi0-f198.google.com with SMTP id h11sf17038507wiw.1 for ; Mon, 16 Feb 2015 11:56:30 -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=gnTvtd6bB2ePYhlKMYQE1A5vXGIFArrbKYoeYllytsY=; b=GRFRN8TbI7bbT9oJykZOHLgYZcIFRZC2bWaOzWCTPCNTGxjFfnPYNhqkSQbM1oVi6m e5fKs1YRGM/2wotiMQu4SQCikFLvqLROqht+u4nUgVGQgrMRHilb6GrCZkZSSVvOQr7T gyBncWvQZXZe5KbY3ZUJeGv6g1MSY7eJ1loca1tisq8+2FKHBEsmPTxj72/ih3150ntj 2qX8svfRuHOsqUt/1ndR39h4/f9KNCDX1qUcW5NZ204EqNHIhx0pW98fYemOCIyqIf1m pazJ7vy+qV6anUKoRvhNAQ372UkC1Mii+AH+rcou6qMMcPIiM+4l8La0mWyrcsFd9bgo iUxg== X-Gm-Message-State: ALoCoQk86XYnXk3Gs+yBy7OFxVu5QS1dDrN/uYh5CMuCEZVmKFBOm4lm+re9etYBM2zf/2cvrhQH X-Received: by 10.180.91.76 with SMTP id cc12mr615508wib.7.1424116590709; Mon, 16 Feb 2015 11:56:30 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.234.232 with SMTP id uh8ls92718lac.82.gmail; Mon, 16 Feb 2015 11:56:30 -0800 (PST) X-Received: by 10.112.167.136 with SMTP id zo8mr25048218lbb.17.1424116590445; Mon, 16 Feb 2015 11:56:30 -0800 (PST) Received: from mail-la0-f54.google.com (mail-la0-f54.google.com. [209.85.215.54]) by mx.google.com with ESMTPS id or2si10804250lbb.91.2015.02.16.11.56.30 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Feb 2015 11:56:30 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.54 as permitted sender) client-ip=209.85.215.54; Received: by labgf13 with SMTP id gf13so31809069lab.9 for ; Mon, 16 Feb 2015 11:56:30 -0800 (PST) X-Received: by 10.152.28.227 with SMTP id e3mr20980395lah.117.1424116590338; Mon, 16 Feb 2015 11:56:30 -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.35.133 with SMTP id h5csp1787996lbj; Mon, 16 Feb 2015 11:56:29 -0800 (PST) X-Received: by 10.170.146.67 with SMTP id n64mr19702452ykc.7.1424116588693; Mon, 16 Feb 2015 11:56:28 -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 w3si15360700qat.101.2015.02.16.11.56.27 (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 16 Feb 2015 11:56:28 -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 1YNRmL-0007bY-PD; Mon, 16 Feb 2015 19:56:25 +0000 Received: from mail-qc0-f170.google.com ([209.85.216.170]) by ip-10-35-177-41.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1YNRlu-0007S7-BC for lng-odp@lists.linaro.org; Mon, 16 Feb 2015 19:55:58 +0000 Received: by mail-qc0-f170.google.com with SMTP id c9so14052238qcz.1 for ; Mon, 16 Feb 2015 11:55:53 -0800 (PST) X-Received: by 10.140.232.149 with SMTP id d143mr2341151qhc.81.1424116553153; Mon, 16 Feb 2015 11:55:53 -0800 (PST) Received: from mike-desktop.?.holmesfamily.ws (c-98-221-136-245.hsd1.nj.comcast.net. [98.221.136.245]) by mx.google.com with ESMTPSA id o10sm4832854qag.9.2015.02.16.11.55.52 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 16 Feb 2015 11:55:52 -0800 (PST) From: Mike Holmes To: lng-odp@lists.linaro.org Date: Mon, 16 Feb 2015 14:55:16 -0500 Message-Id: <1424116520-20381-7-git-send-email-mike.holmes@linaro.org> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1424116520-20381-1-git-send-email-mike.holmes@linaro.org> References: <1424116520-20381-1-git-send-email-mike.holmes@linaro.org> X-Topics: patch Subject: [lng-odp] [PATCH v2 06/10] linux-generic: buffer_pool: add term_global 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: mike.holmes@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.215.54 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 From: Yan Sonming Signed-off-by: Yan Songming Signed-off-by: Mike Holmes --- platform/linux-generic/include/odp_internal.h | 1 + platform/linux-generic/odp_buffer_pool.c | 31 ++++++++++++++++++++++++++- platform/linux-generic/odp_init.c | 5 +++++ 3 files changed, 36 insertions(+), 1 deletion(-) diff --git a/platform/linux-generic/include/odp_internal.h b/platform/linux-generic/include/odp_internal.h index 202c914..59c65e2 100644 --- a/platform/linux-generic/include/odp_internal.h +++ b/platform/linux-generic/include/odp_internal.h @@ -39,6 +39,7 @@ int odp_shm_init_global(void); int odp_shm_init_local(void); int odp_buffer_pool_init_global(void); +int odp_buffer_pool_term_global(void); int odp_pktio_init_global(void); int odp_pktio_term_global(void); diff --git a/platform/linux-generic/odp_buffer_pool.c b/platform/linux-generic/odp_buffer_pool.c index f8e35b4..bb384bc 100644 --- a/platform/linux-generic/odp_buffer_pool.c +++ b/platform/linux-generic/odp_buffer_pool.c @@ -55,6 +55,7 @@ typedef struct pool_table_t { /* The pool table */ static pool_table_t *pool_tbl; +static const char SHM_DEFAULT_NAME[] = "odp_buffer_pools"; /* Pool entry pointers (for inlining) */ void *pool_entry_ptr[ODP_CONFIG_POOLS]; @@ -67,7 +68,7 @@ int odp_buffer_pool_init_global(void) uint32_t i; odp_shm_t shm; - shm = odp_shm_reserve("odp_buffer_pools", + shm = odp_shm_reserve(SHM_DEFAULT_NAME, sizeof(pool_table_t), sizeof(pool_entry_t), 0); @@ -95,6 +96,34 @@ int odp_buffer_pool_init_global(void) return 0; } +int odp_buffer_pool_term_global(void) +{ + odp_shm_t shm; + int i; + pool_entry_t *pool; + int ret = 0; + + for (i = 0; i < ODP_CONFIG_POOLS; i++) { + pool = get_pool_entry(i); + + POOL_LOCK(&pool->s.lock); + if (pool->s.pool_shm != ODP_SHM_INVALID) { + ODP_ERR("Not destroyed pool: %s\n", pool->s.name); + ret = -1; + } + POOL_UNLOCK(&pool->s.lock); + } + if (ret) + return ret; + + shm = odp_shm_lookup(SHM_DEFAULT_NAME); + if (shm == ODP_SHM_INVALID) + return -1; + ret = odp_shm_free(shm); + + return ret; +} + /** * Pool creation */ diff --git a/platform/linux-generic/odp_init.c b/platform/linux-generic/odp_init.c index 93fdc2c..58faa59 100644 --- a/platform/linux-generic/odp_init.c +++ b/platform/linux-generic/odp_init.c @@ -101,6 +101,11 @@ int odp_term_global(void) return -1; } + if (odp_buffer_pool_term_global()) { + ODP_ERR("ODP buffer pool term failed.\n"); + return -1; + } + return 0; }