From patchwork Fri Jan 22 14:51:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivan Khoronzhuk X-Patchwork-Id: 60150 Delivered-To: patch@linaro.org Received: by 10.112.130.2 with SMTP id oa2csp727107lbb; Fri, 22 Jan 2016 06:51:45 -0800 (PST) X-Received: by 10.55.81.3 with SMTP id f3mr4104545qkb.35.1453474305135; Fri, 22 Jan 2016 06:51:45 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id n6si7431767qge.102.2016.01.22.06.51.44; Fri, 22 Jan 2016 06:51:45 -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; dkim=neutral (body hash did not verify) header.i=@linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 6292D617EC; Fri, 22 Jan 2016 14:51:44 +0000 (UTC) Authentication-Results: lists.linaro.org; dkim=fail reason="verification failed; unprotected key" header.d=linaro.org header.i=@linaro.org header.b=UZnjqQuo; dkim-adsp=none (unprotected policy); dkim-atps=neutral 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=-2.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID, URIBL_BLOCKED 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 6E34C617D9; Fri, 22 Jan 2016 14:51:39 +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 B85A6617E5; Fri, 22 Jan 2016 14:51:36 +0000 (UTC) Received: from mail-lf0-f41.google.com (mail-lf0-f41.google.com [209.85.215.41]) by lists.linaro.org (Postfix) with ESMTPS id 06FAB616DA for ; Fri, 22 Jan 2016 14:51:32 +0000 (UTC) Received: by mail-lf0-f41.google.com with SMTP id h129so48937769lfh.3 for ; Fri, 22 Jan 2016 06:51:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=1NJDKp5jB6KnrXq0+Fh/dRVVB0YBbLM0NIYZ7jMQUB0=; b=UZnjqQuonGtWoRqe0ffZ/PgHdbBl0xdik2aDvG3MxYJ7QPfQHVGB3kbaldoRaXQwgf bGwB8zH0LrDCpbybmCUnOrOEipWJlSnwEBDTvUGBP1q3LV5Dl6SflloNiNeBxiJZBSkk tngwnfSjjlx0/oDwEXJCQ8BIjViv7uiQ5m9tY= 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; bh=1NJDKp5jB6KnrXq0+Fh/dRVVB0YBbLM0NIYZ7jMQUB0=; b=fTlfFUhuYnakz5/R8vbdDOXRgzkOo6F/LDw2Yjg8vWBnyMN1+JkLTDBUY/JxYRTmp7 MAc+EjRMs8+PJ+RoR7nsmy7mklTSlROPSRJ0x54PuvFVmn8vDDnu5EVU+jUJgZhopj51 giJ6DQlyrrW1SHhzJVfgCvwph13Ljx89AXgfHgzrUT8cFS2TA8XfQerGaaKhvFCgxF3Q sR60t2JAFnykcrhi4bgyOCi8Xct7QgxR+cGk6widKC9+mU4XTjsqPytttuPHV9EwrkiI mYiDwm3Lk1B3PezAM/DQPRazHvl8NImAVu6q8xvoJcYexs1QIVsarLMqSOwwABY5+M0v Et2w== X-Gm-Message-State: AG10YOSlQVhUnGXyymF3uhny4QAfxR+YvqLLWLxklyeyQNay05csz+tgSG3zgkL2BihiFE7ezNE= X-Received: by 10.25.169.74 with SMTP id s71mr1258697lfe.128.1453474289654; Fri, 22 Jan 2016 06:51:29 -0800 (PST) Received: from localhost.localdomain ([195.238.92.128]) by smtp.gmail.com with ESMTPSA id 99sm940653lfp.30.2016.01.22.06.51.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 22 Jan 2016 06:51:28 -0800 (PST) From: Ivan Khoronzhuk To: lng-odp@lists.linaro.org Date: Fri, 22 Jan 2016 16:51:22 +0200 Message-Id: <1453474282-5244-1-git-send-email-ivan.khoronzhuk@linaro.org> X-Mailer: git-send-email 1.9.1 X-Topics: timers patch Subject: [lng-odp] [PATCH v3] example: timer: free resources while termination 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: , MIME-Version: 1.0 Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" Example should free resources in right order when terminates. Also it should have correct error path. Signed-off-by: Ivan Khoronzhuk Reviewed-by: Bill Fischofer --- Since v2: use less labels in one error path Since v1: Just rebase, no functional changes example/timer/odp_timer_test.c | 57 ++++++++++++++++++++++++++++++++++-------- 1 file changed, 47 insertions(+), 10 deletions(-) diff --git a/example/timer/odp_timer_test.c b/example/timer/odp_timer_test.c index b7a4fd2..6d89713 100644 --- a/example/timer/odp_timer_test.c +++ b/example/timer/odp_timer_test.c @@ -332,20 +332,23 @@ int main(int argc, char *argv[]) odp_timer_pool_info_t tpinfo; odp_cpumask_t cpumask; char cpumaskstr[ODP_CPUMASK_STR_SIZE]; - odp_shm_t shm; - test_globals_t *gbls; + odp_shm_t shm = ODP_SHM_INVALID; + test_globals_t *gbls = NULL; + int err = 0; printf("\nODP timer example starts\n"); if (odp_init_global(NULL, NULL)) { + err = 1; printf("ODP global init failed.\n"); - return -1; + goto err_global; } /* Init this thread. */ if (odp_init_local(ODP_THREAD_CONTROL)) { + err = 1; printf("ODP local init failed.\n"); - return -1; + goto err_local; } printf("\n"); @@ -363,16 +366,20 @@ int main(int argc, char *argv[]) shm = odp_shm_reserve("shm_test_globals", sizeof(test_globals_t), ODP_CACHE_LINE_SIZE, 0); if (ODP_SHM_INVALID == shm) { + err = 1; EXAMPLE_ERR("Error: shared mem reserve failed.\n"); - return -1; + goto err; } gbls = odp_shm_addr(shm); if (NULL == gbls) { + err = 1; EXAMPLE_ERR("Error: shared mem alloc failed.\n"); - return -1; + goto err; } memset(gbls, 0, sizeof(test_globals_t)); + gbls->pool = ODP_POOL_INVALID; + gbls->tp = ODP_TIMER_POOL_INVALID; parse_args(argc, argv, &gbls->args); @@ -407,8 +414,9 @@ int main(int argc, char *argv[]) gbls->pool = odp_pool_create("msg_pool", ¶ms); if (gbls->pool == ODP_POOL_INVALID) { + err = 1; EXAMPLE_ERR("Pool create failed.\n"); - return -1; + goto err; } tparams.res_ns = gbls->args.resolution_us * ODP_TIME_USEC_IN_NS; @@ -419,8 +427,9 @@ int main(int argc, char *argv[]) tparams.clk_src = ODP_CLOCK_CPU; gbls->tp = odp_timer_pool_create("timer_pool", &tparams); if (gbls->tp == ODP_TIMER_POOL_INVALID) { + err = 1; EXAMPLE_ERR("Timer pool create failed.\n"); - return -1; + goto err; } odp_timer_pool_start(); @@ -445,8 +454,9 @@ int main(int argc, char *argv[]) queue = odp_queue_create("timer_queue", ODP_QUEUE_TYPE_SCHED, ¶m); if (queue == ODP_QUEUE_INVALID) { + err = 1; EXAMPLE_ERR("Timer queue create failed.\n"); - return -1; + goto err; } printf("CPU freq %"PRIu64" Hz\n", odp_sys_cpu_hz()); @@ -484,7 +494,34 @@ int main(int argc, char *argv[]) /* Wait for worker threads to exit */ odph_linux_pthread_join(thread_tbl, num_workers); - printf("ODP timer test complete\n\n"); + /* free resources */ + if (odp_queue_destroy(queue)) + err = 1; +err: + + if (gbls != NULL && gbls->tp != ODP_TIMER_POOL_INVALID) + odp_timer_pool_destroy(gbls->tp); + + if (gbls != NULL && gbls->pool != ODP_TIMER_POOL_INVALID) + if (odp_pool_destroy(gbls->pool)) + err = 1; + + if (shm != ODP_SHM_INVALID) + if (odp_shm_free(shm)) + err = 1; + + if (odp_term_local()) + err = 1; +err_local: + if (odp_term_global()) + err = 1; +err_global: + if (err) { + printf("Err: ODP timer test failed\n\n"); + return -1; + } + + printf("ODP timer test complete\n\n"); return 0; }