From patchwork Mon Feb 16 19:55:18 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Holmes X-Patchwork-Id: 44733 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f200.google.com (mail-lb0-f200.google.com [209.85.217.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 0831921544 for ; Mon, 16 Feb 2015 19:56:43 +0000 (UTC) Received: by lbvp9 with SMTP id p9sf323716lbv.1 for ; Mon, 16 Feb 2015 11:56:42 -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=vSywgAAG//KIUQN3guiM3+bqoQB1H/qTroeGDypN1kE=; b=fM1+LZtj53soUG6S1oan8AlSFGchuYlE1jR6o1VTh4+r92mbgvyB0erWP1q3qXzD4P YBlou/thjAsDDADp5EEFQfy5sP6eHKrm2KqIZGONLy67pKWMyeHqHaqfQ/qsWuHRJKF5 EWgkRkeZ+dnYi7DIaophhRyEoaikhlDdkGo9RSDnzqhiYU9uBUewvcoExByUPqQ6FJos RprRN34PfxO5FQV1mj/WEaWIEn1Uc7TZBbUboncE2kbquAFYMXtDnc0I8iP8TcKslp6r iGOcAZnTCiFl5u6i6uiwSdsITwHaNYCQ4gp59JJ+Vlmjqjm7XLeDtFtReGEiLMim8nfT LJEA== X-Gm-Message-State: ALoCoQlv1c+gPEkELWZupJQhTe8VS7gSuXV12IJLL7QcH0fPNUmQv8BZEQ8gq+6qakJJ1xTzkA1L X-Received: by 10.180.101.101 with SMTP id ff5mr2949858wib.5.1424116601991; Mon, 16 Feb 2015 11:56:41 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.5.38 with SMTP id p6ls655280lap.49.gmail; Mon, 16 Feb 2015 11:56:41 -0800 (PST) X-Received: by 10.112.188.165 with SMTP id gb5mr8966763lbc.35.1424116601827; Mon, 16 Feb 2015 11:56:41 -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 w1si8640580lal.38.2015.02.16.11.56.41 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Feb 2015 11:56:41 -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 gf13so31809935lab.9 for ; Mon, 16 Feb 2015 11:56:41 -0800 (PST) X-Received: by 10.152.5.167 with SMTP id t7mr25900322lat.32.1424116601745; Mon, 16 Feb 2015 11:56:41 -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 h5csp1788070lbj; Mon, 16 Feb 2015 11:56:40 -0800 (PST) X-Received: by 10.140.147.86 with SMTP id 83mr722749qht.58.1424116600375; Mon, 16 Feb 2015 11:56:40 -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 k77si4544280qgd.40.2015.02.16.11.56.36 (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 16 Feb 2015 11:56:39 -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 1YNRmU-0007d4-P5; Mon, 16 Feb 2015 19:56:34 +0000 Received: from mail-qa0-f44.google.com ([209.85.216.44]) by ip-10-35-177-41.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1YNRlv-0007SH-Pb for lng-odp@lists.linaro.org; Mon, 16 Feb 2015 19:55:59 +0000 Received: by mail-qa0-f44.google.com with SMTP id n8so23433497qaq.3 for ; Mon, 16 Feb 2015 11:55:54 -0800 (PST) X-Received: by 10.229.80.3 with SMTP id r3mr1198285qck.23.1424116554577; Mon, 16 Feb 2015 11:55:54 -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.53 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 16 Feb 2015 11:55:54 -0800 (PST) From: Mike Holmes To: lng-odp@lists.linaro.org Date: Mon, 16 Feb 2015 14:55:18 -0500 Message-Id: <1424116520-20381-9-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 08/10] linux-generic: shm: 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_init.c | 5 +++++ platform/linux-generic/odp_shared_memory.c | 8 ++++++++ 3 files changed, 14 insertions(+) diff --git a/platform/linux-generic/include/odp_internal.h b/platform/linux-generic/include/odp_internal.h index d0cd085..a7bb4a2 100644 --- a/platform/linux-generic/include/odp_internal.h +++ b/platform/linux-generic/include/odp_internal.h @@ -37,6 +37,7 @@ int odp_thread_term_local(void); int odp_thread_term_global(void); int odp_shm_init_global(void); +int odp_shm_term_global(void); int odp_shm_init_local(void); int odp_buffer_pool_init_global(void); diff --git a/platform/linux-generic/odp_init.c b/platform/linux-generic/odp_init.c index 9141b56..69569f1 100644 --- a/platform/linux-generic/odp_init.c +++ b/platform/linux-generic/odp_init.c @@ -111,6 +111,11 @@ int odp_term_global(void) return -1; } + if (odp_shm_term_global()) { + ODP_ERR("ODP shm term failed.\n"); + return -1; + } + return 0; } diff --git a/platform/linux-generic/odp_shared_memory.c b/platform/linux-generic/odp_shared_memory.c index dbaec22..251bf97 100644 --- a/platform/linux-generic/odp_shared_memory.c +++ b/platform/linux-generic/odp_shared_memory.c @@ -96,6 +96,14 @@ int odp_shm_init_global(void) return 0; } +int odp_shm_term_global(void) +{ + int ret = 0; + + ret = munmap(odp_shm_tbl, sizeof(odp_shm_table_t)); + return ret; +} + int odp_shm_init_local(void) {