From patchwork Wed Oct 19 15:29:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Milard X-Patchwork-Id: 78289 Delivered-To: patch@linaro.org Received: by 10.140.97.247 with SMTP id m110csp313071qge; Wed, 19 Oct 2016 08:40:29 -0700 (PDT) X-Received: by 10.55.157.8 with SMTP id g8mr7512651qke.122.1476891629235; Wed, 19 Oct 2016 08:40:29 -0700 (PDT) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id l9si3921506qkh.211.2016.10.19.08.40.20; Wed, 19 Oct 2016 08:40:29 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id C9E2861710; Wed, 19 Oct 2016 15:40:20 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id C454A61746; Wed, 19 Oct 2016 15:31:26 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id C910E61710; Wed, 19 Oct 2016 15:31:04 +0000 (UTC) Received: from mail-lf0-f44.google.com (mail-lf0-f44.google.com [209.85.215.44]) by lists.linaro.org (Postfix) with ESMTPS id 7E36A616FE for ; Wed, 19 Oct 2016 15:30:12 +0000 (UTC) Received: by mail-lf0-f44.google.com with SMTP id x79so31499524lff.0 for ; Wed, 19 Oct 2016 08:30:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=KnCOtWHCGt+nbuk675YYG1PTJXKFNq0IMsMWtQCktYg=; b=R0QTbXJUFbPhEnecHhOaD8ni50eOmFR41WQa1zaEHOFz6vC0Zj2XJ8/Wi+juUUwfF0 uBqOoZ0maTe4rcW/8CzS2mX0Iezu9NeHvg0IIJtcDI9cmnuS40TVlq1q3GpI/1g1axqG 1ZJ6zks1Rn1ropKdjKe0zzi02r8UNVQBYQIypWXzr2b1uQU91Wf1x2q1L2qQTIHneHie JeVNK+uBS9FEnjjM4CqadZorCIAKnlgSWsGrZ+5i2lDfEJ1uu9pe0KhXdRNcQIHZT/EG nZ4jiTJLJeV6mCmJWMucodvmk/TnEMzJfrtFrJrAHxgSwi1MSJM4DF4Jvr1vkHaVBKfz tk9w== X-Gm-Message-State: AA6/9RlslZuvPuSQi0sGHHCCi4KmF6dfA2T1UCsR2c9JjZHFPHTzcw8SkdG5f3hgcOucxaodhYU= X-Received: by 10.25.29.82 with SMTP id d79mr3569747lfd.52.1476891011273; Wed, 19 Oct 2016 08:30:11 -0700 (PDT) Received: from localhost.localdomain (c-83-233-76-66.cust.bredband2.com. [83.233.76.66]) by smtp.gmail.com with ESMTPSA id w65sm10805536lff.16.2016.10.19.08.30.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 19 Oct 2016 08:30:10 -0700 (PDT) From: Christophe Milard To: mike.holmes@linaro.org, bill.fischofer@linaro.org, lng-odp@lists.linaro.org Date: Wed, 19 Oct 2016 17:29:49 +0200 Message-Id: <1476890991-4693-15-git-send-email-christophe.milard@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1476890991-4693-1-git-send-email-christophe.milard@linaro.org> References: <1476890991-4693-1-git-send-email-christophe.milard@linaro.org> X-Topics: patch Subject: [lng-odp] [API-NEXT PATCHv3 14/16] linux-gen: _ishm: cleaning remaining block at odp_term_global X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" Remaining (forgotten, not freed) blocks are gathered and related files cleaned when odp_term_global() is called. An error message is also issued so the application writters get to know about these blocks Signed-off-by: Christophe Milard --- platform/linux-generic/_ishm.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) -- 2.7.4 diff --git a/platform/linux-generic/_ishm.c b/platform/linux-generic/_ishm.c index 7624eca..11bb316 100644 --- a/platform/linux-generic/_ishm.c +++ b/platform/linux-generic/_ishm.c @@ -1435,12 +1435,28 @@ int _odp_ishm_term_local(void) int _odp_ishm_term_global(void) { int ret = 0; + int index; + ishm_block_t *block; if ((getpid() != odp_global_data.main_pid) || (syscall(SYS_gettid) != getpid())) ODP_ERR("odp_term_global() must be performed by the main " "ODP process!\n."); + /* cleanup possibly non freed memory (and complain a bit): */ + for (index = 0; index < ISHM_MAX_NB_BLOCKS; index++) { + block = &ishm_tbl->block[index]; + if (block->len != 0) { + ODP_ERR("block '%s' (file %s) was never freed " + "(cleaning up...).\n", + block->name, block->filename); + if (block->filename[0] != 0) + unlink(block->filename); + if (block->linkname[0] != 0) + unlink(block->linkname); + } + } + /* perform the last thread terminate which was postponed: */ ret = do_odp_ishm_term_local();