From patchwork Tue Feb 20 15:00:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 128907 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp4733155ljc; Tue, 20 Feb 2018 07:03:53 -0800 (PST) X-Google-Smtp-Source: AH8x226AoGmEwiE2uswt6kqdjsllI5UzzL9UfFCC1nIzAfwdioiBsgzv9G+vHI7+1c2BwIth+7vB X-Received: by 10.37.151.129 with SMTP id i1mr8537374ybo.401.1519139033334; Tue, 20 Feb 2018 07:03:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519139033; cv=none; d=google.com; s=arc-20160816; b=DaTBK95relWd/K+r5v/oRXfXHtxSx4REOxccvWohXkgO7KzZVgn/d+NEKkZq9OF6Sg 5UkBesdkUOcg7hW+QkbP0C0a/3xtB2wrmOM8Zew0siRST3l23IQKptGt1afbaFhvbWuh CcjrhKcQoizt63cLvZGeDLBI0AW/jcfYiXICI+csTaPvBkc5wjkXmxugHoFqWjM+ypW5 xgLD1r3Ucr6hJi5n0IaqDcHknPn6unvGPnAy8bkm8UXQMGlVZ0eaCD0+EjBSzcPxz1+h bPL7VwG056N/nC4nZOhOrWBv6j99uYf/RLCYy1A3k8iBvCPHx1v5f+0zKkf/FPy8DGD6 b5nw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=moRBM3fHMQlA708noBEYrgARpDfbzOIHQOSsPwM2TP0=; b=zoLY1kLD0FCzPFRE4Bqd4K7L/xl344hsui0ba9cKHTbYYaL15RSpuocftSheSzV6vb gSXsbhHj6FlCqaouHygR75vJL2aVAQ+RpqTsj5wPcU2ypCBRH4LSXtDwMG/llnYiBRF7 KO83LjmT8sJEzex7AWq4cyicLUCPs6qan1Xyvk1ur23XoGNePolb0f+vTp1gVPtOJnP/ OPxoN95taMLEznhYXexpNyg48kmgsn5yyLLxMpg7jSoPHkGaQospZhos1LWUn5B1JjbR /TA37DCd345FvrsUDx/ESZ5wcSJ4dnyiVBHGLgidkGkBMUb8EkddQmCohvoR3Gh5tiuf yPkQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id q22si2990709qtk.200.2018.02.20.07.03.31; Tue, 20 Feb 2018 07:03:53 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 2B13461522; Tue, 20 Feb 2018 15:03:31 +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=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, 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 3283B616EA; Tue, 20 Feb 2018 15:00:52 +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 5C03860729; Tue, 20 Feb 2018 15:00:29 +0000 (UTC) Received: from forward105p.mail.yandex.net (forward105p.mail.yandex.net [77.88.28.108]) by lists.linaro.org (Postfix) with ESMTPS id 86D6861781 for ; Tue, 20 Feb 2018 15:00:25 +0000 (UTC) Received: from mxback10o.mail.yandex.net (mxback10o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::24]) by forward105p.mail.yandex.net (Yandex) with ESMTP id CDBBF4083999 for ; Tue, 20 Feb 2018 18:00:20 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback10o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id 6rgdX7Cymj-0KoSgPGA; Tue, 20 Feb 2018 18:00:20 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id 7uC8N0Zg8Y-0Kw8dgKA; Tue, 20 Feb 2018 18:00:20 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Tue, 20 Feb 2018 18:00:12 +0300 Message-Id: <1519138817-822-3-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519138817-822-1-git-send-email-odpbot@yandex.ru> References: <1519138817-822-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 467 Subject: [lng-odp] [PATCH v2 2/7] linux-gen: sched: encapsulate sched init/term_global functions 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" From: Dmitry Eremin-Solenikov Hide calling into sched_fn into sched_if module. Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 467 (lumag:sched-env) ** https://github.com/Linaro/odp/pull/467 ** Patch: https://github.com/Linaro/odp/pull/467.patch ** Base sha: d5419e8857b2bc61d3be17fe53f171550fee426b ** Merge commit sha: d7c90978f25a7415a6bd43474e213e1bf63b2531 **/ platform/linux-generic/include/odp_internal.h | 3 +++ platform/linux-generic/odp_init.c | 4 ++-- platform/linux-generic/odp_schedule_if.c | 11 +++++++++++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/platform/linux-generic/include/odp_internal.h b/platform/linux-generic/include/odp_internal.h index e36b084f1..ff58ec863 100644 --- a/platform/linux-generic/include/odp_internal.h +++ b/platform/linux-generic/include/odp_internal.h @@ -103,6 +103,9 @@ int odp_pool_term_local(void); int _odp_queue_init_global(void); int _odp_queue_term_global(void); +int _odp_schedule_init_global(void); +int _odp_schedule_term_global(void); + int odp_pktio_init_global(void); int odp_pktio_term_global(void); int odp_pktio_init_local(void); diff --git a/platform/linux-generic/odp_init.c b/platform/linux-generic/odp_init.c index 3900fb629..1f84ecd21 100644 --- a/platform/linux-generic/odp_init.c +++ b/platform/linux-generic/odp_init.c @@ -96,7 +96,7 @@ int odp_init_global(odp_instance_t *instance, } stage = QUEUE_INIT; - if (sched_fn->init_global()) { + if (_odp_schedule_init_global()) { ODP_ERR("ODP schedule init failed.\n"); goto init_failed; } @@ -231,7 +231,7 @@ int _odp_term_global(enum init_stage stage) /* Fall through */ case SCHED_INIT: - if (sched_fn->term_global()) { + if (_odp_schedule_term_global()) { ODP_ERR("ODP schedule term failed.\n"); rc = -1; } diff --git a/platform/linux-generic/odp_schedule_if.c b/platform/linux-generic/odp_schedule_if.c index 08ca813a9..e26634463 100644 --- a/platform/linux-generic/odp_schedule_if.c +++ b/platform/linux-generic/odp_schedule_if.c @@ -7,6 +7,7 @@ #include "config.h" #include +#include extern const schedule_fn_t schedule_sp_fn; extern const schedule_api_t schedule_sp_api; @@ -134,3 +135,13 @@ void odp_schedule_order_unlock_lock(uint32_t unlock_index, uint32_t lock_index) { sched_api->schedule_order_unlock_lock(unlock_index, lock_index); } + +int _odp_schedule_init_global(void) +{ + return sched_fn->init_global(); +} + +int _odp_schedule_term_global(void) +{ + return sched_fn->term_global(); +}