From patchwork Tue Feb 20 15: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: 128908 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp4734423ljc; Tue, 20 Feb 2018 07:04:53 -0800 (PST) X-Google-Smtp-Source: AH8x224pdxEY8usngD1UKf56HQC7RXwjkj0a7G1jOQVHL2TB/FyTvhUpIGs8CMrpdZzlegugrBNE X-Received: by 10.237.54.71 with SMTP id e65mr7687752qtb.219.1519139092972; Tue, 20 Feb 2018 07:04:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519139092; cv=none; d=google.com; s=arc-20160816; b=PMIm2edrOp7g+FZfhaEPVhRIESoSDH36lIH2KJyT6tFPs4q3a9BnF9uA9Pnskm4mM6 hML6fo5VaSedfNH1iGa6oRyYU9qlyUvmJ5tezV0AnfTxxMnjl8jwawCA/PvFJxpmyXOc ZXVJngocM271Ebi9YUS1O5VjcWkHRTz8/a4imS+E1UETC2FTuLpcI50ISdpXCXAa46nM 2ISctPGaiNhQ2yONo76y8gWthuxAbAwJrAmfFagRutMjGn0c7xNEdPWBJsmFtQVTMsWm KIfqRTFBo+QTiDdOetKu2/RW6Dyryi4jGPjd0zJUUyImzgYGvoFXLFoY0iwXUSc3JNlC 05dA== 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=JriEQeuXV1L7YfYU/Am57gDKBTfmxLwvrWVhtKhXps8=; b=gaON+PCdMwr7E+9RYZRhfIQ4ngu3C49fRPV/uiWrq4tOFzA0EZKFWoeeL3Uu9auFep hxBWoRMHzNOSGrS0dxJupQhiev29QqRxep2pMKT5l52fo0I3+mR0gRACL48byYhllsHi N8h5UW5LILAVlTQkl2TCFrJ82Sw31RRull8/K5ejRxiLOvFBwpoAWXdeHrpHb3TjQVfa sCqI5WccWej+JUX0UasZfRX5Fa6JZGbrK+M7TWch+ngw8rsCnmp6+ea4dSws9ImildFT l5J8LLuZMuvYuza5BhkxoPfTYIzT6j8vmmW4A/LCcQef16+DDwvEt6B7vLcCE0p8EPGY qjXQ== 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 u22si3852848qte.174.2018.02.20.07.04.28; Tue, 20 Feb 2018 07:04:52 -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 9011F616EA; Tue, 20 Feb 2018 15:04:28 +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 85F796174E; Tue, 20 Feb 2018 15:00:54 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id DEC0560729; Tue, 20 Feb 2018 15:00:30 +0000 (UTC) Received: from forward105p.mail.yandex.net (forward105p.mail.yandex.net [77.88.28.108]) by lists.linaro.org (Postfix) with ESMTPS id 8391161780 for ; Tue, 20 Feb 2018 15:00:25 +0000 (UTC) Received: from mxback12j.mail.yandex.net (mxback12j.mail.yandex.net [IPv6:2a02:6b8:0:1619::87]) by forward105p.mail.yandex.net (Yandex) with ESMTP id 14C50408353B for ; Tue, 20 Feb 2018 18:00:20 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback12j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id 6JwAoFjFwN-0JxSgh36; Tue, 20 Feb 2018 18:00:20 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id 7uC8N0Zg8Y-0Jwi4F7e; Tue, 20 Feb 2018 18:00:19 +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 18:00:11 +0300 Message-Id: <1519138817-822-2-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519138817-822-1-git-send-email-odpbot@yandex.ru> References: <1519138817-822-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 467 Subject: [lng-odp] [PATCH v2 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: d7c90978f25a7415a6bd43474e213e1bf63b2531 **/ 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 15: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: 128907 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp4733155ljc; Tue, 20 Feb 2018 07:03:53 -0800 (PST) X-Google-Smtp-Source: AH8x226AoGmEwiE2uswt6kqdjsllI5UzzL9UfFCC1nIzAfwdioiBsgzv9G+vHI7+1c2BwIth+7vB X-Received: by 10.37.151.129 with SMTP id i1mr8537374ybo.401.1519139033334; Tue, 20 Feb 2018 07:03:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519139033; cv=none; d=google.com; s=arc-20160816; b=DaTBK95relWd/K+r5v/oRXfXHtxSx4REOxccvWohXkgO7KzZVgn/d+NEKkZq9OF6Sg 5UkBesdkUOcg7hW+QkbP0C0a/3xtB2wrmOM8Zew0siRST3l23IQKptGt1afbaFhvbWuh CcjrhKcQoizt63cLvZGeDLBI0AW/jcfYiXICI+csTaPvBkc5wjkXmxugHoFqWjM+ypW5 xgLD1r3Ucr6hJi5n0IaqDcHknPn6unvGPnAy8bkm8UXQMGlVZ0eaCD0+EjBSzcPxz1+h bPL7VwG056N/nC4nZOhOrWBv6j99uYf/RLCYy1A3k8iBvCPHx1v5f+0zKkf/FPy8DGD6 b5nw== 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=moRBM3fHMQlA708noBEYrgARpDfbzOIHQOSsPwM2TP0=; b=zoLY1kLD0FCzPFRE4Bqd4K7L/xl344hsui0ba9cKHTbYYaL15RSpuocftSheSzV6vb gSXsbhHj6FlCqaouHygR75vJL2aVAQ+RpqTsj5wPcU2ypCBRH4LSXtDwMG/llnYiBRF7 KO83LjmT8sJEzex7AWq4cyicLUCPs6qan1Xyvk1ur23XoGNePolb0f+vTp1gVPtOJnP/ OPxoN95taMLEznhYXexpNyg48kmgsn5yyLLxMpg7jSoPHkGaQospZhos1LWUn5B1JjbR /TA37DCd345FvrsUDx/ESZ5wcSJ4dnyiVBHGLgidkGkBMUb8EkddQmCohvoR3Gh5tiuf yPkQ== 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 q22si2990709qtk.200.2018.02.20.07.03.31; Tue, 20 Feb 2018 07:03:53 -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 2B13461522; Tue, 20 Feb 2018 15:03:31 +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 3283B616EA; Tue, 20 Feb 2018 15:00: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 5C03860729; Tue, 20 Feb 2018 15:00:29 +0000 (UTC) Received: from forward105p.mail.yandex.net (forward105p.mail.yandex.net [77.88.28.108]) by lists.linaro.org (Postfix) with ESMTPS id 86D6861781 for ; Tue, 20 Feb 2018 15:00:25 +0000 (UTC) Received: from mxback10o.mail.yandex.net (mxback10o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::24]) by forward105p.mail.yandex.net (Yandex) with ESMTP id CDBBF4083999 for ; Tue, 20 Feb 2018 18:00:20 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback10o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id 6rgdX7Cymj-0KoSgPGA; Tue, 20 Feb 2018 18:00:20 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id 7uC8N0Zg8Y-0Kw8dgKA; Tue, 20 Feb 2018 18: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 18:00:12 +0300 Message-Id: <1519138817-822-3-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519138817-822-1-git-send-email-odpbot@yandex.ru> References: <1519138817-822-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 467 Subject: [lng-odp] [PATCH v2 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: d7c90978f25a7415a6bd43474e213e1bf63b2531 **/ 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 15: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: 128905 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp4730002ljc; Tue, 20 Feb 2018 07:01:47 -0800 (PST) X-Google-Smtp-Source: AH8x2277Zkby+e0EfsXtMf9KiGLivylvMhUVgwYTFX5jYPYIO5PJLGb2ziQzGvMY2BcMDOCPewZ/ X-Received: by 10.55.162.86 with SMTP id l83mr27983539qke.160.1519138907207; Tue, 20 Feb 2018 07:01:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519138907; cv=none; d=google.com; s=arc-20160816; b=fSHmGL+M+Hw6RVPQq4khqiRVCNnwpLkFOli4TDU8thc4d617xCvnWdiRwTsqxRxoz7 qFUSl5Mv4+3q1t+bXjFa4KPhVcXGnPoal48bT3tlOMDrVF3NDY8Bpmixj0Y86ZeFiRKZ ExjdU2WPQR9+WcD1iAgiz8vRlNJFF6Y9nqy42ybPYCkZiCJbEHQOoz3jc23jaHndFJ3/ pboRsGZ8I+okMM/1j7//Jxhpd/FCCkfXjUgi8oHepJ0cfV9x9f1XT1O9vbVKA+ARd9cH MbC44HOcGxz7Rcboyc9tVFxcI2kGLPERcgCBb88TNChaGU1gsj+e8m7fp3oSXcx8rwIE l0gw== 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=7xt/RQ28kdyPSaaKTtuDMd/NPhngo2DJwIedZGK0Uek=; b=wIs+o94hHd4p3z/DOnW00hFud8zTDYP5w0FkbnIRNs1tbGZPlsE7rosvkq+oXPD+bh M3IwG3LGEuMvbUTQP5DVZTBJfNQ4/PkMItPyq7uTGp86DPYnOtqVEF102Qfij6ujO/E/ sIQJtm/IFG6m+hXpy6g4PRuO5RlYBYRVBda98SflRHtK3cYFZmG1NxBqa0MAkYRytoCP TYYSjfQWTgq0IQaQzzV9otsX/LIwcfOOW3VTRIdWHRYIWYJRxbpGAuu7PqfO2FIoyCCR 3DzlvEa5vgrpDjppO6YzsFFk7lPsCF65swZkv8KQhQeSTUospEMXOYB04881Hq3YDcsQ HrwQ== 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 q3si2348340qkh.117.2018.02.20.07.01.39; Tue, 20 Feb 2018 07:01: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 AA511617AC; Tue, 20 Feb 2018 15:01:39 +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 52CD860729; Tue, 20 Feb 2018 15:00: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 7783E61778; Tue, 20 Feb 2018 15:00:24 +0000 (UTC) Received: from forward102j.mail.yandex.net (forward102j.mail.yandex.net [5.45.198.243]) by lists.linaro.org (Postfix) with ESMTPS id D51D161778 for ; Tue, 20 Feb 2018 15:00:22 +0000 (UTC) Received: from mxback4j.mail.yandex.net (mxback4j.mail.yandex.net [IPv6:2a02:6b8:0:1619::10d]) by forward102j.mail.yandex.net (Yandex) with ESMTP id 9950A5602F28 for ; Tue, 20 Feb 2018 18:00:21 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback4j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id M2k3nOF0vd-0LuGPU0F; Tue, 20 Feb 2018 18:00:21 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id 7uC8N0Zg8Y-0KwKvFNO; Tue, 20 Feb 2018 18: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 18:00:13 +0300 Message-Id: <1519138817-822-4-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519138817-822-1-git-send-email-odpbot@yandex.ru> References: <1519138817-822-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 467 Subject: [lng-odp] [PATCH v2 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: d7c90978f25a7415a6bd43474e213e1bf63b2531 **/ 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 15: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: 128909 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp4735044ljc; Tue, 20 Feb 2018 07:05:22 -0800 (PST) X-Google-Smtp-Source: AH8x224cAKHWn5TLL9NvHGo54YsBQB+9RX/m8jjfpdyrHfu3Ckjdj4v5yuIuCwbIF1EQ0InGlhAE X-Received: by 10.237.37.196 with SMTP id y4mr31464919qtc.182.1519139122468; Tue, 20 Feb 2018 07:05:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519139122; cv=none; d=google.com; s=arc-20160816; b=Xm3KABfzIyGaDEgp1biSKPSQl1SXv14/IGJd3wrf3MXYvquBStX+LhGAcnw0aPDEr4 tKJ0xmc1Fc7LZwE6WqvWM4v/+n8n1Gv2/FohvK+taji8ug268g4ShyIzwkHF6Px5KSdR kaUB8T3BgYKMvh4jIHy4ZF/jTR5X9bwFhUy9esXvmEpJhqmWGLLUVtho5blZMcL5q44/ weMTSjyohxf7h1V4m0zg8TCbz+k1nuHQZdoBojabZ8xmU4t6Oj1plivE6gjoZqnWc+RT jTbsns+KEjH+WNUfKvTNVe/42+3e/InWyEzH6e9KENJn2o1pmlGSBQ2bcmrOaXIdESR6 nkng== 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=PmzOdz4BLxpNsZvcum/6iklH4qdD6xy0DMYB6nwBpeE=; b=Z45XO5VqdP4jkB8l5gAfJ3Bc0CEOeTXF+eNTlu2BjxzyMPsCP6Iol/n5hwo0ZP9Hjc vghQHTk7mqiale9WaxdiUW4iS1AhKa6hnnlM2mGOj1mZRl+lWyUCfKQ71Injtxhb43bz 0OnaamDv8ZXsSE2zUinGqO6D9fBSQEyaT4hAnJJpf/wQ8LYRcUO8Jf5fD/Ts+4DTPVJw ywRE7DArsGWlzKrlUjFYjhlZzawijfRJwvwW/IM94j2aCAaYZtuBKtSYNTmaRc5jHvHF UANYrx0dOfSSF93H/jff06eH6yYKSEu2lBx0NqgnmoP2r442/oAnRD0tl5gihtddRucC nDAQ== 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 u71si5300996qkg.305.2018.02.20.07.05.22; Tue, 20 Feb 2018 07:05:22 -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 19336617B9; Tue, 20 Feb 2018 15:05:22 +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 C4BEF61789; Tue, 20 Feb 2018 15:00:57 +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 2FA106077E; Tue, 20 Feb 2018 15: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 97C256177D for ; Tue, 20 Feb 2018 15:00:23 +0000 (UTC) Received: from mxback2j.mail.yandex.net (mxback2j.mail.yandex.net [IPv6:2a02:6b8:0:1619::10b]) by forward100p.mail.yandex.net (Yandex) with ESMTP id 4322A51027BC for ; Tue, 20 Feb 2018 18:00:22 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback2j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id GSSC3262CJ-0M40aQ4X; Tue, 20 Feb 2018 18:00:22 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id 7uC8N0Zg8Y-0LwSt3ah; Tue, 20 Feb 2018 18: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 18:00:14 +0300 Message-Id: <1519138817-822-5-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519138817-822-1-git-send-email-odpbot@yandex.ru> References: <1519138817-822-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 467 Subject: [lng-odp] [PATCH v2 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: d7c90978f25a7415a6bd43474e213e1bf63b2531 **/ 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 15: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: 128906 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp4731327ljc; Tue, 20 Feb 2018 07:02:37 -0800 (PST) X-Google-Smtp-Source: AH8x2242fSQEV0kAqV2zXdaIv3L4LS/w4edJlm9ZOJfVO75DLDxNk9kvSwFqNJxvpqTBHb24HyZf X-Received: by 10.202.13.8 with SMTP id 8mr3712387oin.272.1519138957658; Tue, 20 Feb 2018 07:02:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519138957; cv=none; d=google.com; s=arc-20160816; b=n9VZoEy9SLb8O38af0WSVA8JkDGrtSn10q8hg6dbgIMnpvqsFMe75Jd1n0EWBjB1fH b8i3/7EN143SlAIESGUkZXnst2LRWS3Slt6p/I5VSRKFh7oDMIiAZz8NoE7+vgHYx5JY dw82qYKEeaWiTKCVpUeGj4qaIiTLHeAp84uXBqtw2swGP+71lOxtRCPwQIF2pFNKhNh1 WhGKg9P08Uwd+yAkW6mMBiccYP/pLbQ5eSDX9UDDjFIWiffgWl5S3ni4+aJ1T9GJqllb xj24q+t/TwEEM2pD2rti5/NWU0G7XRv2+sI/tDkC0/bWbHOosNfINRp+w7CPXqOrjiP7 H2sA== 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=VqArZ0X1TtY3+C80XUiDvD1CrkZxUKyPQfRZe3Nv7gY=; b=PiFD6xDeCbA/Zb8xMPy+2AoURry/zLXynj+pVCQvi/+HYrbuHbuoYTmsgcqaOJx3Kv vnm/bY2SAWu/LQSLx2NopGEfZ2zqC/QVTX8xWF4vseIa5RbzkQxS5uwqlPG57P3wFk67 ajGzseIx6rgAYvbnnqb6Qz96zwGKoWFYCe4iNQfAQK4/gGstFqgCJo5I553mcDe5cC+o uizd2R6dkkjls1XrjdeQNkg94DSMBCgdwwyS4B2z56MfvNSaxBjiGxxTCBsA+e53zps1 Xu7h0kfc5DY9qWdeBB6oCbDSbBWghH8SAvYN+g34xw9Icn+74aPTyPH317M7fw1XdiJy 2M1A== 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 r9si2639128qtm.387.2018.02.20.07.02.33; Tue, 20 Feb 2018 07:02:37 -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 EABB560855; Tue, 20 Feb 2018 15:02:32 +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 D6735608F9; Tue, 20 Feb 2018 15:00:44 +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 6305761789; Tue, 20 Feb 2018 15:00:26 +0000 (UTC) Received: from forward104p.mail.yandex.net (forward104p.mail.yandex.net [77.88.28.107]) by lists.linaro.org (Postfix) with ESMTPS id 7D5016177E for ; Tue, 20 Feb 2018 15:00:24 +0000 (UTC) Received: from mxback3j.mail.yandex.net (mxback3j.mail.yandex.net [IPv6:2a02:6b8:0:1619::10c]) by forward104p.mail.yandex.net (Yandex) with ESMTP id E357618484F for ; Tue, 20 Feb 2018 18:00:22 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback3j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id 7Y3Xw90FSN-0MbisPNR; Tue, 20 Feb 2018 18:00:22 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id 7uC8N0Zg8Y-0MwuUcTB; Tue, 20 Feb 2018 18: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 18:00:15 +0300 Message-Id: <1519138817-822-6-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519138817-822-1-git-send-email-odpbot@yandex.ru> References: <1519138817-822-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 467 Subject: [lng-odp] [PATCH v2 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: d7c90978f25a7415a6bd43474e213e1bf63b2531 **/ .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 15: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: 128911 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp4736188ljc; Tue, 20 Feb 2018 07:06:17 -0800 (PST) X-Google-Smtp-Source: AH8x226V0oc/caJYue/YZtj4ivelKbw7iK/uRAGHWkUFc9nTNiQxMhUUd17Ulfy9O3QnTpQcqtFh X-Received: by 10.55.142.71 with SMTP id q68mr29459982qkd.40.1519139177276; Tue, 20 Feb 2018 07:06:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519139177; cv=none; d=google.com; s=arc-20160816; b=JRwoSuirdNtbB4xAwUU0Suw8X9kRtOkNT7/1dpmi+eg5x1ulrtuqb6/gpqVLqJg+po Xei1oMVEYisw+rmSzxdrB9t3ako1ZutcsnemKw+ByBH5nKnbjG4cY9NNnj61edz2Ld/u GYY9gcqBeVGr/cpSGbsPbggoscFatxhsKs7cBF5dCCgRoktj+jNk951rkbhXZ3/BivoX cbQEWs0Er5QEULSPJ2ZdPyVVnJWmPI6gwcLOZu8b+qQjXhcQN8y+zo74FL7r7ivhlmX/ ralRNRTCyhQf/hQ20fXIFBVZrS92ZNrES43WWUBri/ThmMTFsBk2r30b91yNbcdlHeR6 A2SQ== 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=SWJwgkt6goLvZkyvQwzwmnFUvNzVY2bDSPRn4QvMOOw=; b=RXFvn9GuzGYf7YHWnjKbN3A/8xI/fdrDj1H0WSnoNe74Q2y5dmOm6Ng3uoZUIqcFM+ ajO4iV+764G7oY20UszUXXfSjYHlChQenypL/H2u+rE6WcPNaXUQcUt4gUhyNAXXCvqN fzzmEpae7IFf1PJuBuUPEjLu38EpTDJWzU2Ro35r26+/RWVa4VlKcZm6PX15D6GT4SNr uOqBCez7vM0NUILzImHMFFjud47agf5WquQtxyI5xTBFNVanzlrP4Q4WaQNyKitXhxeg LlFKh+axOUokgs2ly1KOFT1mUDYqePo56R372tcOp/aZuArIAQEXRD8ZYakFZCufquww Nhzg== 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 k21si97705qta.360.2018.02.20.07.06.17; Tue, 20 Feb 2018 07:06:17 -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 F29306087C; Tue, 20 Feb 2018 15:06: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 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 E82E661798; Tue, 20 Feb 2018 15:01:00 +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 90E6F607B9; Tue, 20 Feb 2018 15:00:36 +0000 (UTC) Received: from forward100p.mail.yandex.net (forward100p.mail.yandex.net [77.88.28.100]) by lists.linaro.org (Postfix) with ESMTPS id E1CCF61778 for ; Tue, 20 Feb 2018 15:00:24 +0000 (UTC) Received: from mxback4o.mail.yandex.net (mxback4o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::1e]) by forward100p.mail.yandex.net (Yandex) with ESMTP id 723675102962 for ; Tue, 20 Feb 2018 18:00:23 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback4o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id wnH2mYiENK-0NnqqQUb; Tue, 20 Feb 2018 18:00:23 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id 7uC8N0Zg8Y-0MwS6VdE; Tue, 20 Feb 2018 18: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 18:00:16 +0300 Message-Id: <1519138817-822-7-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519138817-822-1-git-send-email-odpbot@yandex.ru> References: <1519138817-822-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 467 Subject: [lng-odp] [PATCH v2 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: d7c90978f25a7415a6bd43474e213e1bf63b2531 **/ 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 15: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: 128912 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp4736338ljc; Tue, 20 Feb 2018 07:06:23 -0800 (PST) X-Google-Smtp-Source: AH8x226JO3hy+8GjXVOAVxIb5M5vP0bgR02tJ2Q9es31XMCanXgTr291hHBBF+8QWM+99q+QOEiI X-Received: by 10.55.39.208 with SMTP id n199mr26671081qkn.138.1519139183156; Tue, 20 Feb 2018 07:06:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519139183; cv=none; d=google.com; s=arc-20160816; b=LB4NF8JnRQia4UY+PqIRmqsJr4F3bua5Y1+hfSSk2D0+CENb3ohdYDxsLwGZ8SgVmh z8VCsTncbm7mtYsyvJjIR1bkUxwdqJVVONgIvaoXmvXwrmU/v3jfhfEu0SJwISk6nxyu NEzag4oUemxqI4vlAa1jUZzXkMDjfJ1iPinQi0fJhUQ2stUoGla95SAES89/R52HLtFx 9r+s5S4EX3/I72izGBD9SpHXkDVdlNJqSFhA/KzJAVhtEU9FMT2trqC3l1Ou+hvUCcR9 3Nt6NEbBc71PcicHi0iWpbi8n6DT9FZNTMQ8/Fh+MRHJ8O+9vgIE+gEKl0Wc3B/h8XoS /1aA== 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=5CIPC72X3ErSertn9zu71Du0BvYHwixW/nobcB3kA7c=; b=bfCcusLzDhftblK0pauEwEYFvFi/h0TmQi3jQooXb55mB/h2RFot4TjGZpbjzy+QAe kkgoVj2FVCRjUGRCrlAhOD5hD0xMUFmXcn9I9c1oxqhnES5GmALW5+inDlRO7cmjKwk+ IAJJTPPV4etL8zbTmD3ytmrt75seeZG5FR1OVBVFyZW50YUHk0BKNdsmsLeURmUqYkM0 K5a9lUrg2t7iUZkl+x8/i0/AiGl8VRO/obwMLX9hHPRlJgBoZ7aaocp1UUWFs5aoksAt 3KFqh/WqhAikmxqR47ywXwb4ITsbrDjgYD0qLQ7rZLYfSvKh8N4rjBFTJt9/XMB4CNvZ P3Tg== 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 b26si263290qtb.393.2018.02.20.07.06.22; Tue, 20 Feb 2018 07:06:23 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id BF2A1608F9; Tue, 20 Feb 2018 15:06:22 +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 3A92D617AF; Tue, 20 Feb 2018 15:01:11 +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 406D3607B9; Tue, 20 Feb 2018 15:00:38 +0000 (UTC) Received: from forward103p.mail.yandex.net (forward103p.mail.yandex.net [77.88.28.106]) by lists.linaro.org (Postfix) with ESMTPS id 0509C6063E for ; Tue, 20 Feb 2018 15:00:27 +0000 (UTC) Received: from mxback9o.mail.yandex.net (mxback9o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::23]) by forward103p.mail.yandex.net (Yandex) with ESMTP id 651572182D98 for ; Tue, 20 Feb 2018 18:00:24 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback9o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id NoPCz4rJhG-0ODCFpc0; Tue, 20 Feb 2018 18:00:24 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id 7uC8N0Zg8Y-0Nw49fIv; Tue, 20 Feb 2018 18: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 18:00:17 +0300 Message-Id: <1519138817-822-8-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519138817-822-1-git-send-email-odpbot@yandex.ru> References: <1519138817-822-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 467 Subject: [lng-odp] [PATCH v2 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: d7c90978f25a7415a6bd43474e213e1bf63b2531 **/ .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