From patchwork Mon Feb 16 19:55:17 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Holmes X-Patchwork-Id: 44732 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-we0-f200.google.com (mail-we0-f200.google.com [74.125.82.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 0F45321544 for ; Mon, 16 Feb 2015 19:56:36 +0000 (UTC) Received: by mail-we0-f200.google.com with SMTP id k11sf20790594wes.3 for ; Mon, 16 Feb 2015 11:56:35 -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=IOHqrRqrHEaqlHOMuVqYiR/cQvIGu6UHqYU0vl5zeCE=; b=EdYylRQ0UfO/rC8fMTuKyLX86jNW9nxqN0wsmoNdnG4ivIZOFHUj99wyzZm9S2pEqd EQiIVeK3Yl3W/+lJU/jd8cimCtZuhjCGR541S/MdXi64xJYr9EOIstXedz9/WfPNntjW HRK9U4kxlP7zwYrU5A2tjb4GL5Ev7p2GaA9Abtg1pFPCfzmjHKtL+yZnOhqLW+/YQsac jrMbhx+QujiqFNlBZaZelWRUSksHgQkrJjbKA+2+LmTyLY2aS/EJOkspHxoluCwSigAu dPzM6UANzV3JnJzsYCdqsFzDABlvloxNjRJUSFTF9tTLabdhUN4nPgiIoBuuVbLAOrWj zBtA== X-Gm-Message-State: ALoCoQnAHWo3wcnNbK8eUWeNFbYvktoIl+nz72XvP3h/7lI6/Gv3dPdCfDD0NvdvMD4NUrjwMddj X-Received: by 10.152.88.40 with SMTP id bd8mr3171171lab.0.1424116595252; Mon, 16 Feb 2015 11:56:35 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.161.135 with SMTP id xs7ls617685lab.42.gmail; Mon, 16 Feb 2015 11:56:35 -0800 (PST) X-Received: by 10.112.158.199 with SMTP id ww7mr25151704lbb.104.1424116594977; Mon, 16 Feb 2015 11:56:34 -0800 (PST) Received: from mail-lb0-f172.google.com (mail-lb0-f172.google.com. [209.85.217.172]) by mx.google.com with ESMTPS id t1si8871598lat.87.2015.02.16.11.56.34 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Feb 2015 11:56:34 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.172 as permitted sender) client-ip=209.85.217.172; Received: by lbiw7 with SMTP id w7so584438lbi.9 for ; Mon, 16 Feb 2015 11:56:34 -0800 (PST) X-Received: by 10.152.43.51 with SMTP id t19mr13717424lal.73.1424116594825; Mon, 16 Feb 2015 11:56:34 -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 h5csp1788029lbj; Mon, 16 Feb 2015 11:56:34 -0800 (PST) X-Received: by 10.140.102.165 with SMTP id w34mr3776727qge.26.1424116593545; Mon, 16 Feb 2015 11:56:33 -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 y34si15381793qgy.28.2015.02.16.11.56.32 (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 16 Feb 2015 11:56:33 -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 1YNRmQ-0007cO-D8; Mon, 16 Feb 2015 19:56:30 +0000 Received: from mail-qa0-f53.google.com ([209.85.216.53]) by ip-10-35-177-41.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1YNRlv-0007SC-1A for lng-odp@lists.linaro.org; Mon, 16 Feb 2015 19:55:59 +0000 Received: by mail-qa0-f53.google.com with SMTP id k15so23495172qaq.12 for ; Mon, 16 Feb 2015 11:55:53 -0800 (PST) X-Received: by 10.229.4.4 with SMTP id 4mr1182343qcp.8.1424116553866; 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.53 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 16 Feb 2015 11:55:53 -0800 (PST) From: Mike Holmes To: lng-odp@lists.linaro.org Date: Mon, 16 Feb 2015 14:55:17 -0500 Message-Id: <1424116520-20381-8-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 07/10] linux-generic: thread: 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.172 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_thread.c | 13 +++++++++++++ 3 files changed, 19 insertions(+) diff --git a/platform/linux-generic/include/odp_internal.h b/platform/linux-generic/include/odp_internal.h index 59c65e2..d0cd085 100644 --- a/platform/linux-generic/include/odp_internal.h +++ b/platform/linux-generic/include/odp_internal.h @@ -34,6 +34,7 @@ int odp_system_info_init(void); int odp_thread_init_global(void); int odp_thread_init_local(void); int odp_thread_term_local(void); +int odp_thread_term_global(void); int odp_shm_init_global(void); int odp_shm_init_local(void); diff --git a/platform/linux-generic/odp_init.c b/platform/linux-generic/odp_init.c index 58faa59..9141b56 100644 --- a/platform/linux-generic/odp_init.c +++ b/platform/linux-generic/odp_init.c @@ -106,6 +106,11 @@ int odp_term_global(void) return -1; } + if (odp_thread_term_global()) { + ODP_ERR("ODP thread term failed.\n"); + return -1; + } + return 0; } diff --git a/platform/linux-generic/odp_thread.c b/platform/linux-generic/odp_thread.c index f6c900b..1f483a1 100644 --- a/platform/linux-generic/odp_thread.c +++ b/platform/linux-generic/odp_thread.c @@ -65,6 +65,19 @@ int odp_thread_init_global(void) return 0; } +int odp_thread_term_global(void) +{ + odp_shm_t shm; + int ret = 0; + + shm = odp_shm_lookup("odp_thread_globals"); + if (shm == ODP_SHM_INVALID) + return -1; + ret = odp_shm_free(shm); + + return ret; +} + static int thread_id(void) {