From patchwork Tue Feb 20 17:00:21 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: 128929 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp4852958ljc; Tue, 20 Feb 2018 09:04:10 -0800 (PST) X-Google-Smtp-Source: AH8x227l0vP9hQOJJ00qFOPQ8fMHvV6lSNVZZ/AcWuC08kaRxLZg1kAsKCPVeKbGR0C3PYv78P5I X-Received: by 10.200.49.226 with SMTP id i31mr509600qte.42.1519146250482; Tue, 20 Feb 2018 09:04:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519146250; cv=none; d=google.com; s=arc-20160816; b=dI7AVyw/t4ZLd3NYZh8OGT7Pxha++2V3Ahm+dxqqLnGnSKTJsI9AL0389YXOtql3LN IvJe7YAk7W/uM97wLwsqaSA26Ah8DVjOmZuT2lzSWW1U4M78QrbUKfMQZhmzc9fw6pLz 0OE4A4FpP7d/T6pMlj1zheUYEYxjqJ8CapvH0sSS27MVrURgLz6VJ5fa7SwoDg6eoO9N /Sa6fUiFHup5LGMnPrdUEmU9jEr5Z9o6OSdqMqsMdvwHo9vHmSW61v7FJI6mb7kDfZEK lCVG8FHbzbbwg64u//iNOPeeRVRXLW17vPHafCQf/niMmIO5Qp2AUu2lu3TQWH+i64lJ Fqbg== 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=w+PglHcM4CBNNElQHVrf9Etsvl4xu5d/iqIhZTAbcb0=; b=hxcRbxt5XH14cPiHrnoCDHpn8vIR6y2XWKGv/baf9pVyiA/4RFUMYNz62MzrAk5bLQ KqAFOKR0gIWuknzPSCnu68XD3qaSHGCj6Y+81s2Ica5VLhMVbqEPs+nQmE0VP/hSCZQl /Du984YygZDXajrFMi4JlCazdLFPOr+ZcKpnrJz3M9sdsmD5giPShUZO8a7MtEwEeUAW GY1t5hD/cJ0L40V/zgSJlTRrX2eZ48nngtc2ISHnNDGTpjPdYkQ/eXN/Gd5rWqNCMfjH tbzOTq7UEFigTvr5LCoaYxVaC9tcwCYBHSHoGrYXpQTbq5BBikkYRZYZCI8PVE0x8MO7 IQ5w== 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 u126si918700qkc.353.2018.02.20.09.04.10; Tue, 20 Feb 2018 09:04:10 -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 0C9E76171D; Tue, 20 Feb 2018 17:04:10 +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 441B7616FF; Tue, 20 Feb 2018 17:01:59 +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 086CF616FF; Tue, 20 Feb 2018 17:01:54 +0000 (UTC) Received: from forward100j.mail.yandex.net (forward100j.mail.yandex.net [5.45.198.240]) by lists.linaro.org (Postfix) with ESMTPS id 121B2608CF for ; Tue, 20 Feb 2018 17:00:31 +0000 (UTC) Received: from mxback3o.mail.yandex.net (mxback3o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::1d]) by forward100j.mail.yandex.net (Yandex) with ESMTP id 8895B5D82D21 for ; Tue, 20 Feb 2018 20:00:29 +0300 (MSK) Received: from smtp4p.mail.yandex.net (smtp4p.mail.yandex.net [2a02:6b8:0:1402::15:6]) by mxback3o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id S9NPFOkuB2-0TDmJNpn; Tue, 20 Feb 2018 20:00:29 +0300 Received: by smtp4p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id d7rw0280Nt-0STiSP7w; Tue, 20 Feb 2018 20:00:28 +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:21 +0300 Message-Id: <1519146027-3446-2-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 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: 911ad4bd1709c0e28617d1e82038172c21039039 **/ 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(); +}