From patchwork Tue Feb 20 17:00:22 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: 128930 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp4853655ljc; Tue, 20 Feb 2018 09:04:46 -0800 (PST) X-Google-Smtp-Source: AH8x22795JtI9xZNOOIhqGRh85PBmxhhUWXgJEpNlmbA7DtFnMbmMl2nyspE4B75ojztmy/IKlQK X-Received: by 10.129.94.2 with SMTP id s2mr287291ywb.222.1519146286379; Tue, 20 Feb 2018 09:04:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519146286; cv=none; d=google.com; s=arc-20160816; b=PnYg0qdEMJysPr/reBNcjVMmupnByIpP8f9zM7MRHD67SqpTkowuKqKso3nvx0tl2v zlZnTEAoXZ+qLB9IhIWOaaprqDTk6Eozt9dmI6TRiIFbCT33Qkgxk1dRMj2CgbHmK7qn eM0NWRPj4V1p0/DQhouUVkXoL9X1karuI5hWPiHtnTItiFvIBUQdO3NGSO6KmC0tTrHl caoifC7QMYLJiygi7JvQMg0LAtTpAxasERHYZJrR661xLV7O10aEA3yw3CzU2Kga8mVI uVprALsfDFpaR59YOTqxhOSFCcyaa+D+gxLW4JYBMfknKOWeM23gbLn7gvCAR1GSllPV 0Yfg== 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=NwpRkr2+BmcmGwG2UFNoibGZyiwQ5Ux5abtc6KAPBYg=; b=x/oR7nGQmY6hvuNAws2B9LuTmGYRhQAbLB4+l6RWe3TCH2J56c1Oa09EbDmn7AzsdQ oHOFXO4UvlEkgDonSf8Doa0WAhjSp7GBUsS8wXCeSRNQkbtoQKlI9COMvTSZGsLVDGoz X6KLKo0agH4OogkBYP+EKoCTRbP1aX9yN31mQk5dC97BZRRUEWBtIavZynxn2iJoC599 00Z28Ygp2F3yyHQJXFCh9l3XKmGLPYNvU9kLgJo+qRUi4Ne/ZGUXfTQpT9zfc7dOwNum E0pPv93WVFUPaDNF1Bd7r1YLZCUhWOwbcIouwh9mR6q6G1vpqcM5rgX/picsu/ZVYPYR +K1g== 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 m28si206834qta.91.2018.02.20.09.04.46; Tue, 20 Feb 2018 09:04:46 -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 0DA7D6170D; Tue, 20 Feb 2018 17:04:46 +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 908FB616F4; Tue, 20 Feb 2018 17:02:01 +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 EF6B0616FF; Tue, 20 Feb 2018 17:01:57 +0000 (UTC) Received: from forward105j.mail.yandex.net (forward105j.mail.yandex.net [5.45.198.248]) by lists.linaro.org (Postfix) with ESMTPS id D00E9608E8 for ; Tue, 20 Feb 2018 17:00:31 +0000 (UTC) Received: from mxback9o.mail.yandex.net (mxback9o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::23]) by forward105j.mail.yandex.net (Yandex) with ESMTP id 70963182942 for ; Tue, 20 Feb 2018 20:00:30 +0300 (MSK) Received: from smtp4p.mail.yandex.net (smtp4p.mail.yandex.net [2a02:6b8:0:1402::15:6]) by mxback9o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id chr397Ggse-0UD0LbM7; Tue, 20 Feb 2018 20:00:30 +0300 Received: by smtp4p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id d7rw0280Nt-0TTeGhmJ; Tue, 20 Feb 2018 20:00:29 +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 20:00:22 +0300 Message-Id: <1519146027-3446-3-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519146027-3446-1-git-send-email-odpbot@yandex.ru> References: <1519146027-3446-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 467 Subject: [lng-odp] [PATCH v4 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: 911ad4bd1709c0e28617d1e82038172c21039039 **/ 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(); +}