From patchwork Mon Feb 16 19:55:15 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Holmes X-Patchwork-Id: 44730 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f200.google.com (mail-wi0-f200.google.com [209.85.212.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 1971021544 for ; Mon, 16 Feb 2015 19:56:29 +0000 (UTC) Received: by mail-wi0-f200.google.com with SMTP id r20sf17061478wiv.3 for ; Mon, 16 Feb 2015 11:56:28 -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=NFp63pLKDDcf+oJmJJzjQMzlW3pHp0kMPOdr4Plm8Nw=; b=ALvdq1ioZTZCdDi1QSzsJVfhfkGyXJ1ouIwDhZaiFAUpHL/nRzqqhAMbXNnOsjDCj8 9QMpznrmViIgps67Uuzj4OBBRJ+49ITT9apRnjSva+WLwVkzN3enmQg1TTOm+sH4xRGM 8HvT376mwAUSqfiuWvlNgwL0BA1N7Li8gP7x3GboobMp+01R3DdsITxcazU5ZBKmUCuA OhYIYtnIgmXtgIo6w1Sm41BxnFlyFjncZfFfoj1fiKptah6ofWXnRmCJfYnJCVSBSieZ LQpgcztOkZAXCW64Yjbs3t8qyD9UNxgjJe3X5AZOfYtzYz9EPoO4FCYs0NYHpXRcGrP6 kvjQ== X-Gm-Message-State: ALoCoQms69fDh3Vu5lUmcyXuSaWn9r+djeL4Sj3Bu5EpiR1Si1lKCJVrN+kCamRYZQPFMl+GO4PC X-Received: by 10.112.138.202 with SMTP id qs10mr633820lbb.24.1424116588303; Mon, 16 Feb 2015 11:56:28 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.153.5.33 with SMTP id cj1ls220628lad.53.gmail; Mon, 16 Feb 2015 11:56:28 -0800 (PST) X-Received: by 10.152.120.8 with SMTP id ky8mr8139998lab.118.1424116588158; Mon, 16 Feb 2015 11:56:28 -0800 (PST) Received: from mail-lb0-f173.google.com (mail-lb0-f173.google.com. [209.85.217.173]) by mx.google.com with ESMTPS id xz9si7675061lbb.130.2015.02.16.11.56.28 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Feb 2015 11:56:28 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.173 as permitted sender) client-ip=209.85.217.173; Received: by lbvn10 with SMTP id n10so581518lbv.6 for ; Mon, 16 Feb 2015 11:56:28 -0800 (PST) X-Received: by 10.152.43.193 with SMTP id y1mr25662787lal.35.1424116587978; Mon, 16 Feb 2015 11:56:27 -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 h5csp1787981lbj; Mon, 16 Feb 2015 11:56:27 -0800 (PST) X-Received: by 10.236.53.69 with SMTP id f45mr921256yhc.12.1424116585144; Mon, 16 Feb 2015 11:56:25 -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 s7si15393937qag.13.2015.02.16.11.56.23 (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 16 Feb 2015 11:56:25 -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 1YNRmI-0007au-7M; Mon, 16 Feb 2015 19:56:22 +0000 Received: from mail-qc0-f177.google.com ([209.85.216.177]) by ip-10-35-177-41.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1YNRlt-0007S6-HC for lng-odp@lists.linaro.org; Mon, 16 Feb 2015 19:55:57 +0000 Received: by mail-qc0-f177.google.com with SMTP id s11so25734157qcv.8 for ; Mon, 16 Feb 2015 11:55:52 -0800 (PST) X-Received: by 10.140.39.84 with SMTP id u78mr767127qgu.63.1424116552378; Mon, 16 Feb 2015 11:55:52 -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.51 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 16 Feb 2015 11:55:51 -0800 (PST) From: Mike Holmes To: lng-odp@lists.linaro.org Date: Mon, 16 Feb 2015 14:55:15 -0500 Message-Id: <1424116520-20381-6-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 05/10] linux-generic: queue: 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.217.173 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_init.c | 5 +++++ platform/linux-generic/odp_queue.c | 25 +++++++++++++++++++++++++ 3 files changed, 31 insertions(+) diff --git a/platform/linux-generic/include/odp_internal.h b/platform/linux-generic/include/odp_internal.h index d244c75..202c914 100644 --- a/platform/linux-generic/include/odp_internal.h +++ b/platform/linux-generic/include/odp_internal.h @@ -48,6 +48,7 @@ int odp_classification_init_global(void); int odp_classification_term_global(void); int odp_queue_init_global(void); +int odp_queue_term_global(void); int odp_crypto_init_global(void); int odp_crypto_term_global(void); diff --git a/platform/linux-generic/odp_init.c b/platform/linux-generic/odp_init.c index 2788e46..93fdc2c 100644 --- a/platform/linux-generic/odp_init.c +++ b/platform/linux-generic/odp_init.c @@ -96,6 +96,11 @@ int odp_term_global(void) return -1; } + if (odp_queue_term_global()) { + ODP_ERR("ODP queue term failed.\n"); + return -1; + } + return 0; } diff --git a/platform/linux-generic/odp_queue.c b/platform/linux-generic/odp_queue.c index 76bf4d7..0aa0e9c 100644 --- a/platform/linux-generic/odp_queue.c +++ b/platform/linux-generic/odp_queue.c @@ -128,6 +128,31 @@ int odp_queue_init_global(void) return 0; } +int odp_queue_term_global(void) +{ + odp_shm_t shm; + int ret = 0; + queue_entry_t *queue; + int i; + + for (i = 0; i < ODP_CONFIG_QUEUES; i++) { + queue = &queue_tbl->queue[i]; + LOCK(&queue->s.lock); + if (queue->s.status != QUEUE_STATUS_FREE) { + ODP_ERR("Not destroyed queue: %s\n", queue->s.name); + ret = -1; + } + UNLOCK(&queue->s.lock); + } + + shm = odp_shm_lookup("odp_queues"); + if (shm == ODP_SHM_INVALID) + return -1; + ret = odp_shm_free(shm); + + return ret; +} + odp_queue_type_t odp_queue_type(odp_queue_t handle) { queue_entry_t *queue;