From patchwork Tue Feb 27 20:00:35 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: 129861 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp225224lja; Tue, 27 Feb 2018 12:17:59 -0800 (PST) X-Google-Smtp-Source: AG47ELsdihAlJAlAhRsHlOuVfuKCxbwFlnmv64MQ6hSeQVUx1chf3stg+eE6vkep9sBNdiEzvNYQ X-Received: by 10.55.137.132 with SMTP id l126mr25382723qkd.15.1519762679412; Tue, 27 Feb 2018 12:17:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519762679; cv=none; d=google.com; s=arc-20160816; b=VC51zSccnZHfFQoTXIC3Mh896nckUeEEqMn0wBHHbEhCh6W5PMqhWlOqH8qkcipdhQ e1FD5mWfaeSjMR05UN3U4EGOzviC70fHo7yLB0EZfunIQkJF7EVMk5fSdTA+FJlU4nWa EjY4Mr8talFvsUk2Lz6TZ5vZbLeBZ1BYYjE9QcCRfO1XSACfixUhhwySUiF2m2Dld+59 VUCFKX5imNLV6sVViyxHxwIAO8qd5LwzdYNszhq7+2IVt+lcPOj7VOk8zMVzSwIkrzDI 1BzT9nuxOzYhIGh5obIs7gjqZx1I6NwEtTZj12EHNWLWJqvpMvRQjlenbcQa+gG9njtv noYg== 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=W3obuUF1FXhz4DdXavnIaz01vqXa9c62BBkgUcKok6o=; b=UQy1NCl9xmoOmWZRmyLCPyln3uy3xvZJsnHYPf0deJgQWDAMasrmr81IF4W6Y2B8lS eooWqvztTY2OY2qlEiBX++19Z0Ffz5cn0Yf2cS0p11dNGgUYTBZi6ISjjff2LkH5N/34 Cux3KlpKZGyyTnEu/VP4MbriEbYtK3rp7/jjDjIxRA9UpyjDMbfpDD5vmKhjwc+ZL3c7 GWYPxy2DLPulzmRKhRHZC8pf1evfgA0AhfzFHKQLv3B637SPnlFvLbH/LNb3f2s3vfCI sHoXikAJBE7/HEu5AVa9kEwANpm0tMesZCdcxish1ihfpE+cqHe0kb3UC2w7EdOhQt3a IkkA== 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 k88si3953006qtd.334.2018.02.27.12.17.59; Tue, 27 Feb 2018 12:17:59 -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 1509861760; Tue, 27 Feb 2018 20:17:59 +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 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 C37DC617D5; Tue, 27 Feb 2018 20:02:51 +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 4F799617D1; Tue, 27 Feb 2018 20:02:46 +0000 (UTC) Received: from forward100p.mail.yandex.net (forward100p.mail.yandex.net [77.88.28.100]) by lists.linaro.org (Postfix) with ESMTPS id ED97061757 for ; Tue, 27 Feb 2018 20:00:43 +0000 (UTC) Received: from mxback4g.mail.yandex.net (mxback4g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:165]) by forward100p.mail.yandex.net (Yandex) with ESMTP id 9534D510519A for ; Tue, 27 Feb 2018 23:00:42 +0300 (MSK) Received: from smtp4o.mail.yandex.net (smtp4o.mail.yandex.net [2a02:6b8:0:1a2d::28]) by mxback4g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id 3s12zOeqRv-0gUq7u4r; Tue, 27 Feb 2018 23:00:42 +0300 Received: by smtp4o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id zvM1YyQEKf-0gaSs9bR; Tue, 27 Feb 2018 23:00:42 +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:35 +0300 Message-Id: <1519761641-21081-2-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 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: 3984ba4cd16a02e3fa98ccd432a06663de3fa993 ** Merge commit sha: 62438643661dee1350bce73f90120c824538df8b **/ 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 444e1163b..b8d791544 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 a2d9d52ff..aa0885dab 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(); +} From patchwork Tue Feb 27 20:00:36 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: 129862 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp225776lja; Tue, 27 Feb 2018 12:18:41 -0800 (PST) X-Google-Smtp-Source: AG47ELuwFETZRLxyF+O1KsaQTfMYNcHmI21uB7I8MBd0RvmpM6JKyfDSkIclG+K4KaPUPCXudjOK X-Received: by 10.55.91.70 with SMTP id p67mr23035729qkb.243.1519762720821; Tue, 27 Feb 2018 12:18:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519762720; cv=none; d=google.com; s=arc-20160816; b=K9Ljmdv56llyLVARcc6LpR5bMMzSczP9RiQp7/ZE/usxsUcq/X/ytG56kMwFjPC0x7 SfzGrxWRhjgbdt4QYWWVNTkoYMGdm/+cJlc9DtpHNmdWthNpc50KMbx4HNIBvjUOu8Eq GT3jr0zMOv3QSOdOkbhxo+AFj/13kLmLyPcnjF/v4ZPDnfFn+usli0POxEe5xoP/z0Iu iX+RHW5HdH7ifJ7qLR22Z8XlR+YYz1fBlpRogfJuWC5XQHdgok8g8MT6UBMrjpT4/+1S Vg9BV7FpE+RQykx7u/xNkRSA632pgb0SVCZ56yIEFPwAN+IKpss+Ick3XsgeJ2VWjv4/ q34A== 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=HjEECIC6A6KMQkb7UMTdnPEOIfxIY63AEQ8tS/mOqZ0=; b=ePWUwgHxOqB3h+jI8F4rcaESGYiYn/DJ90qnfIewX8Za6RYmsocVe/V0V8EM/YYWeu gebDr+1vdJJfRQzMoKmb5G9PQr1cPu8Ikvtz14RDacsMcL5Os20vImZhVs4kMR5JcJem 9sFNmSCbTvWpWy84XO0ZODOgPuGjda1riMEa7XkZCzvC4DV4bJgwJLjL1Bg2DwSmitlL LwkyULBgJ9Pgolk+IPWDF+mjQC9AYcP86BwQDGt8ItuCt8k4HphiYBxP2wyq4I9lpmHT vw+UXT51grmLCD/WmKKeX9N2nDcHutjLB0Ht1C+6RUr/aQY05hlM0jC8SBGKA2A1eBah c9Kw== 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 u1si5129774qtk.412.2018.02.27.12.18.40; Tue, 27 Feb 2018 12:18:40 -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 8441961764; Tue, 27 Feb 2018 20:18:40 +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 0322F617D7; Tue, 27 Feb 2018 20:02:54 +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 6A441617D5; Tue, 27 Feb 2018 20:02:50 +0000 (UTC) Received: from forward106p.mail.yandex.net (forward106p.mail.yandex.net [77.88.28.109]) by lists.linaro.org (Postfix) with ESMTPS id BC6D76151A for ; Tue, 27 Feb 2018 20:00:44 +0000 (UTC) Received: from mxback10o.mail.yandex.net (mxback10o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::24]) by forward106p.mail.yandex.net (Yandex) with ESMTP id 33F2D2D81891 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 mxback10o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id ruf1Q5Mk0z-0hZiMtQE; Tue, 27 Feb 2018 23:00:43 +0300 Received: by smtp4o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id zvM1YyQEKf-0gae3K4j; Tue, 27 Feb 2018 23:00:42 +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:36 +0300 Message-Id: <1519761641-21081-3-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 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: 3984ba4cd16a02e3fa98ccd432a06663de3fa993 ** Merge commit sha: 62438643661dee1350bce73f90120c824538df8b **/ platform/linux-generic/include/odp_internal.h | 3 +++ platform/linux-generic/odp_init.c | 4 ++-- platform/linux-generic/odp_schedule_if.c | 10 ++++++++++ 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/platform/linux-generic/include/odp_internal.h b/platform/linux-generic/include/odp_internal.h index b8d791544..c21228982 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 aa0885dab..325c1fb92 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 6a3b4e4ba..71d4ee75c 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; @@ -145,3 +146,12 @@ void odp_schedule_order_lock_wait(uint32_t lock_index) sched_api->schedule_order_lock_wait(lock_index); } +int _odp_schedule_init_global(void) +{ + return sched_fn->init_global(); +} + +int _odp_schedule_term_global(void) +{ + return sched_fn->term_global(); +} 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) From patchwork Tue Feb 27 20:00:38 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: 129864 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp227659lja; Tue, 27 Feb 2018 12:20:49 -0800 (PST) X-Google-Smtp-Source: AH8x225bTINZ+t/73q589B22sp8l75doelpLZ6IVp0sd6xZ5M8+hbCFS2AAQFhnFXV550fEnV76q X-Received: by 10.13.203.194 with SMTP id n185mr10049726ywd.461.1519762849652; Tue, 27 Feb 2018 12:20:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519762849; cv=none; d=google.com; s=arc-20160816; b=ethix2a4sCxLsFSqlI/rWr0pCXMaoFLMg5jKsSUJSf5KrKC0zIe1mLxb9GKprpm3dz +v/uIwdth5Ze/CXgNQGU2d3hBBH9jCiyGoOX9l8kmg4id3UGaZZ0gUbKwzRRAX1gyRRm zh7rCP9fdHK6qPTbtiRIeULmpzQ/p6hUkbJW34xgE6V5UKKq1b0uezwrzHUUDrF2eW6E aL7R6p/tBlYfVBpHnNpkXp3Ey3GLQxWUFHEVtuhhVs9fGgqgaHNRVWuaxEkax8AHE2Hw P2AB/TANz2Y638QXmqvwz2Xmpevat07jiedH5Z1peQ03nlpTel/AJzuxw57WfIlcIVS1 yOYA== 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=26Snpd/POYx01FAjJ/MzoVKtRVdpc0ddDyuba396gGM=; b=GRnVKC68+M0SMgdbvMm8XKgzZRWEK5MAvFtKDllyx8jQQtO2HRJ+heSO7UUgipBAGs qQtit3wEueJ8nXdr4uUGutZ0Xz2kVvzXCrM1Qib5Mw0MaPKeeISl3QzJbc1Zr//x3ZTJ jajWZbH98ibcnPzZYECbBz9NzbzWIcBZUlOlAOLYm913Gbuf5ZvqrxxrulxEAOWiTd/M j72MKDQ6a/XgAi2V6EP+Fxjk7fdw8RvprS40vI8BHNYiBcifke0EoyFvJvfjxnrV0ZPM jNos9K76nY0qRLT6mgCuq9FJChwY7MrPd/V4WYY3K1mxZX4ch1DDmzftyl9qFLpG5Upr p3dA== 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 o37si2845708qte.88.2018.02.27.12.20.49; Tue, 27 Feb 2018 12:20: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 EFA5260ABA; Tue, 27 Feb 2018 20:20:48 +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 22867617D2; Tue, 27 Feb 2018 20:03:12 +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 49EE7617E3; Tue, 27 Feb 2018 20:03:03 +0000 (UTC) Received: from forward104j.mail.yandex.net (forward104j.mail.yandex.net [5.45.198.247]) by lists.linaro.org (Postfix) with ESMTPS id ED13D61702 for ; Tue, 27 Feb 2018 20:00:45 +0000 (UTC) Received: from mxback14g.mail.yandex.net (mxback14g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:93]) by forward104j.mail.yandex.net (Yandex) with ESMTP id 948F544E35 for ; Tue, 27 Feb 2018 23:00:44 +0300 (MSK) Received: from smtp4o.mail.yandex.net (smtp4o.mail.yandex.net [2a02:6b8:0:1a2d::28]) by mxback14g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id BLUN7jRrZl-0ij0HeDG; Tue, 27 Feb 2018 23:00:44 +0300 Received: by smtp4o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id zvM1YyQEKf-0haqjcLU; 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:38 +0300 Message-Id: <1519761641-21081-5-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 4/7] linux-gen: schedule, queue: select scheduler/queue via environment 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 Use ODP_SCHEDULER environment variable to select scheduler/queue implementation. 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/m4/odp_schedule.m4 | 29 +++++---------------- platform/linux-generic/odp_queue_if.c | 31 +++++++++++++++++----- platform/linux-generic/odp_schedule_if.c | 43 +++++++++++++++++++++---------- 3 files changed, 60 insertions(+), 43 deletions(-) diff --git a/platform/linux-generic/m4/odp_schedule.m4 b/platform/linux-generic/m4/odp_schedule.m4 index 087cff87f..70be5a7d6 100644 --- a/platform/linux-generic/m4/odp_schedule.m4 +++ b/platform/linux-generic/m4/odp_schedule.m4 @@ -1,23 +1,6 @@ -AC_ARG_ENABLE([schedule-sp], - [ --enable-schedule-sp enable strict priority scheduler], - [if test x$enableval = xyes; then - schedule_sp_enabled=yes - AC_DEFINE([ODP_SCHEDULE_SP], [1], - [Define to 1 to enable strict priority scheduler]) - fi]) - -AC_ARG_ENABLE([schedule-iquery], - [ --enable-schedule-iquery enable interests query (sparse bitmap) scheduler], - [if test x$enableval = xyes; then - schedule_iquery_enabled=yes - AC_DEFINE([ODP_SCHEDULE_IQUERY], [1], - [Define to 1 to enable interests query scheduler]) - fi]) - -AC_ARG_ENABLE([schedule_scalable], - [ --enable-schedule-scalable enable scalable scheduler], - [if test x$enableval = xyes; then - schedule_scalable_enabled=yes - AC_DEFINE([ODP_SCHEDULE_SCALABLE], [1], - [Define to 1 to enable scalable scheduler]) - fi]) +AC_ARG_ENABLE([scheduler-default], + [AS_HELP_STRING([enable-scheduler-default], + [Choose default scheduler (default is basic)])], + [], [enable_scheduler_default=basic]) +AC_DEFINE_UNQUOTED([ODP_SCHEDULE_DEFAULT], ["$enable_scheduler_default"], + [Define to name default scheduler]) diff --git a/platform/linux-generic/odp_queue_if.c b/platform/linux-generic/odp_queue_if.c index d1c468485..08076ab3a 100644 --- a/platform/linux-generic/odp_queue_if.c +++ b/platform/linux-generic/odp_queue_if.c @@ -8,6 +8,10 @@ #include #include +#include + +#include +#include extern const queue_api_t queue_scalable_api; extern const queue_fn_t queue_scalable_fn; @@ -15,13 +19,8 @@ extern const queue_fn_t queue_scalable_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_basic_api; -const queue_fn_t *queue_fn = &queue_basic_fn; -#endif +const queue_api_t *queue_api; +const queue_fn_t *queue_fn; odp_queue_t odp_queue_create(const char *name, const odp_queue_param_t *param) { @@ -115,6 +114,24 @@ int odp_queue_info(odp_queue_t queue, odp_queue_info_t *info) int _odp_queue_init_global(void) { + const char *sched = getenv("ODP_SCHEDULER"); + + if (sched == NULL || !strcmp(sched, "default")) + sched = ODP_SCHEDULE_DEFAULT; + + if (!strcmp(sched, "basic") || + !strcmp(sched, "sp") || + !strcmp(sched, "iquery")) { + queue_fn = &queue_basic_fn; + queue_api = &queue_basic_api; + } else if (!strcmp(sched, "scalable")) { + queue_fn = &queue_scalable_fn; + queue_api = &queue_scalable_api; + } else { + ODP_ABORT("Unknown scheduler specified via ODP_SCHEDULER\n"); + return -1; + } + return queue_fn->init_global(); } diff --git a/platform/linux-generic/odp_schedule_if.c b/platform/linux-generic/odp_schedule_if.c index 4639ad737..085208525 100644 --- a/platform/linux-generic/odp_schedule_if.c +++ b/platform/linux-generic/odp_schedule_if.c @@ -8,6 +8,10 @@ #include #include +#include + +#include +#include extern const schedule_fn_t schedule_sp_fn; extern const schedule_api_t schedule_sp_api; @@ -21,19 +25,8 @@ extern const schedule_api_t schedule_iquery_api; extern const schedule_fn_t schedule_scalable_fn; extern const schedule_api_t schedule_scalable_api; -#ifdef ODP_SCHEDULE_SP -const schedule_fn_t *sched_fn = &schedule_sp_fn; -const schedule_api_t *sched_api = &schedule_sp_api; -#elif defined(ODP_SCHEDULE_IQUERY) -const schedule_fn_t *sched_fn = &schedule_iquery_fn; -const schedule_api_t *sched_api = &schedule_iquery_api; -#elif defined(ODP_SCHEDULE_SCALABLE) -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_basic_fn; -const schedule_api_t *sched_api = &schedule_basic_api; -#endif +const schedule_fn_t *sched_fn; +const schedule_api_t *sched_api; uint64_t odp_schedule_wait_time(uint64_t ns) { @@ -148,6 +141,30 @@ void odp_schedule_order_lock_wait(uint32_t lock_index) int _odp_schedule_init_global(void) { + const char *sched = getenv("ODP_SCHEDULER"); + + if (sched == NULL || !strcmp(sched, "default")) + sched = ODP_SCHEDULE_DEFAULT; + + ODP_PRINT("Using scheduler '%s'\n", sched); + + if (!strcmp(sched, "basic")) { + sched_fn = &schedule_basic_fn; + sched_api = &schedule_basic_api; + } else if (!strcmp(sched, "sp")) { + sched_fn = &schedule_sp_fn; + sched_api = &schedule_sp_api; + } else if (!strcmp(sched, "iquery")) { + sched_fn = &schedule_iquery_fn; + sched_api = &schedule_iquery_api; + } else if (!strcmp(sched, "scalable")) { + sched_fn = &schedule_scalable_fn; + sched_api = &schedule_scalable_api; + } else { + ODP_ABORT("Unknown scheduler specified via ODP_SCHEDULER\n"); + return -1; + } + return sched_fn->init_global(); } From patchwork Tue Feb 27 20:00:39 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: 129865 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp228437lja; Tue, 27 Feb 2018 12:21:42 -0800 (PST) X-Google-Smtp-Source: AG47ELu4Do2M3WtFV0UpZ/3ymkkjBTewyWxixSMGacdfnc0IbLE0MEg/2c2+qSao75KCAgsflsSc X-Received: by 10.55.212.12 with SMTP id l12mr23889928qki.303.1519762901702; Tue, 27 Feb 2018 12:21:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519762901; cv=none; d=google.com; s=arc-20160816; b=UIaMyzsGrUaPDPVdgxQ4yKQpojsIbMvxyu/SrVtPEBT52aELi+3Tl1NQIHWj8V5qH2 xHslJk3Q8mgdC1TMJjhcoLYtsgHXECj2iu9aiopqrzxzHjUj6c4jn+5IMHzjBP5PQ4lt 3led3Dv5BKVGb3iIyO+0WP03V/IsUPxUIRh9nxPEInAcGAh3E0kqYIxGslptovHsgz2z 7ZrjgTa5RBp21OBAwwRV5J5FHDqpA8yHhiNW3cXfa4nnAgLDSYUkWOlPK0nRUmb9lftC wOXoZRKgvX4/VWuH3fo8xaNRlcoE0P+h1vNq6qMcsoCw7THewBxLoVhtxfHD+sgQ18kd 7h4A== 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=y/1vsoCdRBsuuJUjDL+nvP7/4YPv9w3ZAm0nlVnUBeI=; b=0Uvl1teeq1lUZpkJVCDC9n8dbhoJzyKFuXEKTleSYToXWJxnXdhoayvgRvbSAbe7qC /i6fLehjuabCC8cl6pIY/X+NfApq8B4CDsedP7Ed1aYIBmMI04zRSB6QaEeAbXSiT5Cg 85Mc540qKr1K4jJmIKiMxicKNNLlYkwVI6sKZXPth/ctL9f782aujnvrvhmAIfYF4jJQ GTyomrhaqXX11McQBol4L12Gm1B/OKQoiX7D1D4GjLx4crNDtSOTmr+UawhXgsGIFoMG ugosYGv04Ol86d4MsdO4IZsaPBoYMjvkRLmMkpob4GLV3TtNi8H557ITgESmit0y099p 537A== 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 f5si10885016qtd.364.2018.02.27.12.21.41; Tue, 27 Feb 2018 12:21:41 -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 11A03614E3; Tue, 27 Feb 2018 20:21:41 +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 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 84A50617EA; Tue, 27 Feb 2018 20:03:15 +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 7F20D617E4; Tue, 27 Feb 2018 20:03:06 +0000 (UTC) Received: from forward106o.mail.yandex.net (forward106o.mail.yandex.net [37.140.190.187]) by lists.linaro.org (Postfix) with ESMTPS id 153F861747 for ; Tue, 27 Feb 2018 20:00:46 +0000 (UTC) Received: from mxback15g.mail.yandex.net (mxback15g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:94]) by forward106o.mail.yandex.net (Yandex) with ESMTP id 10478783573 for ; Tue, 27 Feb 2018 23:00:45 +0300 (MSK) Received: from smtp4o.mail.yandex.net (smtp4o.mail.yandex.net [2a02:6b8:0:1a2d::28]) by mxback15g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id F20FlR0Au0-0ilKYZpW; Tue, 27 Feb 2018 23:00:44 +0300 Received: by smtp4o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id zvM1YyQEKf-0iaePc5L; Tue, 27 Feb 2018 23:00:44 +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:39 +0300 Message-Id: <1519761641-21081-6-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 5/7] travis: test all schedulers in single pass 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 Run tests with all schedulers in default CONF setting and while doing coverage test. 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 **/ .travis.yml | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index ca5135819..167c7319b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -53,9 +53,6 @@ env: - CONF="" - CONF="--disable-abi-compat" - CONF="--enable-deprecated" - - CONF="--enable-schedule-sp" - - CONF="--enable-schedule-iquery" - - CONF="--enable-schedule-scalable" - CONF="--enable-dpdk-zero-copy" - CONF="--disable-static-applications" - CONF="--disable-host-optimization" @@ -253,8 +250,16 @@ script: $CROSS $EXTRA_CONF $CONF - make -j $(nproc) - mkdir /dev/shm/odp + # Run all tests only for default configuration - if [ -z "$CROSS_ARCH" ] ; then - sudo LD_LIBRARY_PATH="$HOME/cunit-install/$CROSS_ARCH/lib:$LD_LIBRARY_PATH" ODP_SHM_DIR=/dev/shm/odp make check ; + if [ -n "$CONF" ] ; then + sudo LD_LIBRARY_PATH="$HOME/cunit-install/$CROSS_ARCH/lib:$LD_LIBRARY_PATH" ODP_SHM_DIR=/dev/shm/odp make check ; + else + sudo ODP_SCHEDULER=basic LD_LIBRARY_PATH="$HOME/cunit-install/$CROSS_ARCH/lib:$LD_LIBRARY_PATH" ODP_SHM_DIR=/dev/shm/odp make check ; + sudo ODP_SCHEDULER=sp LD_LIBRARY_PATH="$HOME/cunit-install/$CROSS_ARCH/lib:$LD_LIBRARY_PATH" ODP_SHM_DIR=/dev/shm/odp make check ; + sudo ODP_SCHEDULER=iquery LD_LIBRARY_PATH="$HOME/cunit-install/$CROSS_ARCH/lib:$LD_LIBRARY_PATH" ODP_SHM_DIR=/dev/shm/odp make check ; + sudo ODP_SCHEDULER=scalable LD_LIBRARY_PATH="$HOME/cunit-install/$CROSS_ARCH/lib:$LD_LIBRARY_PATH" ODP_SHM_DIR=/dev/shm/odp make check ; + fi fi - make install @@ -293,7 +298,10 @@ jobs: --enable-debug=full --enable-helper-linux - CCACHE_DISABLE=1 make -j $(nproc) - - sudo CCACHE_DISABLE=1 LD_LIBRARY_PATH="$HOME/cunit-install/$CROSS_ARCH/lib:$LD_LIBRARY_PATH" PATH=${PATH//:\.\/node_modules\/\.bin/} make check + - sudo CCACHE_DISABLE=1 ODP_SCHEDULER=basic LD_LIBRARY_PATH="$HOME/cunit-install/$CROSS_ARCH/lib:$LD_LIBRARY_PATH" make check + - sudo CCACHE_DISABLE=1 ODP_SCHEDULER=sp LD_LIBRARY_PATH="$HOME/cunit-install/$CROSS_ARCH/lib:$LD_LIBRARY_PATH" make check + - sudo CCACHE_DISABLE=1 ODP_SCHEDULER=iquery LD_LIBRARY_PATH="$HOME/cunit-install/$CROSS_ARCH/lib:$LD_LIBRARY_PATH" make check + - sudo CCACHE_DISABLE=1 ODP_SCHEDULER=scalable LD_LIBRARY_PATH="$HOME/cunit-install/$CROSS_ARCH/lib:$LD_LIBRARY_PATH" make check - find . -type f -iname '*.[ch]' -not -path ".git/*" -execdir gcov {} \; ; bash <(curl -s https://codecov.io/bash) -X coveragepy - stage: test env: TEST=distcheck From patchwork Tue Feb 27 20:00:40 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: 129866 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp229018lja; Tue, 27 Feb 2018 12:22:23 -0800 (PST) X-Google-Smtp-Source: AG47ELsiEBSrGuvY3TntfSAZntR20Gjn6tUUjwaEmLkrdeXQsS22kBdxgzCSlINoEHC2acmwmiaa X-Received: by 10.237.43.167 with SMTP id e36mr26177072qtd.160.1519762943742; Tue, 27 Feb 2018 12:22:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519762943; cv=none; d=google.com; s=arc-20160816; b=ZzpjUO4JKfFmm5Nz8HxT3MJQFHv2vYiqn0mKzguoZpJeUsi3kJDACnkaRSFhkuJXAT R1U5mFgkBytgex2qPej6TxggcYGzDwixMHto2SXcZMmZ/6IlOs/5VWXfYpU1uGRKxFQW VRUhtimXQuTGc7zft8aKW/XXnL8h0XFbedL4cyu06VPcMsdOpwxe8YcUgwROGTxjHrGz IPvx2pglKexoTVt2O6smBYUE/XwrnTyv++LSgz+HES/Q2TYEeP1lCCXW6o9wjrKWuUZE 9IIIDgHsB9xYJnGqOiVeBcCj5AbCfrc6BAabKb+BDXPxujqv3udfIrERBJB7fYKoN19B 5iaA== 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=o8ePsA3FVmF07c3gow6EdrpCxYWTLUn56jgJz9JU3mM=; b=pJD8x12WEh+vCym/pnCEa0M4bgmo7oTEjrK/67JkvH7hFiXiPT+PGDBelgCieVBsiJ JCp4AM1ZcmJ+j/j80baTB9Nj7MX2TIo1El+7hysVK9s9l7ISn/RjkTa+G+48jW6a3cJT 1pRCKgnlO1l1eE+OJtoXZdZQq9RJbF25MmHJ0nbyWcRVkedtpVz/1HclqhHwnarzLOMI iUD/HUfnpg1ItfKQbv7+r3PH6dVaPr3PT1U3phxqQqulJub9y2aijiHgHptQrNRJulvH mIWhxAmyu8JhjRSyDrSXo+njicoCoQGV4YTOhO4gfognoNfcUyLSJV4j2kJ2sGfO3OEl WmPQ== 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 w10si349938qkg.351.2018.02.27.12.22.23; Tue, 27 Feb 2018 12:22:23 -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 624FC6178E; Tue, 27 Feb 2018 20:22:23 +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 59921617EB; Tue, 27 Feb 2018 20:03:25 +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 9C91F6175C; Tue, 27 Feb 2018 20:03:15 +0000 (UTC) Received: from forward104o.mail.yandex.net (forward104o.mail.yandex.net [37.140.190.179]) by lists.linaro.org (Postfix) with ESMTPS id C55CE6175C for ; Tue, 27 Feb 2018 20:00:46 +0000 (UTC) Received: from mxback10g.mail.yandex.net (mxback10g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:171]) by forward104o.mail.yandex.net (Yandex) with ESMTP id B6F62702E86 for ; Tue, 27 Feb 2018 23:00:45 +0300 (MSK) Received: from smtp4o.mail.yandex.net (smtp4o.mail.yandex.net [2a02:6b8:0:1a2d::28]) by mxback10g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id h9RQqSUtXE-0j4irkxC; Tue, 27 Feb 2018 23:00:45 +0300 Received: by smtp4o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id zvM1YyQEKf-0jaGY7n5; Tue, 27 Feb 2018 23:00:45 +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:40 +0300 Message-Id: <1519761641-21081-7-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 6/7] shippable: switch to clang 4.0 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 Clang 3.8 will miscompile ODP, which results in testsuite crashes. Use clang 4.0 instead. 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 **/ scripts/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/Dockerfile b/scripts/Dockerfile index 3e1d54dbd..b4c03ca48 100644 --- a/scripts/Dockerfile +++ b/scripts/Dockerfile @@ -8,7 +8,7 @@ RUN sudo apt-get update && sudo apt-get install -yy \ autoconf \ automake \ ccache \ - clang-3.8 \ + clang-4.0 \ gcc-4.8 \ graphviz \ kmod \ @@ -24,5 +24,5 @@ RUN sudo apt-get update && sudo apt-get install -yy \ xsltproc RUN sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.8 10 -RUN sudo ln -s /usr/bin/clang-3.8 /usr/bin/clang -RUN sudo ln -s /usr/bin/clang++-3.8 /usr/bin/clang++ +RUN sudo ln -s /usr/bin/clang-4.0 /usr/bin/clang +RUN sudo ln -s /usr/bin/clang++-4.0 /usr/bin/clang++ From patchwork Tue Feb 27 20:00:41 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: 129867 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp229436lja; Tue, 27 Feb 2018 12:22:57 -0800 (PST) X-Google-Smtp-Source: AG47ELvAkRokWAD6RGFRvSJ1iaMArqIJ4dN3f0nmFpxFnuHFZbBq9wrsDHKRtINIL8BHCAZGB+JO X-Received: by 10.55.148.69 with SMTP id w66mr24134108qkd.179.1519762976968; Tue, 27 Feb 2018 12:22:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519762976; cv=none; d=google.com; s=arc-20160816; b=N9P2/hp6a2XCOEX7gONuWqtsJHxVPMSyaQh5+hbKPD5WahTfHNom8X0Si1a0SCY8d8 HsbMXDP9CTTH0+SdCyjnWYg64AInoATjMsy3jVeoiZvN7ltxYVXrHhayAoh7J/8UV+Ny B2IO9ZQ0ie/FYlmoHHf+MoHBrqjED2agY+SCkd4C69BKsYwIYJonmXyHrG5/AJOYNgii rGkLySbjC24FEDJwOmycZwwXJTd39FrLaIEC9mdrsFIwlm76XLobVaCyEQMmZanP0ftF XA3xuy2x4iCRKCbX4DGmLuyDhf4B4XzZ0ndCD+ptZmRsXxzSK30ASVFuxC9lfL41QBPr 5YQg== 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=AbjWSwI9+mYxUPAo4Tatbk8ivOS1FRYRIO+JoY+Cgm4=; b=Q0rT4wWZX7Mw1rP2d1L1KV7usvsT9WmC6lqTOM3XiUcBzXIFiKSWL684UW5akdd9GH J+CuAQsZ5B6zC/X9jhRWVbO0csB60a/n3t16+GSxQ7DR2VKYGdsGWKmOsqRg735VQuEP gswCRs7r2SGrRgrXlkGjastf8msWI1dA0HHUkrCBvmxySVqffkfjUJem22Jt2arr/jyx j/oVtF9o+EEj6YADOdxQr6soKALVXGWIJpnseP0REXJ8BH6s6zaAPMNQsrSLQAkZAU3Z 6jgGs9OtT3KdNUhbwd+KthrpM+lG3GJrvrh9nqtUzDE68gTbKgphUt4gdEg0ufZt3kpn dcTg== 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 d205si11313056qkg.484.2018.02.27.12.22.56; Tue, 27 Feb 2018 12:22:56 -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 8E16E6171C; Tue, 27 Feb 2018 20:22:56 +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 CFE1D61768; Tue, 27 Feb 2018 20:03:38 +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 CEDA8617FD; Tue, 27 Feb 2018 20:03:33 +0000 (UTC) Received: from forward105o.mail.yandex.net (forward105o.mail.yandex.net [37.140.190.183]) by lists.linaro.org (Postfix) with ESMTPS id 3A73961767 for ; Tue, 27 Feb 2018 20:00:47 +0000 (UTC) Received: from mxback9o.mail.yandex.net (mxback9o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::23]) by forward105o.mail.yandex.net (Yandex) with ESMTP id 34FD7444505E for ; Tue, 27 Feb 2018 23:00:46 +0300 (MSK) Received: from smtp4o.mail.yandex.net (smtp4o.mail.yandex.net [2a02:6b8:0:1a2d::28]) by mxback9o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id a1jyNBAAHM-0k4mextE; Tue, 27 Feb 2018 23:00:46 +0300 Received: by smtp4o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id zvM1YyQEKf-0jaG56Jq; Tue, 27 Feb 2018 23:00:45 +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:41 +0300 Message-Id: <1519761641-21081-8-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 7/7] shippable: run tests with all possible schedulers 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 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 **/ .shippable.yml | 12 ++++++++---- scripts/shippable-post.sh | 8 +++++++- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/.shippable.yml b/.shippable.yml index 6b2a73c3f..c01e3608e 100644 --- a/.shippable.yml +++ b/.shippable.yml @@ -41,10 +41,14 @@ build: - if [ "${CC#clang}" != "${CC}" ] ; then export CXX="${CC/clang/clang++}"; fi - ./configure $CONF - make -j $(nproc) - - sudo env ODP_SHM_DIR=/dev/shm/odp ODP_TEST_OUT_XML=yes make check -k - - on_success: - - ./scripts/shippable-post.sh + - sudo env ODP_SHM_DIR=/dev/shm/odp ODP_TEST_OUT_XML=yes ODP_SCHEDULER=basic make check + - ./scripts/shippable-post.sh basic + - sudo env ODP_SHM_DIR=/dev/shm/odp ODP_TEST_OUT_XML=yes ODP_SCHEDULER=sp make check + - ./scripts/shippable-post.sh sp + - sudo env ODP_SHM_DIR=/dev/shm/odp ODP_TEST_OUT_XML=yes ODP_SCHEDULER=iquery make check + - ./scripts/shippable-post.sh iquery + - sudo env ODP_SHM_DIR=/dev/shm/odp ODP_TEST_OUT_XML=yes ODP_SCHEDULER=scalable make check + - ./scripts/shippable-post.sh scalable on_failure: - ./scripts/shippable-post.sh diff --git a/scripts/shippable-post.sh b/scripts/shippable-post.sh index ed5a44168..9d59da3f8 100755 --- a/scripts/shippable-post.sh +++ b/scripts/shippable-post.sh @@ -2,8 +2,14 @@ wget https://raw.githubusercontent.com/shawnliang/cunit-to-junit/master/cunit-to-junit.xsl +mkdir -p "$SHIPPABLE_BUILD_DIR/shippable/testresults" + +SCHED=${1:-default} +echo $SCHED + for FILE in `find ./test ./platform/ -name "*.xml"`; do bname="`basename $FILE`"; + echo Processing $FILE as ${SCHED}-${bname} xsltproc --novalid cunit-to-junit.xsl "$FILE" > \ - "$SHIPPABLE_BUILD_DIR/shippable/testresults/${bname}" + "$SHIPPABLE_BUILD_DIR/shippable/testresults/${SCHED}-${bname}" done