From patchwork Tue Feb 20 13:00:07 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: 128896 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp4612355ljc; Tue, 20 Feb 2018 05:01:35 -0800 (PST) X-Google-Smtp-Source: AH8x225xuKCwAJkYHzHGw5fsF8WtHWCAxoItbXW1EJX39CvBm/HlMWsq7F02yVXZzS4SVFD4ciTB X-Received: by 10.37.91.68 with SMTP id p65mr10334449ybb.83.1519131695223; Tue, 20 Feb 2018 05:01:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519131695; cv=none; d=google.com; s=arc-20160816; b=Z7vpgASovK5maKaEK2Z4zTgW2bKpESebQmeX/lgVHDeOtcdAkRdZ0jpSMyyjPpI8iZ FjWPIpA1W8Vgs4VmgKDVAmGQOkLAZVbXYrNJGygE9NZ9MWaPyb1hXnXWdMawou0q6RtV qG0cxMQMw3YarfPV3KyINYqu4NQLteT3mfi9U2FjXAahaUea7inbLwwlIz83Zn5fcuIr PXF8iRpEcgj0ITX6YqNTtKfTKcP6VsKkWDu5CdUqXpFp9GUaxVMXGZTw7lJlMP+fpotj asiosdAzTzC3OFQsjKTIo2GvAkTRAHg1rxwH0S4SrwvmFQmz41zNV48hPWC5xGDgItsY W8Zw== 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=pI0CVMlfKTL2p+dMxk4qrxHUXNMcLuvdWO0lnhUspcU=; b=KSA8T2yNlc+Ix90/OlBpN4J23RiMaN4l9zIAKqgzZGydJKSAaZhbMiKeiQt+WixIY2 9iz/IuBk17BK+dI6d6KlEetqjGyvLbLaIkHQAUZyHACUOISCpnmIq6gLgV8hDBh/we79 SguRLJE7HpTLjEcX6OG63sM1cEmDMjq9eXWpint3W68NiyaoDVhj6/VHHeSNvJpdPszN y1L3C1DmGtAzY92fimAbc0vglU00XHqleiJN/T8KbQoM6Np4mtzWzvF7cjyLYyjvIq2a /hgEJgMOR33L6udnmJdjVBkmuonAjQvpoys7XGlXRpjN9aASeNFUmhzTpQQdYidmYNWw b5HQ== 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 a20si69687qkh.123.2018.02.20.05.01.34; Tue, 20 Feb 2018 05:01:35 -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 D83F061770; Tue, 20 Feb 2018 13:01:34 +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_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 707B360B52; Tue, 20 Feb 2018 13:00:43 +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 61095607C4; Tue, 20 Feb 2018 13:00:34 +0000 (UTC) Received: from forward102j.mail.yandex.net (forward102j.mail.yandex.net [5.45.198.243]) by lists.linaro.org (Postfix) with ESMTPS id 093D6608F6 for ; Tue, 20 Feb 2018 13:00:29 +0000 (UTC) Received: from mxback8j.mail.yandex.net (mxback8j.mail.yandex.net [IPv6:2a02:6b8:0:1619::111]) by forward102j.mail.yandex.net (Yandex) with ESMTP id 32CEB56031BA for ; Tue, 20 Feb 2018 16:00:27 +0300 (MSK) Received: from smtp2p.mail.yandex.net (smtp2p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:7]) by mxback8j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id c8Eq7WepvB-0RsWW2Sw; Tue, 20 Feb 2018 16:00:27 +0300 Received: by smtp2p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id INTanao9Vw-0K6OKf38; Tue, 20 Feb 2018 16: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 16:00:07 +0300 Message-Id: <1519131613-30839-2-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519131613-30839-1-git-send-email-odpbot@yandex.ru> References: <1519131613-30839-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 467 Subject: [lng-odp] [PATCH v1 1/7] linux-gen: queue: encapsulate queue 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 queue_fn into queue_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: e771b2cf674da116ae0cb9e7e5dca276e31fa112 **/ platform/linux-generic/include/odp_internal.h | 3 +++ platform/linux-generic/odp_init.c | 4 ++-- platform/linux-generic/odp_queue_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 f85a2f538..e36b084f1 100644 --- a/platform/linux-generic/include/odp_internal.h +++ b/platform/linux-generic/include/odp_internal.h @@ -100,6 +100,9 @@ int odp_pool_init_local(void); int odp_pool_term_global(void); int odp_pool_term_local(void); +int _odp_queue_init_global(void); +int _odp_queue_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 0c5adf335..3900fb629 100644 --- a/platform/linux-generic/odp_init.c +++ b/platform/linux-generic/odp_init.c @@ -90,7 +90,7 @@ int odp_init_global(odp_instance_t *instance, } stage = POOL_INIT; - if (queue_fn->init_global()) { + if (_odp_queue_init_global()) { ODP_ERR("ODP queue init failed.\n"); goto init_failed; } @@ -238,7 +238,7 @@ int _odp_term_global(enum init_stage stage) /* Fall through */ case QUEUE_INIT: - if (queue_fn->term_global()) { + if (_odp_queue_term_global()) { ODP_ERR("ODP queue term failed.\n"); rc = -1; } diff --git a/platform/linux-generic/odp_queue_if.c b/platform/linux-generic/odp_queue_if.c index 969b0d3cb..e1cfc9445 100644 --- a/platform/linux-generic/odp_queue_if.c +++ b/platform/linux-generic/odp_queue_if.c @@ -7,6 +7,7 @@ #include "config.h" #include +#include extern const queue_api_t queue_scalable_api; extern const queue_fn_t queue_scalable_fn; @@ -111,3 +112,13 @@ int odp_queue_info(odp_queue_t queue, odp_queue_info_t *info) { return queue_api->queue_info(queue, info); } + +int _odp_queue_init_global(void) +{ + return queue_fn->init_global(); +} + +int _odp_queue_term_global(void) +{ + return queue_fn->term_global(); +}