From patchwork Tue Feb 20 13:00:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 128896 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp4612355ljc; Tue, 20 Feb 2018 05:01:35 -0800 (PST) X-Google-Smtp-Source: AH8x225xuKCwAJkYHzHGw5fsF8WtHWCAxoItbXW1EJX39CvBm/HlMWsq7F02yVXZzS4SVFD4ciTB X-Received: by 10.37.91.68 with SMTP id p65mr10334449ybb.83.1519131695223; Tue, 20 Feb 2018 05:01:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519131695; cv=none; d=google.com; s=arc-20160816; b=Z7vpgASovK5maKaEK2Z4zTgW2bKpESebQmeX/lgVHDeOtcdAkRdZ0jpSMyyjPpI8iZ FjWPIpA1W8Vgs4VmgKDVAmGQOkLAZVbXYrNJGygE9NZ9MWaPyb1hXnXWdMawou0q6RtV qG0cxMQMw3YarfPV3KyINYqu4NQLteT3mfi9U2FjXAahaUea7inbLwwlIz83Zn5fcuIr PXF8iRpEcgj0ITX6YqNTtKfTKcP6VsKkWDu5CdUqXpFp9GUaxVMXGZTw7lJlMP+fpotj asiosdAzTzC3OFQsjKTIo2GvAkTRAHg1rxwH0S4SrwvmFQmz41zNV48hPWC5xGDgItsY W8Zw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=pI0CVMlfKTL2p+dMxk4qrxHUXNMcLuvdWO0lnhUspcU=; b=KSA8T2yNlc+Ix90/OlBpN4J23RiMaN4l9zIAKqgzZGydJKSAaZhbMiKeiQt+WixIY2 9iz/IuBk17BK+dI6d6KlEetqjGyvLbLaIkHQAUZyHACUOISCpnmIq6gLgV8hDBh/we79 SguRLJE7HpTLjEcX6OG63sM1cEmDMjq9eXWpint3W68NiyaoDVhj6/VHHeSNvJpdPszN y1L3C1DmGtAzY92fimAbc0vglU00XHqleiJN/T8KbQoM6Np4mtzWzvF7cjyLYyjvIq2a /hgEJgMOR33L6udnmJdjVBkmuonAjQvpoys7XGlXRpjN9aASeNFUmhzTpQQdYidmYNWw b5HQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id a20si69687qkh.123.2018.02.20.05.01.34; Tue, 20 Feb 2018 05:01:35 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id D83F061770; Tue, 20 Feb 2018 13:01:34 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 707B360B52; Tue, 20 Feb 2018 13:00:43 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 61095607C4; Tue, 20 Feb 2018 13:00:34 +0000 (UTC) Received: from forward102j.mail.yandex.net (forward102j.mail.yandex.net [5.45.198.243]) by lists.linaro.org (Postfix) with ESMTPS id 093D6608F6 for ; Tue, 20 Feb 2018 13:00:29 +0000 (UTC) Received: from mxback8j.mail.yandex.net (mxback8j.mail.yandex.net [IPv6:2a02:6b8:0:1619::111]) by forward102j.mail.yandex.net (Yandex) with ESMTP id 32CEB56031BA for ; Tue, 20 Feb 2018 16:00:27 +0300 (MSK) Received: from smtp2p.mail.yandex.net (smtp2p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:7]) by mxback8j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id c8Eq7WepvB-0RsWW2Sw; Tue, 20 Feb 2018 16:00:27 +0300 Received: by smtp2p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id INTanao9Vw-0K6OKf38; Tue, 20 Feb 2018 16:00:20 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Tue, 20 Feb 2018 16:00:07 +0300 Message-Id: <1519131613-30839-2-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519131613-30839-1-git-send-email-odpbot@yandex.ru> References: <1519131613-30839-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 467 Subject: [lng-odp] [PATCH v1 1/7] linux-gen: queue: encapsulate queue init/term_global functions X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Dmitry Eremin-Solenikov Hide calling into queue_fn into queue_if module. Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 467 (lumag:sched-env) ** https://github.com/Linaro/odp/pull/467 ** Patch: https://github.com/Linaro/odp/pull/467.patch ** Base sha: d5419e8857b2bc61d3be17fe53f171550fee426b ** Merge commit sha: e771b2cf674da116ae0cb9e7e5dca276e31fa112 **/ platform/linux-generic/include/odp_internal.h | 3 +++ platform/linux-generic/odp_init.c | 4 ++-- platform/linux-generic/odp_queue_if.c | 11 +++++++++++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/platform/linux-generic/include/odp_internal.h b/platform/linux-generic/include/odp_internal.h index f85a2f538..e36b084f1 100644 --- a/platform/linux-generic/include/odp_internal.h +++ b/platform/linux-generic/include/odp_internal.h @@ -100,6 +100,9 @@ int odp_pool_init_local(void); int odp_pool_term_global(void); int odp_pool_term_local(void); +int _odp_queue_init_global(void); +int _odp_queue_term_global(void); + int odp_pktio_init_global(void); int odp_pktio_term_global(void); int odp_pktio_init_local(void); diff --git a/platform/linux-generic/odp_init.c b/platform/linux-generic/odp_init.c index 0c5adf335..3900fb629 100644 --- a/platform/linux-generic/odp_init.c +++ b/platform/linux-generic/odp_init.c @@ -90,7 +90,7 @@ int odp_init_global(odp_instance_t *instance, } stage = POOL_INIT; - if (queue_fn->init_global()) { + if (_odp_queue_init_global()) { ODP_ERR("ODP queue init failed.\n"); goto init_failed; } @@ -238,7 +238,7 @@ int _odp_term_global(enum init_stage stage) /* Fall through */ case QUEUE_INIT: - if (queue_fn->term_global()) { + if (_odp_queue_term_global()) { ODP_ERR("ODP queue term failed.\n"); rc = -1; } diff --git a/platform/linux-generic/odp_queue_if.c b/platform/linux-generic/odp_queue_if.c index 969b0d3cb..e1cfc9445 100644 --- a/platform/linux-generic/odp_queue_if.c +++ b/platform/linux-generic/odp_queue_if.c @@ -7,6 +7,7 @@ #include "config.h" #include +#include extern const queue_api_t queue_scalable_api; extern const queue_fn_t queue_scalable_fn; @@ -111,3 +112,13 @@ int odp_queue_info(odp_queue_t queue, odp_queue_info_t *info) { return queue_api->queue_info(queue, info); } + +int _odp_queue_init_global(void) +{ + return queue_fn->init_global(); +} + +int _odp_queue_term_global(void) +{ + return queue_fn->term_global(); +} From patchwork Tue Feb 20 13:00:08 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: 128898 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp4615280ljc; Tue, 20 Feb 2018 05:03:42 -0800 (PST) X-Google-Smtp-Source: AH8x226YR7yjz80b26XqXB3U6A32AN8bngZp9vD0acTo3ZUUykdG5JoSTlUO3RMvYWZsb1PnHn+7 X-Received: by 10.200.28.8 with SMTP id a8mr31479632qtk.280.1519131822777; Tue, 20 Feb 2018 05:03:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519131822; cv=none; d=google.com; s=arc-20160816; b=B9Vm+wdSBwAFyvgbdEPsV+xzO5xhrp4LhqYhnEsm9eovHwnF41JSuO5Qex7bqp/IuK M2K0LiYuzYEi+oFgF7KmLspmye/idAmu5ckPP5yLE884JK8QSXu79pXktxatRjbS+Cbp GOSXinmHNJUJxd7b+6ORVj8iPX7Yh1QLPDlaf8GOVahK5TrVXur7a0HZiw75neEfOfGM qCgORGNBtIG+rlUeJ29mmklHsAUicixkImUr5l85Y8I6LdYREtSy3JzZ5goxjznorip6 u8iqUOB6Fq0Sj1TuDU2EqUbTjWFO3lUPcvg1iJ5s+5aS/XYAefAZ6X4tCUN7kPygwzs2 1x/Q== 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=zT3T+QkiwUZtmSkGABx8nDpWkRptC9IBKYx45BbMYfE=; b=fcdQRDTDKiQomOHag5MZmQLwvXb/LOkHipu72hqfRq5u/HnnPn5p9D16K6KV7PDzg2 ltyuiMQDtyJiw9Q7L2D/ZpximarvsPT9yn+MQMmfjJhYPb+vpvlCBioUiLv4lk8LaX9S CwELqoD1XayQEqwfggLm6kj8pke3CKV+IVUDzvCGnEbvPQ3G2D3AczwZNhwJT4QO5mUr NJgZc3P0I6+ggNnThYIFN5dgZGNo85usu+ZTy1oD/7q+yYg2oWt0UFmloZyguZHnCjq0 s5dHGs5n4Rg+LnJpXDXrM0+LdhpUqpZAiEumGBkX+N7onkxWUZFMNHcRBW2MlbD0VRJO wZxg== 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 r123si220180qkf.32.2018.02.20.05.03.42; Tue, 20 Feb 2018 05:03:42 -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 6DBDB60B52; Tue, 20 Feb 2018 13:03:42 +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 8AD2D61770; Tue, 20 Feb 2018 13:01: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 7B9B3607C4; Tue, 20 Feb 2018 13:01:30 +0000 (UTC) Received: from forward102p.mail.yandex.net (forward102p.mail.yandex.net [77.88.28.102]) by lists.linaro.org (Postfix) with ESMTPS id 87F4D609D5 for ; Tue, 20 Feb 2018 13:00:35 +0000 (UTC) Received: from mxback2o.mail.yandex.net (mxback2o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::1c]) by forward102p.mail.yandex.net (Yandex) with ESMTP id 125DA43043FF for ; Tue, 20 Feb 2018 16:00:34 +0300 (MSK) Received: from smtp2p.mail.yandex.net (smtp2p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:7]) by mxback2o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id 4ULAWjFlTB-0XMS7vIm; Tue, 20 Feb 2018 16:00:34 +0300 Received: by smtp2p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id INTanao9Vw-0R6a1fBM; Tue, 20 Feb 2018 16:00:27 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Tue, 20 Feb 2018 16:00:08 +0300 Message-Id: <1519131613-30839-3-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519131613-30839-1-git-send-email-odpbot@yandex.ru> References: <1519131613-30839-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 467 Subject: [lng-odp] [PATCH v1 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: e771b2cf674da116ae0cb9e7e5dca276e31fa112 **/ 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 13:00:09 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: 128897 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp4614108ljc; Tue, 20 Feb 2018 05:02:47 -0800 (PST) X-Google-Smtp-Source: AH8x227ZDfmzJ/YCcoVsnHSBAqngHQ6JP37DDwl0qWvNWYXEf0mibVYzlSvfAfxZRDs07hIQXKNM X-Received: by 10.129.50.141 with SMTP id y135mr10968219ywy.355.1519131767377; Tue, 20 Feb 2018 05:02:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519131767; cv=none; d=google.com; s=arc-20160816; b=viweqqbm7Hs/lzFK4J5d/VHEzvtfqes7OZnGUxkgw1O6SbrZ2M6b5EvUI4nMnfx9LH aPIqrI/AP7HqSvkEaucb+9dySXYCNpOXZwopzsS0xYSBpsv2QOe5ihr+VVlYwS3+m+7T U1kPoqPtKVvb6RrE7n3O6+8l9/mIPQTzrTcDyQszMBpjh9CQobi2XPvmJExVvu/LEWi1 eeKAtlYU0yBZD1mPPV6WqMJyexujPccXpLx7JY+NLje9jYDToIJs4AjAGp0PQZplMq3m cWnvl3+gig9ALiJn4afZgqEsl1OJqUETYxApztMov950p00Kg66AYDIzl0hHNs2BWfS1 1wAw== 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=pcxss/P6pUMpuuz0o7rRbsQJ2y08bcQml4YOxzjg4F0=; b=ebDB9jmXbSs/I1qb9Kn5fX/Gb+ABdfJCNYm/z2ZwUt8fo3uOwZrvOzJHlwvZX0FM1v BwhFLD7k4On8pCv4ZuQG5FrrpuVwkOfvmxF2mN+GvNlrlY1aPrpN3LeMfxE3To17wrXD EuZNRW/KYrXiDyV4+gu5/9TPe/ULaZwi9FJ7KEegiUca/dxAgfeElMgSMtGcXJe9vlIn M3GP9qa/JTKmRSCLAtszfUYWGtRgw4hy92KabH8Oq4v6ah5OfL9MclYSQ9ddZJolZ70V 257FExOu5owo78OZ33WbDSZfIB5Uy70+TBv48dm680zBAAqHubDeaGa0Sc6uF/ka4Iqt /BiA== 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 i7si273815qkb.464.2018.02.20.05.02.46; Tue, 20 Feb 2018 05:02:47 -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 D56F36174E; Tue, 20 Feb 2018 13:02:46 +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 320B6609D5; Tue, 20 Feb 2018 13:01:33 +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 0F11D6067D; Tue, 20 Feb 2018 13:01:29 +0000 (UTC) Received: from forward104p.mail.yandex.net (forward104p.mail.yandex.net [77.88.28.107]) by lists.linaro.org (Postfix) with ESMTPS id 428B36067D for ; Tue, 20 Feb 2018 13:00:42 +0000 (UTC) Received: from mxback14g.mail.yandex.net (mxback14g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:93]) by forward104p.mail.yandex.net (Yandex) with ESMTP id A82B31826BB for ; Tue, 20 Feb 2018 16:00:40 +0300 (MSK) Received: from smtp2p.mail.yandex.net (smtp2p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:7]) by mxback14g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id SnuYqlzvz4-0ejSHvnV; Tue, 20 Feb 2018 16:00:40 +0300 Received: by smtp2p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id INTanao9Vw-0Y6Ku9dg; Tue, 20 Feb 2018 16:00:34 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Tue, 20 Feb 2018 16:00:09 +0300 Message-Id: <1519131613-30839-4-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519131613-30839-1-git-send-email-odpbot@yandex.ru> References: <1519131613-30839-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 467 Subject: [lng-odp] [PATCH v1 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: e771b2cf674da116ae0cb9e7e5dca276e31fa112 **/ 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 13:00:10 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: 128901 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp4618723ljc; Tue, 20 Feb 2018 05:06:42 -0800 (PST) X-Google-Smtp-Source: AH8x225ZfiPk/kkSJOMrNjwk+GQ7E1hgDfddrenuf8Fjmp4nT76TPR29C5AdZLn/MZFffI8cyjjn X-Received: by 10.37.129.131 with SMTP id p3mr7950137ybk.449.1519132002421; Tue, 20 Feb 2018 05:06:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519132002; cv=none; d=google.com; s=arc-20160816; b=pSABt1Lq2fUTSa90gxthEYSYNbBmkLQN/UxR5ZyOQTYVoMgNIBelioskteGBZ4OD/G I6olqPrNucYfFqKPWepMEEt6IITtcpdbR68+bR3evuYH670R1doVlR6GnkKbe7smJdk0 JpLA0erbS5XuVAjQUicxqTnPjHXBvLIFQN3m4XGOWGSpVaasI6X300vejcp98+D3quZI caiQCj+RVB9cA0tECEkOSKrk76rYq8GoRSIjnpVETiKlhFoBZ322k9w2UDk7G7oNEtOA SbRkuI5JX3DTuQWTJSop2aB/GeHC3Pu+YD2AtLu8BIJZVOIxtzZl+4DXe4KzZDQgdygv VIBQ== 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=HE1eczeuhPt63w/Ji1nA0HibjMmMohEKcDWkBA63eWA=; b=k9zdNOUuQipXaYaARbAYbEQLKwIA7QAfrSn27TDy3NWiT94MH1+rTD5Pz0Ty56aiLZ 9zdqhh2nNvvU/pxvqlC3rvVoyC+JPIE3de3cUIxb8ixYN4c7t7Du0d9thqm3pyl4t1GO UlNwi/ZD+9HvoHjIHMAxuHaKGvf5xJjMearjaNVsup7ynUVAdEy29dk21Bu6ExJOuXyX Yn+Wgn/KNQ8NjUtVYjiLnRlZ1cmQLjW7sWEU5G+Qt2InYM8UZSYHpyKtIPSNNfPiFjoz zGLyckJNU/bOl5EVOp/gLD6hAsO93VSGCEsHPBHZNDjdKFV+VyGaDPwIPUMJ4xJcETho ctZA== 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 j10si186399qtk.420.2018.02.20.05.06.42; Tue, 20 Feb 2018 05:06:42 -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 100856177A; Tue, 20 Feb 2018 13:06:42 +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 49077617A6; Tue, 20 Feb 2018 13:02:52 +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 6A5286099A; Tue, 20 Feb 2018 13:02:34 +0000 (UTC) Received: from forward102j.mail.yandex.net (forward102j.mail.yandex.net [5.45.198.243]) by lists.linaro.org (Postfix) with ESMTPS id 6F59A60B63 for ; Tue, 20 Feb 2018 13:00:48 +0000 (UTC) Received: from mxback6o.mail.yandex.net (mxback6o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::20]) by forward102j.mail.yandex.net (Yandex) with ESMTP id 4B2EC560215B for ; Tue, 20 Feb 2018 16:00:47 +0300 (MSK) Received: from smtp2p.mail.yandex.net (smtp2p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:7]) by mxback6o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id toHy1ZzrwA-0ltaaidl; Tue, 20 Feb 2018 16:00:47 +0300 Received: by smtp2p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id INTanao9Vw-0e68Gp7i; Tue, 20 Feb 2018 16:00:40 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Tue, 20 Feb 2018 16:00:10 +0300 Message-Id: <1519131613-30839-5-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519131613-30839-1-git-send-email-odpbot@yandex.ru> References: <1519131613-30839-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 467 Subject: [lng-odp] [PATCH v1 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: e771b2cf674da116ae0cb9e7e5dca276e31fa112 **/ 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 13:00:11 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: 128899 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp4617069ljc; Tue, 20 Feb 2018 05:05:17 -0800 (PST) X-Google-Smtp-Source: AH8x22609/2sJ0iJBV/OZR8zNsI3PXs6ktf5a+djpdOPHDjONa7j7Ez3G9f3fuc1YWbCKBRlLV2d X-Received: by 10.237.63.202 with SMTP id w10mr8585958qth.251.1519131916930; Tue, 20 Feb 2018 05:05:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519131916; cv=none; d=google.com; s=arc-20160816; b=zBr3uWBZXBG5aoxO6F4SlZHkTD77jYJUlMG6y+hRA0LGy+BUQrBM+uExscWix9kfLL 3/ZCoNGMwhAbQS1jXoJOi5aOkOWdJvO4Y4Nm3bI0Cd40XkIIYCDrF8PUls+5HEz0hMl0 CqG4GZOWv+LuNgng5g6GqwTIEpX5DawJMCe8Ttc7Pev/7eywnm92sOrhcLKDw1QTe1I0 yJDerWAEc83JPTq+e/980t2QohmRBfxu6UgUJ82JTcvoxU189kc/bqy1IMVVB9i4Czhq 5oHgbjGtNKOg6f1+x0QciyNXZL5rKxQ02DKMr3iEhIYR6zcaqG5uBEUEOfNu+GHDe+LG sytg== 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=xByxj4ufP7XsJyqnw5QSMJodnTDrZbFEvh0nr9PHCfw=; b=D6wNe2fntRMsx3ZMoakJ7XGogquU00m1cCIn9AfKiSrFuoJrPcOd8CxOtzLj9idBd+ +JE3shLkUZodPSanSgXMRsUTm283SbwJEy1ShESbqGKgL1cp8ju+dxSmDJldOdmcNlEm 0SbtSHO02E9g2UOaIXZ5v4qC7PN3mx6hIzQ1pc7NUJciYi6z4LjxFTBXhgIDlsNAWenH FdWq3zIq3VQ/u08juqybyS2C2NzmTmDKFt7elRQurAvR1+DIgmz9+9e/GTyItOPHf6nQ 1lpuuzqPkkZ2hYHvSbVB7FshljWBuU5D5/GpPJx2B0c6KSn6ju9X8aBx3Iy8wBMeMMJL pUSA== 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 y29si3734294qtk.179.2018.02.20.05.05.16; Tue, 20 Feb 2018 05:05:16 -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 97188617DB; Tue, 20 Feb 2018 13:05:16 +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 5788560C5D; Tue, 20 Feb 2018 13:02: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 A124A6179E; Tue, 20 Feb 2018 13:02:30 +0000 (UTC) Received: from forward105o.mail.yandex.net (forward105o.mail.yandex.net [37.140.190.183]) by lists.linaro.org (Postfix) with ESMTPS id 2A4FF6174E for ; Tue, 20 Feb 2018 13:00:55 +0000 (UTC) Received: from mxback18j.mail.yandex.net (mxback18j.mail.yandex.net [IPv6:2a02:6b8:0:1619::94]) by forward105o.mail.yandex.net (Yandex) with ESMTP id BFD8D4444452 for ; Tue, 20 Feb 2018 16:00:53 +0300 (MSK) Received: from smtp2p.mail.yandex.net (smtp2p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:7]) by mxback18j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id DGFtGmUh0c-0rA8Ov8G; Tue, 20 Feb 2018 16:00:53 +0300 Received: by smtp2p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id INTanao9Vw-0l6KtL9R; Tue, 20 Feb 2018 16:00:47 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Tue, 20 Feb 2018 16:00:11 +0300 Message-Id: <1519131613-30839-6-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519131613-30839-1-git-send-email-odpbot@yandex.ru> References: <1519131613-30839-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 467 Subject: [lng-odp] [PATCH v1 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: e771b2cf674da116ae0cb9e7e5dca276e31fa112 **/ .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 13:00:12 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: 128900 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp4617950ljc; Tue, 20 Feb 2018 05:06:01 -0800 (PST) X-Google-Smtp-Source: AH8x22727dYXYSpI94UJriQPT/+0EUu3H59qylmixB7nxzlOvdPDP9sJEkesPCnO0b0VU3uzYQV8 X-Received: by 10.55.120.66 with SMTP id t63mr28277838qkc.345.1519131961802; Tue, 20 Feb 2018 05:06:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519131961; cv=none; d=google.com; s=arc-20160816; b=XbGdhIqN77TRf6RuB24RAjI35NJeTKei/bwyXLcEd92kwnnha1XgAvy6anSyttGOIa KcSA1itIR7rqU8vzmUx3ibFKFoE/6WF7Mb7h7EvxjH6NkXrCHF6ioZSpAgU/P3y2eltu FrXH8OUjET8SbNrfP6rRZWjYeh1uaSqvmS0NzR04BWqUWkPEJ/KmdkqrjF3zF0O/JtrD v1zNblCBszCdu+1uecdLIMsLwrtnqhpcosIgqYHPgOTzjYKVRzfI4v9r0mtJsa2XY85E wJYaLdJ1Gg1+6+H03FlKzYcUiJHIOjiDVz3OhPtXSKVTvYIB1dgZ5h4SEUINOkx0sQXt YgLw== 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=mMWOyFCdDBpWQUcf8mNU0JznUsihPfGMOgTPwNhUbCY=; b=nJFJO6y5A/XwUJkjS6FU9EZBN3jXbE39D9m+4EHmDBsXrTJf747cgqF4NzXUZ2YMP1 v3yxjT00NOhC8hc5xBLU0NPPjGsA6AuauRXgF8WWLichALs+MQ/yfPIubrmGEii91ZD3 NK2yW7axq84NzjMSR4kfv6+aKEpbzRIckkVIQI81bmUny7UPkWjg32gyWS+R0VKTXPwI 49D7AU5EWYY+JsuDvs5hToPe6vrmdrk5dyp9c+5BEJx22QOqSUejUzClnrKVcke5L1+l 3hSof9CuxSGUAStqMeI3qhihbn0COH2cltuNGIU5LBpVLRjR1RfL3Fqhdi8jXSuEFMxz sxAw== 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 l5si7397780qti.208.2018.02.20.05.06.01; Tue, 20 Feb 2018 05:06: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 7DB4661719; Tue, 20 Feb 2018 13:06: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, 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 B013161746; Tue, 20 Feb 2018 13:02:42 +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 D60106174E; Tue, 20 Feb 2018 13:02:30 +0000 (UTC) Received: from forward100o.mail.yandex.net (forward100o.mail.yandex.net [37.140.190.180]) by lists.linaro.org (Postfix) with ESMTPS id E45DF61737 for ; Tue, 20 Feb 2018 13:01:01 +0000 (UTC) Received: from mxback18j.mail.yandex.net (mxback18j.mail.yandex.net [IPv6:2a02:6b8:0:1619::94]) by forward100o.mail.yandex.net (Yandex) with ESMTP id 6B13F2A233A8 for ; Tue, 20 Feb 2018 16:01:00 +0300 (MSK) Received: from smtp2p.mail.yandex.net (smtp2p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:7]) by mxback18j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id 6VOiexfWln-10A0GuIa; Tue, 20 Feb 2018 16:01:00 +0300 Received: by smtp2p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id INTanao9Vw-0r6CA9FQ; Tue, 20 Feb 2018 16:00:53 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Tue, 20 Feb 2018 16:00:12 +0300 Message-Id: <1519131613-30839-7-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519131613-30839-1-git-send-email-odpbot@yandex.ru> References: <1519131613-30839-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 467 Subject: [lng-odp] [PATCH v1 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: e771b2cf674da116ae0cb9e7e5dca276e31fa112 **/ 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 13: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: 128902 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp4619637ljc; Tue, 20 Feb 2018 05:07:30 -0800 (PST) X-Google-Smtp-Source: AH8x2272UBEg0YGadS1nUOsnKWbPs0NPrVhRmqa+4oBCUsTxR78cWCAM7Pv0DcdyABDPo1Ajzd4l X-Received: by 10.55.217.143 with SMTP id q15mr22822293qkl.38.1519132050223; Tue, 20 Feb 2018 05:07:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519132050; cv=none; d=google.com; s=arc-20160816; b=peUvvskxY0Rh57B3KylFJWQFB3mRt7iw9jQFVa6tLQuAaZY529HVwZIW9ofI7/Feck Tz6t64OIzSnwFS4LcJcHTiEHPIUuC0KFok6CG/MTF6gEMt1ZT8MufoaVuhcp3Hwz40FX dIEGgtACwGx2KG7YTUzP92eb842Okw9dxCkc1PBF6Rp8kySz5K+RMLDqJSSr6kLL6C9E 5QUGBJe2E7JNtkdFmKdQdOd8e8y5e01EPB4UpW8e53wfCAbAuuWaYebA4NHYodoLjHDp 7PDGjXxgpzrNaKUe3BUGz/4s415RHTPzpGxPiVp1vfSkfQ3cGS3OJuzlm5rS2WzHa7k/ JWMg== 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=LHi7F54eo/dOFsbUZhn/qO/aaZtdnf0SHGMHNXzz/Ic=; b=Fen8nIPRDhMx6qtWuh9zqK5Bq8Rh832P63VC6AWKgDknrkIJ74Mo1uQNoM6z56tJyp rescKiza0JL6t4c1Joa4HVyl1GcA43tvFbXy9oqFaOzlXjN70HqmRhBusJ8rPWsFuhSD yqKoRnwitcIkzgpWNnfLiOA1NFkzDpz/pzcNJNfdC1ebGoh9NPMRWa/HYgW/uPoxZ4mO LeKVdS/lW8azd7KfFPG4YB4yPxzajKVEWINFFGooNYXiLB4i/4DhbUiJ7YeytUbArpW7 V27caxlH2B8b7kuSQA+XgFFD+hRN76yit9c2QKcsAjWu8EWsngRmrnSr7qnxHuk1ux7w FUjQ== 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 b1si1391271qtj.421.2018.02.20.05.07.29; Tue, 20 Feb 2018 05:07: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 DEE47617A6; Tue, 20 Feb 2018 13:07:29 +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 9B0E8617B4; Tue, 20 Feb 2018 13:02: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 6673C60B63; Tue, 20 Feb 2018 13:02:34 +0000 (UTC) Received: from forward104p.mail.yandex.net (forward104p.mail.yandex.net [77.88.28.107]) by lists.linaro.org (Postfix) with ESMTPS id DFFF260C5D for ; Tue, 20 Feb 2018 13:01:21 +0000 (UTC) Received: from mxback20j.mail.yandex.net (mxback20j.mail.yandex.net [IPv6:2a02:6b8:0:1619::114]) by forward104p.mail.yandex.net (Yandex) with ESMTP id EBB28184BE7 for ; Tue, 20 Feb 2018 16:01:06 +0300 (MSK) Received: from smtp2p.mail.yandex.net (smtp2p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:7]) by mxback20j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id RNO6MK6hjy-16Oiv9It; Tue, 20 Feb 2018 16:01:06 +0300 Received: by smtp2p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id INTanao9Vw-106u4jX2; Tue, 20 Feb 2018 16:01:00 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Tue, 20 Feb 2018 16:00:13 +0300 Message-Id: <1519131613-30839-8-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519131613-30839-1-git-send-email-odpbot@yandex.ru> References: <1519131613-30839-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 467 Subject: [lng-odp] [PATCH v1 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: e771b2cf674da116ae0cb9e7e5dca276e31fa112 **/ .shippable.yml | 12 ++++++++---- scripts/shippable-post.sh | 7 ++++++- 2 files changed, 14 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..3a8c26b13 100755 --- a/scripts/shippable-post.sh +++ b/scripts/shippable-post.sh @@ -2,8 +2,13 @@ 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`"; xsltproc --novalid cunit-to-junit.xsl "$FILE" > \ - "$SHIPPABLE_BUILD_DIR/shippable/testresults/${bname}" + "$SHIPPABLE_BUILD_DIR/shippable/testresults/${SHED}-${bname}" done