From patchwork Tue Feb 27 20:00:37 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: 129863 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp226798lja; Tue, 27 Feb 2018 12:19:49 -0800 (PST) X-Google-Smtp-Source: AG47ELscHYGx5M72+Gx7VCIP2T18/H1tMStRp3kjlKKGvuQjbSzX6r5qJ23dMPHCCRDDAeoCyISZ X-Received: by 10.55.103.1 with SMTP id b1mr24727569qkc.98.1519762789753; Tue, 27 Feb 2018 12:19:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519762789; cv=none; d=google.com; s=arc-20160816; b=u855EtXSonABDO3PytKN1OsCHxLjssJjVE7irKvp134Pk4kNGILZboYWi1hGcJRJEY tskkZaWMy1zVAnTP3+lUNnlQIVdTrAUhPFW/qv2NTe+lB5bTBdB8xffmTrYVKJBHGiZ6 xNyuCKElTV42NCRIf6QDkWyZb9tO3VgZA4lUPsYPDXTmzjbiClgw6I/YHh/9jtAqZXiD rUD+jOrD4m6TApW7uJGXkpa9Rf9nEwtSMEiAWXIVqbMT9RCfdPOvC3IJzkJH2hvWR/9h lxE1lGR3oAC9sHuCZqYzkRN5hYiVjifoM9nXYZtj4CQ9jX5+ozNE95GqAp+gD1g74qnB ECkQ== 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=es6iZZDu/tvyVDB6JSgSD9vIhkAIY6jVaM8Rsq2dV4s=; b=S5HuZurR4uV5VDSs34KTjdhC8ENp3LrK27MPUqjGECCsYg1ptkKwj+fiA5VZUTOCLM 6ZnunGnjiYGcT6HvpOkbuNXqZI7uN0TlcGG39IpnRFLAf0lOj2kgcLTkp8VX112z4d/C tuZUWC3dNPWNtFV9AIFtELPL/Ey5n0QJUxlwCEcpfuUaB4ULfqy9u0uiyUq3kZZy9ZHL HYgl6QtOqSOpBRTgq3A6POQhmPrw4ZTM0mCpSieGxpz1n85dskwYTiOktqaicOQ07gjY dAKUN6OGJ13mhtxv2ssN97PetPBLdOtSkI1qQOXSIVPggClB62PiiH5KytlyxbVY/czB mgTw== 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 q37si2267775qtj.451.2018.02.27.12.19.49; Tue, 27 Feb 2018 12:19:49 -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 6BDF561778; Tue, 27 Feb 2018 20:19:49 +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 C04A6617E3; Tue, 27 Feb 2018 20:03:08 +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 0F1BA617E6; Tue, 27 Feb 2018 20:02:58 +0000 (UTC) Received: from forward105o.mail.yandex.net (forward105o.mail.yandex.net [37.140.190.183]) by lists.linaro.org (Postfix) with ESMTPS id D114B61758 for ; Tue, 27 Feb 2018 20:00:44 +0000 (UTC) Received: from mxback5g.mail.yandex.net (mxback5g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:166]) by forward105o.mail.yandex.net (Yandex) with ESMTP id BE6634444F30 for ; Tue, 27 Feb 2018 23:00:43 +0300 (MSK) Received: from smtp4o.mail.yandex.net (smtp4o.mail.yandex.net [2a02:6b8:0:1a2d::28]) by mxback5g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id 6uXxa3N9aW-0hQidIis; Tue, 27 Feb 2018 23:00:43 +0300 Received: by smtp4o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id zvM1YyQEKf-0ha4S3AM; Tue, 27 Feb 2018 23:00:43 +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, 27 Feb 2018 23:00:37 +0300 Message-Id: <1519761641-21081-4-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519761641-21081-1-git-send-email-odpbot@yandex.ru> References: <1519761641-21081-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 467 Subject: [lng-odp] [PATCH v6 3/7] linux-gen: rename traditional scheduler and queue to basic 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 Rename traditional scheduler and queue implementations to basic. 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: 3984ba4cd16a02e3fa98ccd432a06663de3fa993 ** Merge commit sha: 62438643661dee1350bce73f90120c824538df8b **/ platform/linux-generic/Makefile.am | 4 ++-- platform/linux-generic/{odp_queue.c => odp_queue_basic.c} | 4 ++-- platform/linux-generic/odp_queue_if.c | 8 ++++---- platform/linux-generic/{odp_schedule.c => odp_schedule_basic.c} | 4 ++-- platform/linux-generic/odp_schedule_if.c | 8 ++++---- 5 files changed, 14 insertions(+), 14 deletions(-) rename platform/linux-generic/{odp_queue.c => odp_queue_basic.c} (99%) rename platform/linux-generic/{odp_schedule.c => odp_schedule_basic.c} (99%) diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 1feecd3b2..b6e195555 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -172,13 +172,13 @@ __LIB__libodp_linux_la_SOURCES = \ pktio/ring.c \ odp_pkt_queue.c \ odp_pool.c \ - odp_queue.c \ + odp_queue_basic.c \ odp_queue_if.c \ odp_queue_lf.c \ odp_queue_scalable.c \ odp_rwlock.c \ odp_rwlock_recursive.c \ - odp_schedule.c \ + odp_schedule_basic.c \ odp_schedule_if.c \ odp_schedule_sp.c \ odp_schedule_iquery.c \ diff --git a/platform/linux-generic/odp_queue.c b/platform/linux-generic/odp_queue_basic.c similarity index 99% rename from platform/linux-generic/odp_queue.c rename to platform/linux-generic/odp_queue_basic.c index a7933c9bb..0c0a11ec1 100644 --- a/platform/linux-generic/odp_queue.c +++ b/platform/linux-generic/odp_queue_basic.c @@ -790,7 +790,7 @@ static odp_queue_t queue_to_ext(queue_t q_int) } /* API functions */ -queue_api_t queue_default_api = { +queue_api_t queue_basic_api = { .queue_create = queue_create, .queue_destroy = queue_destroy, .queue_lookup = queue_lookup, @@ -812,7 +812,7 @@ queue_api_t queue_default_api = { }; /* Functions towards internal components */ -queue_fn_t queue_default_fn = { +queue_fn_t queue_basic_fn = { .init_global = queue_init_global, .term_global = queue_term_global, .init_local = queue_init_local, diff --git a/platform/linux-generic/odp_queue_if.c b/platform/linux-generic/odp_queue_if.c index e1cfc9445..d1c468485 100644 --- a/platform/linux-generic/odp_queue_if.c +++ b/platform/linux-generic/odp_queue_if.c @@ -12,15 +12,15 @@ extern const queue_api_t queue_scalable_api; extern const queue_fn_t queue_scalable_fn; -extern const queue_api_t queue_default_api; -extern const queue_fn_t queue_default_fn; +extern const queue_api_t queue_basic_api; +extern const queue_fn_t queue_basic_fn; #ifdef ODP_SCHEDULE_SCALABLE const queue_api_t *queue_api = &queue_scalable_api; const queue_fn_t *queue_fn = &queue_scalable_fn; #else -const queue_api_t *queue_api = &queue_default_api; -const queue_fn_t *queue_fn = &queue_default_fn; +const queue_api_t *queue_api = &queue_basic_api; +const queue_fn_t *queue_fn = &queue_basic_fn; #endif odp_queue_t odp_queue_create(const char *name, const odp_queue_param_t *param) diff --git a/platform/linux-generic/odp_schedule.c b/platform/linux-generic/odp_schedule_basic.c similarity index 99% rename from platform/linux-generic/odp_schedule.c rename to platform/linux-generic/odp_schedule_basic.c index a6581bed8..7195eedea 100644 --- a/platform/linux-generic/odp_schedule.c +++ b/platform/linux-generic/odp_schedule_basic.c @@ -1407,7 +1407,7 @@ static int schedule_num_grps(void) } /* Fill in scheduler interface */ -const schedule_fn_t schedule_default_fn = { +const schedule_fn_t schedule_basic_fn = { .status_sync = 0, .pktio_start = schedule_pktio_start, .thr_add = schedule_thr_add, @@ -1429,7 +1429,7 @@ const schedule_fn_t schedule_default_fn = { }; /* Fill in scheduler API calls */ -const schedule_api_t schedule_default_api = { +const schedule_api_t schedule_basic_api = { .schedule_wait_time = schedule_wait_time, .schedule = schedule, .schedule_multi = schedule_multi, diff --git a/platform/linux-generic/odp_schedule_if.c b/platform/linux-generic/odp_schedule_if.c index 71d4ee75c..4639ad737 100644 --- a/platform/linux-generic/odp_schedule_if.c +++ b/platform/linux-generic/odp_schedule_if.c @@ -12,8 +12,8 @@ extern const schedule_fn_t schedule_sp_fn; extern const schedule_api_t schedule_sp_api; -extern const schedule_fn_t schedule_default_fn; -extern const schedule_api_t schedule_default_api; +extern const schedule_fn_t schedule_basic_fn; +extern const schedule_api_t schedule_basic_api; extern const schedule_fn_t schedule_iquery_fn; extern const schedule_api_t schedule_iquery_api; @@ -31,8 +31,8 @@ const schedule_api_t *sched_api = &schedule_iquery_api; const schedule_fn_t *sched_fn = &schedule_scalable_fn; const schedule_api_t *sched_api = &schedule_scalable_api; #else -const schedule_fn_t *sched_fn = &schedule_default_fn; -const schedule_api_t *sched_api = &schedule_default_api; +const schedule_fn_t *sched_fn = &schedule_basic_fn; +const schedule_api_t *sched_api = &schedule_basic_api; #endif uint64_t odp_schedule_wait_time(uint64_t ns)