From patchwork Tue Oct 18 11:56:46 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Milard X-Patchwork-Id: 77997 Delivered-To: patch@linaro.org Received: by 10.140.97.247 with SMTP id m110csp825526qge; Tue, 18 Oct 2016 04:08:27 -0700 (PDT) X-Received: by 10.55.47.193 with SMTP id v184mr1728123qkh.259.1476788907167; Tue, 18 Oct 2016 04:08:27 -0700 (PDT) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id g67si20550387qkd.264.2016.10.18.04.08.26; Tue, 18 Oct 2016 04:08:27 -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 990EA608F2; Tue, 18 Oct 2016 11:08:26 +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 17B8B60678; Tue, 18 Oct 2016 10:59:33 +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 41D40615E3; Tue, 18 Oct 2016 10:59:28 +0000 (UTC) Received: from mail-lf0-f42.google.com (mail-lf0-f42.google.com [209.85.215.42]) by lists.linaro.org (Postfix) with ESMTPS id 65F246066C for ; Tue, 18 Oct 2016 10:57:45 +0000 (UTC) Received: by mail-lf0-f42.google.com with SMTP id b81so337472575lfe.1 for ; Tue, 18 Oct 2016 03:57:45 -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=Pm+TL8FE/1xluvz0xnUUGAZTZMPWkpL2ZTt8uf+uluMtLgyA1YkliazGUqt/9DyOWP c2K+6sLfG9jSjaoT80cLPT0ekdItZRp/OYJyUiyqgqKFlkmO4VovHzHhFXtIDruAnjuy 3hk2pk6348yf92Hsdi2FRBDxoIB9n/3JeVPT4Gd9xJ3cDw9Gpg8NRClW1jrlcPuqd31r 9bYWJOFVXych8DhCBZZJQGUBbEB7qs49Fjsl51TJRo2JRNLdG89MVtwjfxUkCoqlmwfs YbNqQHVVtzd8zAP6UPKNpAaR+ac/SWqRdbrfx9n6u5GxQoy5F5djVNy22fbEFWIw7UFu sx4Q== X-Gm-Message-State: AA6/9RlMS3Hm3/s/drjGYWTJwzTFqiIV48CH16ek4Bi8wgYZTQ6ovj/0FZR6p+6D10ETliLDoYQ= X-Received: by 10.25.208.137 with SMTP id h131mr20966382lfg.94.1476788264044; Tue, 18 Oct 2016 03:57:44 -0700 (PDT) Received: from erachmi-ericsson.ki.sw.ericsson.se (c-83-233-76-66.cust.bredband2.com. [83.233.76.66]) by smtp.gmail.com with ESMTPSA id 204sm3879424ljj.47.2016.10.18.03.57.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 18 Oct 2016 03:57:43 -0700 (PDT) From: Christophe Milard To: mike.holmes@linaro.org, bill.fischofer@linaro.org, lng-odp@lists.linaro.org Date: Tue, 18 Oct 2016 13:56:46 +0200 Message-Id: <1476791808-29363-15-git-send-email-christophe.milard@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1476791808-29363-1-git-send-email-christophe.milard@linaro.org> References: <1476791808-29363-1-git-send-email-christophe.milard@linaro.org> X-Topics: patch Subject: [lng-odp] [API-NEXT PATCHv2 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();