From patchwork Thu Dec 1 23:03:27 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Brooks X-Patchwork-Id: 86168 Delivered-To: patch@linaro.org Received: by 10.140.20.101 with SMTP id 92csp928541qgi; Thu, 1 Dec 2016 15:05:04 -0800 (PST) X-Received: by 10.55.4.19 with SMTP id 19mr35786207qke.18.1480633504611; Thu, 01 Dec 2016 15:05:04 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id q54si1387356qtq.113.2016.12.01.15.05.04; Thu, 01 Dec 2016 15:05:04 -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 40B7462ED0; Thu, 1 Dec 2016 23:05:04 +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_H2 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 EA283608B5; Thu, 1 Dec 2016 23:04:30 +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 8E2A9606B5; Thu, 1 Dec 2016 23:04:26 +0000 (UTC) Received: from mail-oi0-f47.google.com (mail-oi0-f47.google.com [209.85.218.47]) by lists.linaro.org (Postfix) with ESMTPS id 50989606B5 for ; Thu, 1 Dec 2016 23:04:25 +0000 (UTC) Received: by mail-oi0-f47.google.com with SMTP id v84so247019292oie.3 for ; Thu, 01 Dec 2016 15:04:25 -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=i9r8kLT7psHqhvHUcPaXm2Kn0oZUUwo0S0rP41HXSN4=; b=MAf5ul179MhCzopCXANFYrt+zhunMYKVjBTcQ2xlvHOPPDUBUdtOafsAufoixM82Gh u8YoR3NmwSe2NbMsYCbPrqiQl3KcQvGvbwjuwG3XQYcihj8d67yatGsfOTAhfiWzZrlx ZuMJ5ZOtvTITEZtHI37npt+PvGMfoSt61G0rpxCVBvOHy7XK4QQuaUTrvD4SXNauDLwd YGAAU9+Su02AYp5Q+wHM6OY8MTbvV3BZP9GsPD5ErDb33IxLuyeU/dpv6QwK+msCIHkK Ha1TFj5VcLIfLwlxQJBWsDURyQ85nYaYzAvHgXosgUowLEmFNSDXLZKOH31iUc3fjFvr 9uQA== X-Gm-Message-State: AKaTC0394cdj5eTdX8bCb8nMFSz7Mpyndin73MXqO5GKmw4vAC7tATXjtPZbcqnZ3dXMm7mJtXQ= X-Received: by 10.157.20.225 with SMTP id r30mr25177121otr.148.1480633464703; Thu, 01 Dec 2016 15:04:24 -0800 (PST) Received: from localhost.localdomain (68-248-140-212.lightspeed.austtx.sbcglobal.net. [68.248.140.212]) by smtp.gmail.com with ESMTPSA id w129sm759106oie.1.2016.12.01.15.04.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 01 Dec 2016 15:04:24 -0800 (PST) From: Brian Brooks To: lng-odp@lists.linaro.org Date: Thu, 1 Dec 2016 17:03:27 -0600 Message-Id: <1480633409-24532-2-git-send-email-brian.brooks@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1480633409-24532-1-git-send-email-brian.brooks@linaro.org> References: <1480633409-24532-1-git-send-email-brian.brooks@linaro.org> Subject: [lng-odp] [RFC API-NEXT PATCHv2 2/4] api: timer: add odp_timer_pool_from_timer() 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" Signed-off-by: Brian Brooks --- include/odp/api/spec/timer.h | 9 +++++++++ platform/linux-generic/odp_timer.c | 5 +++++ test/common_plat/validation/api/timer/timer.c | 2 ++ 3 files changed, 16 insertions(+) -- 2.7.4 diff --git a/include/odp/api/spec/timer.h b/include/odp/api/spec/timer.h index 2e59ace..43f2d58 100644 --- a/include/odp/api/spec/timer.h +++ b/include/odp/api/spec/timer.h @@ -200,6 +200,15 @@ int odp_timer_pool_info(odp_timer_pool_t tpid, uint64_t odp_timer_pool_resolution(odp_timer_pool_t tpid); /** + * Get timer pool from timer + * + * @param tim Timer handle + * + * @return Timer pool handle + */ +odp_timer_pool_t odp_timer_pool_from_timer(odp_timer_t tim); + +/** * Allocate a timer * * Create a timer (allocating all necessary resources e.g. timeout event) from diff --git a/platform/linux-generic/odp_timer.c b/platform/linux-generic/odp_timer.c index 2c14c93..89e0f52 100644 --- a/platform/linux-generic/odp_timer.c +++ b/platform/linux-generic/odp_timer.c @@ -842,6 +842,11 @@ uint64_t odp_timer_pool_resolution(odp_timer_pool_t tpid) return tpid->param.res_ns; } +odp_timer_pool_t odp_timer_pool_from_timer(odp_timer_t tim) +{ + return handle_to_tp(tim); +} + uint64_t odp_timer_pool_to_u64(odp_timer_pool_t tpid) { return _odp_pri(tpid); diff --git a/test/common_plat/validation/api/timer/timer.c b/test/common_plat/validation/api/timer/timer.c index 0d0514a..0dff939 100644 --- a/test/common_plat/validation/api/timer/timer.c +++ b/test/common_plat/validation/api/timer/timer.c @@ -231,6 +231,8 @@ static void handle_tmo(odp_event_t ev, bool stale, uint64_t prev_tick) uint64_t tick = odp_timeout_tick(tmo); struct test_timer *ttp = odp_timeout_user_ptr(tmo); + CU_ASSERT(odp_timer_pool_from_timer(tim) == tp); + if (tim == ODP_TIMER_INVALID) CU_FAIL("odp_timeout_timer() invalid timer"); if (!ttp)