From patchwork Tue Feb 20 16:00:13 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: 128915 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp4789946ljc; Tue, 20 Feb 2018 08:01:31 -0800 (PST) X-Google-Smtp-Source: AH8x224f9NJ2zdOyqVAS26+zm+ENVDhnI9CaUzAOxxj8uk+dEwAXALB33K8wWCPHFPk0RXcKz1qk X-Received: by 10.129.160.133 with SMTP id x127mr99234ywg.244.1519142490854; Tue, 20 Feb 2018 08:01:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519142490; cv=none; d=google.com; s=arc-20160816; b=z2Y/HgD8VgElSeh+Fh+IUhYcc+o8wPeHdh0ZYjr0aZHNa05tFKXDjIoHn08UEpJTlS pDd04h5yMWf3Y/J6cSulwHkAMjCLTh0Y3+Zl0C3ApVKJRJUjLaL72FFRhokumn9bGm5m QMKxKbtlLROQIYLg3KypWdpuQYAwmZRAwNAeKxszAds1/PE8up6Laj8x1va+weAMivbO XsAAiQD8lmnOzTB+iHxrEvt5B2A6mZ1VuNwC8JpE+lzclEetIGCNntl5n7NIPP4zIP7q 1ACGrkRrIESdc07Vqr3daol8uFQDoqP5fg8/MUjCAIPiuiC1668m4R/lUq7+cwFkcxsr UdzA== 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=Sgl2S6gTZ9omjOmZSA48S7dJjdWj2DbfPV1ZT3q3aPo=; b=Z3wKi3TeuNY9YkxSWY56U0GWgeBKfwf51g682TH3i093m5+02e0rRf4r6G4vVU/VH3 s3HCq3wsEYcoVyPiqyYIrLr3l+m5st3HEadD2S1pK56PgT5AVEzGU//QpQsUE85S0+bm 1Wr83nyDmVh47NwXUQYdN0Hw9/cYydvC5fsilAAk0WpHOIjE0pyDeLkBjeLO2MI1ojUr OF5oxroRrJsHx8LYF5Kz6BG+V9Fx2EgepoWr3a/KtylxTHX7kgGnDxm8udMVBBgoYyQq zDW1BDHN3x4PBxi8ch6FkV8Ia2C0/2u0kI/S1495D/iEIWjIftDZIedgdnM0ZA4124Cf 3FzA== 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 y44si1163616qth.38.2018.02.20.08.01.30; Tue, 20 Feb 2018 08:01:30 -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 8117B61754; Tue, 20 Feb 2018 16:01:30 +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 28E5B607A2; Tue, 20 Feb 2018 16:00:41 +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 3A32F60670; Tue, 20 Feb 2018 16:00:30 +0000 (UTC) Received: from forward101j.mail.yandex.net (forward101j.mail.yandex.net [5.45.198.241]) by lists.linaro.org (Postfix) with ESMTPS id 9899D6150B for ; Tue, 20 Feb 2018 16:00:22 +0000 (UTC) Received: from mxback3g.mail.yandex.net (mxback3g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:164]) by forward101j.mail.yandex.net (Yandex) with ESMTP id E1B25124489A for ; Tue, 20 Feb 2018 19:00:20 +0300 (MSK) Received: from smtp4p.mail.yandex.net (smtp4p.mail.yandex.net [2a02:6b8:0:1402::15:6]) by mxback3g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id WTL55yv61Q-0KsueBZK; Tue, 20 Feb 2018 19:00:20 +0300 Received: by smtp4p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id 1BLM25rTar-0KTuZNHM; Tue, 20 Feb 2018 19: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 19:00:13 +0300 Message-Id: <1519142419-2141-2-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519142419-2141-1-git-send-email-odpbot@yandex.ru> References: <1519142419-2141-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 467 Subject: [lng-odp] [PATCH v3 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: e203ffe9c0a48b78cb0d0f4aadbb16bb1f840b3c **/ 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(); +} From patchwork Tue Feb 20 16:00:14 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: 128917 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp4792086ljc; Tue, 20 Feb 2018 08:03:12 -0800 (PST) X-Google-Smtp-Source: AH8x2251JoT1Djq4feGnufI1AkT6Q2SEMqNmANxNxewuOwsc0WiwXxxS9TfNl9vomFYttUbzz+kg X-Received: by 2002:a25:81c9:: with SMTP id n9-v6mr132079ybm.50.1519142592094; Tue, 20 Feb 2018 08:03:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519142592; cv=none; d=google.com; s=arc-20160816; b=HkFquGYOCYgJI7PuLRSsOJJXPLFHSY4BgsT7m+KUPQHBeE/iLwYEw+Zac58Awwgxhz l3g73FqymUJ8GpZZJyOKXvW0EGj9RNeqF4RdJz6pCoeSjyh6CGS6IooQq0edvblJ7ZqI cDxwRtIQ/KgWL0KcJX4T03sMudeXKYrH65rZDuNshhACbmRIXecvcwUMQXCyqxEvozlo wJ9gHuzSa0dDUKiRafzK5EO5qOfe75tz1J8Ickppe1p2Uzzc97R/SWuYzRRgt8PWoRLB 5XEa/R5U2UAA9pT4V35B5nVzYAVYszXEpLdvWJ1HLYkGth9MkFkAQ+IXTY2FKPoSU7Oc GHOQ== 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=KkK8QiDh6pugwOaaKhDKvlDq2eQwbeORZZyOQXfjKUM=; b=Htvw/zGd+tBmTxUBTtHIaUQ1lyigK9TCOcEpd7X8U7pT/etOn9ZpMtnGHPnAQu5vj/ 9/tZ+QkTiRmHURwYg4DzBL/I1ttDe+skt52SqA3+bjidZqXbasVtwY9W4FL3MG9ut9qt ZxPHQMfkg6cOYajihMbH7ctcVwqzD1WJnjqm81HsHVpw3wRZIcRu6iY7o+9/HtQZp9sU yU99JQPOhbRI6oS6VGTwTa3bLxs/tsSAx1d83Y72UDF+isJJ0yivamQ5VjZbFYj/5OU/ /qvVPpQ96JZYqHaz/KWxxkWqNHHUI0vfIY6wWI2FSCfckvgMAHSmaa5RDVPYN04j4EjE O5rw== 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 t72si128921qkl.443.2018.02.20.08.03.11; Tue, 20 Feb 2018 08:03:12 -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 A34EF61502; Tue, 20 Feb 2018 16:03:11 +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 C6345608B8; Tue, 20 Feb 2018 16:00: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 5F03760670; Tue, 20 Feb 2018 16:00:32 +0000 (UTC) Received: from forward103j.mail.yandex.net (forward103j.mail.yandex.net [5.45.198.246]) by lists.linaro.org (Postfix) with ESMTPS id 8CC90614E2 for ; Tue, 20 Feb 2018 16:00:22 +0000 (UTC) Received: from mxback3j.mail.yandex.net (mxback3j.mail.yandex.net [IPv6:2a02:6b8:0:1619::10c]) by forward103j.mail.yandex.net (Yandex) with ESMTP id 4FA3134C46BA for ; Tue, 20 Feb 2018 19:00:21 +0300 (MSK) Received: from smtp4p.mail.yandex.net (smtp4p.mail.yandex.net [2a02:6b8:0:1402::15:6]) by mxback3j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id Q4yjiNqfjl-0LbiLlNd; Tue, 20 Feb 2018 19:00:21 +0300 Received: by smtp4p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id 1BLM25rTar-0KTe4pAA; Tue, 20 Feb 2018 19: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 19:00:14 +0300 Message-Id: <1519142419-2141-3-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519142419-2141-1-git-send-email-odpbot@yandex.ru> References: <1519142419-2141-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 467 Subject: [lng-odp] [PATCH v3 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: e203ffe9c0a48b78cb0d0f4aadbb16bb1f840b3c **/ 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(); +} From patchwork Tue Feb 20 16:00:15 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: 128919 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp4794272ljc; Tue, 20 Feb 2018 08:05:01 -0800 (PST) X-Google-Smtp-Source: AH8x225LUp35Z8sI6GiXSD0LjfnnO3CfCvXti2F+ZlD4bUwZY53H+1dAGCEU2LbOGrFG5moVqBX3 X-Received: by 10.129.40.206 with SMTP id o197mr135821ywo.74.1519142701766; Tue, 20 Feb 2018 08:05:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519142701; cv=none; d=google.com; s=arc-20160816; b=hZ0UwLAEsPwLg6m9al/UZi0Z8LDfGHBpS2Xw6fCmQ8g3NL23sJncnnAm9ml4omhBtd WwC3MttKUVZnFiuLQYF7TyAuJn6S/uL7YXHxqPjre+a+OsZuTZX4aXjJ/kd08Zs2Y8Lo MIh+uMpsUGxAdxOuunsoUCfrwIzqQ60+xeysbYL+BsbmC20CdVnkKrGTfo5+cD49vOC5 gYew5mYEMiGYg1Rus9fz4wRyWt2WTueX5w3yveVeS/Xv/WLU08VjynYYtUHA8Wd5XTNk kkNdK1TP9HjkHKnlknX+jRpkBPgOvG5wDvuAqb7L+MkfJJQuPk8qV4IKC4F2cSQJlHb4 1DXg== 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=nRr1awJqiB+s4GltsKlGFSyLaqocZguRuy4et5t26iA=; b=e9XGPFGdvKkx0uucSpiBSk38f5zpcomXaWUO7+z9kn9AKiWeEpFi8E8wTSz0tSlY4o omxus8tFu1UcB+JnZQW6JC2wGCvnI7+sx5JzCkr72EE6i02uPDk93PyWAs45vWGTIMBB 5fjJkt/uUzZ1TzUPClMM8yRzoKm4J+rztmnoJk3DleyRid4FeMhuTOv+HQjCE+IiuODy zVl//5gTyltcJF9DNwcnGe2pn3Yorjmzvxu9sZhGnQNjcIm5yldosXe7I+3qSlXR+Hr3 egNLC3UUga9W0XDFmY78NhFui8RnyvMtWyOYKS8XUncKxAypphhwbfG/dOEBx0wi/mIS 2Emg== 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 r1si2196591qkk.368.2018.02.20.08.05.01; Tue, 20 Feb 2018 08:05:01 -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 613206150B; Tue, 20 Feb 2018 16:05:01 +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 5C6E86150C; Tue, 20 Feb 2018 16:00:55 +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 2C9DC60670; Tue, 20 Feb 2018 16:00:33 +0000 (UTC) Received: from forward106o.mail.yandex.net (forward106o.mail.yandex.net [37.140.190.187]) by lists.linaro.org (Postfix) with ESMTPS id C4F7761517 for ; Tue, 20 Feb 2018 16:00:23 +0000 (UTC) Received: from mxback14j.mail.yandex.net (mxback14j.mail.yandex.net [IPv6:2a02:6b8:0:1619::90]) by forward106o.mail.yandex.net (Yandex) with ESMTP id B87AF782F65 for ; Tue, 20 Feb 2018 19:00:21 +0300 (MSK) Received: from smtp4p.mail.yandex.net (smtp4p.mail.yandex.net [2a02:6b8:0:1402::15:6]) by mxback14j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id pCNAjhsBpe-0LL8CPT5; Tue, 20 Feb 2018 19:00:21 +0300 Received: by smtp4p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id 1BLM25rTar-0LTWKQ34; Tue, 20 Feb 2018 19:00:21 +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 19:00:15 +0300 Message-Id: <1519142419-2141-4-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519142419-2141-1-git-send-email-odpbot@yandex.ru> References: <1519142419-2141-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 467 Subject: [lng-odp] [PATCH v3 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: d5419e8857b2bc61d3be17fe53f171550fee426b ** Merge commit sha: e203ffe9c0a48b78cb0d0f4aadbb16bb1f840b3c **/ 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 7f212fe5e..9727dce50 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -171,12 +171,12 @@ __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_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 58103930c..9d7340f2b 100644 --- a/platform/linux-generic/odp_queue.c +++ b/platform/linux-generic/odp_queue_basic.c @@ -749,7 +749,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, @@ -771,7 +771,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 118f9eb17..43ca63d99 100644 --- a/platform/linux-generic/odp_schedule.c +++ b/platform/linux-generic/odp_schedule_basic.c @@ -1397,7 +1397,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, @@ -1419,7 +1419,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 e26634463..049777516 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 20 16:00:16 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: 128921 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp4796350ljc; Tue, 20 Feb 2018 08:06:49 -0800 (PST) X-Google-Smtp-Source: AH8x227kwtMLsXdpb9qBEk2axasD5VZlUTQ5ZvJzz7C8eona5y2oMTdppaGuvPfxlhcznTrLMqY2 X-Received: by 10.237.33.228 with SMTP id m33mr229341qtc.30.1519142809266; Tue, 20 Feb 2018 08:06:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519142809; cv=none; d=google.com; s=arc-20160816; b=Hh+5wacvhOFISbAlbI+nFUpFzHaEbd0GYki3auy09rHuGDSKhJonRh/zUK0HD45HJL xOsvIXnQBSuS+d4vhp12Vz+GSdfy8U5Glrd12xWOoDqw0pnwjdW7l1LIBz4fNoz5/qmk 8hl79xLbufofzrHn1clbX/bwhdIGPsWsI0ijQETAkJblKIo8U9Y9wlitveEJ9ibgQWB9 jSNAA2bsVjvUjmjIeWK5zPZHxOUax5b/wOAgopoRT1l8qIB8rkp6r1RurrWnYQOt4IVQ OegO2AouFNqRZ/eTcBxjDiGIbBkVHb9T0crDRaFwzMgUQTU1YQoA2UajitSAzIIQvsmM sghQ== 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=qromIoQgZRVQVAkTfRG8J0w1DbQOfkoWCiLYMV8xwaQ=; b=rzaE0ZqXv5pT1/Oh4J2DVTcgUlZB6tn6TokQE/xpNTJGXLfXtKRYM2c+g0Dourkudt z9+v414ICL8M5GCrsU+tVhplvtcXIOYagsLyn/nB2HZCaA7bEi8Dz3tBdj82mWbhx9LR MSN3zrHSaMgH+s/neuZ4t7ULU458VG1HonnOhvdxeffVOL+viBxwhPi/XTC4VkYS7FH0 1hGMTmEDj7apb5C9qM0UiC/1GX797kMftsrDNbX2pi+6kdV/f6B/tokBUd3IJ8H4OXip ikteIbuYbYmBcuNyNKSxhqitbs2vacz8Ji5YxDcCQaa4L6XJVPyJ5kM0fhbB6v6nGNud MCEA== 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 i62si2430685qtb.25.2018.02.20.08.06.48; Tue, 20 Feb 2018 08:06: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 BB47B60B04; Tue, 20 Feb 2018 16:06: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 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 C00F7608D9; Tue, 20 Feb 2018 16:01:04 +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 656FE60809; Tue, 20 Feb 2018 16:00:39 +0000 (UTC) Received: from forward106o.mail.yandex.net (forward106o.mail.yandex.net [37.140.190.187]) by lists.linaro.org (Postfix) with ESMTPS id C31C46150C for ; Tue, 20 Feb 2018 16:00:23 +0000 (UTC) Received: from mxback5g.mail.yandex.net (mxback5g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:166]) by forward106o.mail.yandex.net (Yandex) with ESMTP id B2500781F33 for ; Tue, 20 Feb 2018 19:00:22 +0300 (MSK) Received: from smtp4p.mail.yandex.net (smtp4p.mail.yandex.net [2a02:6b8:0:1402::15:6]) by mxback5g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id JPghvRPM8d-0MQipqeD; Tue, 20 Feb 2018 19:00:22 +0300 Received: by smtp4p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id 1BLM25rTar-0LTGSqV7; Tue, 20 Feb 2018 19:00:21 +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 19:00:16 +0300 Message-Id: <1519142419-2141-5-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519142419-2141-1-git-send-email-odpbot@yandex.ru> References: <1519142419-2141-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 467 Subject: [lng-odp] [PATCH v3 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: d5419e8857b2bc61d3be17fe53f171550fee426b ** Merge commit sha: e203ffe9c0a48b78cb0d0f4aadbb16bb1f840b3c **/ 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 049777516..2244eb557 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) { @@ -138,6 +131,30 @@ void odp_schedule_order_unlock_lock(uint32_t unlock_index, 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 20 16:00:17 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: 128918 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp4793221ljc; Tue, 20 Feb 2018 08:04:08 -0800 (PST) X-Google-Smtp-Source: AH8x227drmEO82wUdzUtSCvKCR0KTq6TggqFKnCBTT9vds0Ngu5DrHiKcl8NIqPcTM38DCSaTNUF X-Received: by 10.129.216.10 with SMTP id d10mr70756ywj.407.1519142648759; Tue, 20 Feb 2018 08:04:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519142648; cv=none; d=google.com; s=arc-20160816; b=L/umNmIN+qD0scn7JKylNgo0ojC3TBRv7ihj1sDMwfaTMbN/B3z1q0lXKf2O6HmBqu cGuMy4jgd4WTIkfDGvdnb7O9gs3IzIHTZHHlmIjynG0JYumQvkszKH8Sfm2lRKC3Fb7/ NtX7SZKO9VZho961UZ1co0agEoJVc85qlDnLZx3fnhY/xrXIXAe46DI4QA15ezmXIVbj EMHq5pdhXzfiWBM5mcN5Up1WNG/Kjoc/kvyi0A2j9pz/wWsCdISKcLKgglnOFmz4F/zZ PpSWrczHEtaTmjMU/1SJRuTkhbBM7KcqmPNuzYYwfWweVPzd51x6XUS8/Ex4veBf8AdX JOdQ== 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=m9NYD7dp6IiGDTkVHHSPowAz+KdJJqP8MDrW6/q6SEo=; b=LBpAMmZZw7C5bPUClZBc+uX8wQGMmFswjnimKJbsma31xhseuDPFc+Yn3rpSFA48/p T12Kba5W2VFWzKYuOaV4FJR6HX3ur9+4DgTgm2zDyri1KeoNVn09Jh21IJfUMzvuCH04 pPLE/5I3wNJQxpuV3sxDe8OOsVZii6cW0SVAPwK6X3pUOF2BxspfWkkDmCx0haEky66z 2c4wUQL0zlv8R8R4O12zEOlSavHTK7pVu49y5/qQ70L5NKBG5jJ9A5pfbLHOS8Q4JeFa ww5CC1YDRn/whYiB/zTDHTKVvIDAePHoVD31eck4JrI8hv4UKNeE0l9qr3+K7r0zxm2n OBMw== 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 x38si111742qtj.183.2018.02.20.08.04.08; Tue, 20 Feb 2018 08:04:08 -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 71F9161510; Tue, 20 Feb 2018 16:04:08 +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 1064960D3D; Tue, 20 Feb 2018 16:00:53 +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 EA1AB60670; Tue, 20 Feb 2018 16:00:32 +0000 (UTC) Received: from forward100j.mail.yandex.net (forward100j.mail.yandex.net [5.45.198.240]) by lists.linaro.org (Postfix) with ESMTPS id 9B82161522 for ; Tue, 20 Feb 2018 16:00:25 +0000 (UTC) Received: from mxback5o.mail.yandex.net (mxback5o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::1f]) by forward100j.mail.yandex.net (Yandex) with ESMTP id 2CA3E5D827C6 for ; Tue, 20 Feb 2018 19:00:23 +0300 (MSK) Received: from smtp4p.mail.yandex.net (smtp4p.mail.yandex.net [2a02:6b8:0:1402::15:6]) by mxback5o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id B3UltgQvtG-0NhqEeKx; Tue, 20 Feb 2018 19:00:23 +0300 Received: by smtp4p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id 1BLM25rTar-0MTu5jeT; Tue, 20 Feb 2018 19:00:22 +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 19:00:17 +0300 Message-Id: <1519142419-2141-6-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519142419-2141-1-git-send-email-odpbot@yandex.ru> References: <1519142419-2141-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 467 Subject: [lng-odp] [PATCH v3 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: d5419e8857b2bc61d3be17fe53f171550fee426b ** Merge commit sha: e203ffe9c0a48b78cb0d0f4aadbb16bb1f840b3c **/ .travis.yml | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index d9423adcc..60c87a71e 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 20 16:00:18 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: 128916 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp4791015ljc; Tue, 20 Feb 2018 08:02:24 -0800 (PST) X-Google-Smtp-Source: AH8x2259IeLRTUV/zYVIbrAFqt52AdCF41+cR99msMPEaW6jq952h2MxEfP9uWRJofJ+ELvSXgRn X-Received: by 10.237.42.34 with SMTP id c31mr133669qtd.199.1519142544200; Tue, 20 Feb 2018 08:02:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519142544; cv=none; d=google.com; s=arc-20160816; b=XTA5Sw65MOaNgb3y4GmuIiFFK2/o3EjmFs988nFebmfqcxmSo6rgzdqCTPcLPZe6We FX5RR/K4cnR2t8D46BIkfk7ml1MhtI2ymb4vr75T009ZKkm8ZXQ8oSIcqDf50+8ObG2s QcK91aJ1tUpClv2edde+n1B4S3aqcDwtc6fnhz7vFRAuxbSwpugDBvOY3k+aptfuT9Fe jgBg1BvuQSUtEElqlVOOL815aGPwEb+nHisu2AydaB5UFePL4b+NU/rrjbzsQQqOBBvz v6nVdSIFdqkpz7IjlY1TalbgPnJumg+lEGGIfRtTGQjB6LG8j/bILxsEbYIainamUBDq +JsA== 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=qFExb2taWBHo+chOaWyWI97XrTzbrcgLTHB8otZibMs=; b=uSCe9EtvN1eyrJc2aJ4FHZFPxAqtY68wf5RI39/uHV8rCiL0BvS1rqlfMaHqo2Gv3I oAgRLNDbmmV5SoKm2PiRq699GBvPCa+GGXv8W6+vIKD1j/xrnc6MS5I1tIZFeMI3HdV2 BIYspToQqjeup2vg6aWzYAoBOyWn6Hvvw28Jo7ivEV3zsksZ3UaB56fxon90B9NKXb4a eq10iYeTOQ9ttESjyMV5iWqyA7fxt7/knrhBUhm2fGAXooUENXU7kP9dmuymPJ+t4lhs Xy6Dlz4MJFKjHZa5IeqUFUk1pPSJZ5QNWPQQNcuzcvm4LNGbhBDkjvuXAcGZBvq04Nd0 b9Lw== 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 c39si1026264qta.272.2018.02.20.08.02.23; Tue, 20 Feb 2018 08:02:24 -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 E014C607A2; Tue, 20 Feb 2018 16:02: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 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 9038460953; Tue, 20 Feb 2018 16:00:45 +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 7F25E60670; Tue, 20 Feb 2018 16:00:31 +0000 (UTC) Received: from forward100p.mail.yandex.net (forward100p.mail.yandex.net [77.88.28.100]) by lists.linaro.org (Postfix) with ESMTPS id 09AE6610A7 for ; Tue, 20 Feb 2018 16:00:25 +0000 (UTC) Received: from mxback19j.mail.yandex.net (mxback19j.mail.yandex.net [IPv6:2a02:6b8:0:1619::95]) by forward100p.mail.yandex.net (Yandex) with ESMTP id 8EB0C5104978 for ; Tue, 20 Feb 2018 19:00:23 +0300 (MSK) Received: from smtp4p.mail.yandex.net (smtp4p.mail.yandex.net [2a02:6b8:0:1402::15:6]) by mxback19j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id eJgZPx8jIW-0NYicWZf; Tue, 20 Feb 2018 19:00:23 +0300 Received: by smtp4p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id 1BLM25rTar-0NT8ljNl; Tue, 20 Feb 2018 19:00:23 +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 19:00:18 +0300 Message-Id: <1519142419-2141-7-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519142419-2141-1-git-send-email-odpbot@yandex.ru> References: <1519142419-2141-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 467 Subject: [lng-odp] [PATCH v3 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: d5419e8857b2bc61d3be17fe53f171550fee426b ** Merge commit sha: e203ffe9c0a48b78cb0d0f4aadbb16bb1f840b3c **/ 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 20 16:00:19 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: 128920 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp4795553ljc; Tue, 20 Feb 2018 08:06:05 -0800 (PST) X-Google-Smtp-Source: AH8x2256ZLp+1PvGR64+y5QOu9bYO+zHF2BT04mEJGjEtpizNURww316C+RQd2JREPDoFd70KU8T X-Received: by 10.55.2.140 with SMTP id v12mr139218qkg.251.1519142765332; Tue, 20 Feb 2018 08:06:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519142765; cv=none; d=google.com; s=arc-20160816; b=ByV+0si58yqHbeQQtScaUCJyEPjE8UJBTdh11Y41oPkEBJhxJ9zK0cwLVcqV8m75/r 3Ee5AQRwjldCeEglqLARwCudOIHPZ6GTWYUG3Rjl4eO/H0U3q53nLYsFNoMH74l59RYn 1eQ8gFNYkjZRdCkjjUMq2YdYW65foVmVIwi/slA7v0oiuhfQbOwpXToKFeYSeVdLkJwh yrLPhH+LoKenOELnmS3zK3NOSQqC6d37LTIPOysCuZjP8nTHgvOIl+skPc+WqrSkCRdT mjhwiF7Sn4qLy4KcrLT0VG2fHX41N4WHSmMrmX/r8ejzIAiMo3lMzkRzmzAM8CvKU6rT 0Uig== 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=l50beqg1gMdiwZLQDqmGeW0sY2qKRdBUWPyvdYpIPb4=; b=ZZkPjVYcOUa7ED4kf0Zu5DNwrt7mrzZqyzR978YhtuZGn+pK5Xzk4muEuOHiMeAd8q fW/7WGTghEq3c5ug2cx83SRj+kyzlrF+O/8A1Y0X4s4HMhmkIfQCL8n7DfMIaC98H6mS XXrtm9JdDU/qjYji9Aq4Uy68WSrDhDaWBPQFcpOpt/uxstvB2gcPbgrbO5Q9z+CIp7uM KcH+4wCAq1VP9WAzzvVCtOPAu8cZNyW0P19agbUIRUkE4Ak80UEgx/oYzRKGJOCwHJdR 6vJEFzs4l2SFRkE1Ze61Dp/JlBdUwLkvOheIw+IzP3bfpgq+SqBEYfGSIfW4n/fk9fEE OfiQ== 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 t13si2163144qte.397.2018.02.20.08.06.04; Tue, 20 Feb 2018 08:06:05 -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 8856A6085D; Tue, 20 Feb 2018 16:06:04 +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 8E1D4616F3; Tue, 20 Feb 2018 16:00:58 +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 C7EED60670; Tue, 20 Feb 2018 16:00:33 +0000 (UTC) Received: from forward100o.mail.yandex.net (forward100o.mail.yandex.net [37.140.190.180]) by lists.linaro.org (Postfix) with ESMTPS id E5B0A616EA for ; Tue, 20 Feb 2018 16:00:25 +0000 (UTC) Received: from mxback3g.mail.yandex.net (mxback3g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:164]) by forward100o.mail.yandex.net (Yandex) with ESMTP id 3B8A02A23C02 for ; Tue, 20 Feb 2018 19:00:24 +0300 (MSK) Received: from smtp4p.mail.yandex.net (smtp4p.mail.yandex.net [2a02:6b8:0:1402::15:6]) by mxback3g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id Q6jowZNIyg-0OsGNqtL; Tue, 20 Feb 2018 19:00:24 +0300 Received: by smtp4p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id 1BLM25rTar-0NTqVtGk; Tue, 20 Feb 2018 19:00:23 +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 19:00:19 +0300 Message-Id: <1519142419-2141-8-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519142419-2141-1-git-send-email-odpbot@yandex.ru> References: <1519142419-2141-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 467 Subject: [lng-odp] [PATCH v3 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: d5419e8857b2bc61d3be17fe53f171550fee426b ** Merge commit sha: e203ffe9c0a48b78cb0d0f4aadbb16bb1f840b3c **/ .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..1fc3563f4 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 ${SHED}-${bname} xsltproc --novalid cunit-to-junit.xsl "$FILE" > \ - "$SHIPPABLE_BUILD_DIR/shippable/testresults/${bname}" + "$SHIPPABLE_BUILD_DIR/shippable/testresults/${SHED}-${bname}" done