From patchwork Thu Nov 24 08:24:30 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Milard X-Patchwork-Id: 83812 Delivered-To: patch@linaro.org Received: by 10.182.1.168 with SMTP id 8csp10957obn; Wed, 23 Nov 2016 23:36:56 -0800 (PST) X-Received: by 10.200.33.162 with SMTP id 31mr678755qty.165.1479973016152; Wed, 23 Nov 2016 23:36:56 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id f191si4157028qke.256.2016.11.23.23.36.55; Wed, 23 Nov 2016 23:36:56 -0800 (PST) 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 B9E1562DF7; Thu, 24 Nov 2016 07:36:55 +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 E1C4762DD1; Thu, 24 Nov 2016 07:27:14 +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 1680862DCD; Thu, 24 Nov 2016 07:27:08 +0000 (UTC) Received: from mail-lf0-f52.google.com (mail-lf0-f52.google.com [209.85.215.52]) by lists.linaro.org (Postfix) with ESMTPS id A935B62DD6 for ; Thu, 24 Nov 2016 07:25:09 +0000 (UTC) Received: by mail-lf0-f52.google.com with SMTP id t196so21624140lff.3 for ; Wed, 23 Nov 2016 23:25:09 -0800 (PST) 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=H74iFCZaMz3FHjdZ70kUHV0U3XZaN3nk3xyRIfFnSlI=; b=RP7DGf7PsVueI8QT8oxXP/D7FYmvMbK+4RHdjbK+m3uUqzqTIWIIHzPwpywrNPRrZm L/0k2TsMaQ/kUthLF5KA9+kVrMBJZG7/ChW9XfUGrNUw/e3bsMB+flyuJZ3+/7BP7aMg oCsW7xGWCyhNbmLJ4zhck8UPG7ioRv1NdywU6kUKos9wcdUSHvZOJFwUaGYKM551NfPY mPAdwu7GX4hQPDizY8sCF9zW3C05f22yrZcr79HOo9VDCFT/Y6OGuTPOGWU/59KVRp7S 2v8jUNbmchMt912bulC8Xt1e2RKnRd1K6xP2xHk78h7d9bO56sJJ8qLL1o+KqZ4HRLLD +bLg== X-Gm-Message-State: AKaTC036hsqgti1GnywK2feFmWEMSpt4vSBb7pGdVC15AERPCF+26kRCB8glowInS3PWs8yI/9A= X-Received: by 10.46.1.93 with SMTP id 90mr455737ljb.30.1479972308482; Wed, 23 Nov 2016 23:25:08 -0800 (PST) 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 37sm7794110lfw.31.2016.11.23.23.25.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 23 Nov 2016 23:25:07 -0800 (PST) From: Christophe Milard To: maxim.uvarov@linaro.com, mike.holmes@linaro.org, bill.fischofer@linaro.org, lng-odp@lists.linaro.org Date: Thu, 24 Nov 2016 09:24:30 +0100 Message-Id: <1479975872-4945-14-git-send-email-christophe.milard@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1479975872-4945-1-git-send-email-christophe.milard@linaro.org> References: <1479975872-4945-1-git-send-email-christophe.milard@linaro.org> Subject: [lng-odp] [API-NEXT PATCHv8 13/15] 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 | 13 +++++++++++++ 1 file changed, 13 insertions(+) -- 2.7.4 diff --git a/platform/linux-generic/_ishm.c b/platform/linux-generic/_ishm.c index 7c373dc..b00f8f1 100644 --- a/platform/linux-generic/_ishm.c +++ b/platform/linux-generic/_ishm.c @@ -1505,12 +1505,25 @@ 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); + delete_file(block); + } + } + /* perform the last thread terminate which was postponed: */ ret = do_odp_ishm_term_local();