From patchwork Tue Feb 20 17:00:21 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: 128929 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp4852958ljc; Tue, 20 Feb 2018 09:04:10 -0800 (PST) X-Google-Smtp-Source: AH8x227l0vP9hQOJJ00qFOPQ8fMHvV6lSNVZZ/AcWuC08kaRxLZg1kAsKCPVeKbGR0C3PYv78P5I X-Received: by 10.200.49.226 with SMTP id i31mr509600qte.42.1519146250482; Tue, 20 Feb 2018 09:04:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519146250; cv=none; d=google.com; s=arc-20160816; b=dI7AVyw/t4ZLd3NYZh8OGT7Pxha++2V3Ahm+dxqqLnGnSKTJsI9AL0389YXOtql3LN IvJe7YAk7W/uM97wLwsqaSA26Ah8DVjOmZuT2lzSWW1U4M78QrbUKfMQZhmzc9fw6pLz 0OE4A4FpP7d/T6pMlj1zheUYEYxjqJ8CapvH0sSS27MVrURgLz6VJ5fa7SwoDg6eoO9N /Sa6fUiFHup5LGMnPrdUEmU9jEr5Z9o6OSdqMqsMdvwHo9vHmSW61v7FJI6mb7kDfZEK lCVG8FHbzbbwg64u//iNOPeeRVRXLW17vPHafCQf/niMmIO5Qp2AUu2lu3TQWH+i64lJ Fqbg== 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=w+PglHcM4CBNNElQHVrf9Etsvl4xu5d/iqIhZTAbcb0=; b=hxcRbxt5XH14cPiHrnoCDHpn8vIR6y2XWKGv/baf9pVyiA/4RFUMYNz62MzrAk5bLQ KqAFOKR0gIWuknzPSCnu68XD3qaSHGCj6Y+81s2Ica5VLhMVbqEPs+nQmE0VP/hSCZQl /Du984YygZDXajrFMi4JlCazdLFPOr+ZcKpnrJz3M9sdsmD5giPShUZO8a7MtEwEeUAW GY1t5hD/cJ0L40V/zgSJlTRrX2eZ48nngtc2ISHnNDGTpjPdYkQ/eXN/Gd5rWqNCMfjH tbzOTq7UEFigTvr5LCoaYxVaC9tcwCYBHSHoGrYXpQTbq5BBikkYRZYZCI8PVE0x8MO7 IQ5w== 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 u126si918700qkc.353.2018.02.20.09.04.10; Tue, 20 Feb 2018 09:04:10 -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 0C9E76171D; Tue, 20 Feb 2018 17:04:10 +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 441B7616FF; Tue, 20 Feb 2018 17:01:59 +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 086CF616FF; Tue, 20 Feb 2018 17:01:54 +0000 (UTC) Received: from forward100j.mail.yandex.net (forward100j.mail.yandex.net [5.45.198.240]) by lists.linaro.org (Postfix) with ESMTPS id 121B2608CF for ; Tue, 20 Feb 2018 17:00:31 +0000 (UTC) Received: from mxback3o.mail.yandex.net (mxback3o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::1d]) by forward100j.mail.yandex.net (Yandex) with ESMTP id 8895B5D82D21 for ; Tue, 20 Feb 2018 20:00:29 +0300 (MSK) Received: from smtp4p.mail.yandex.net (smtp4p.mail.yandex.net [2a02:6b8:0:1402::15:6]) by mxback3o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id S9NPFOkuB2-0TDmJNpn; Tue, 20 Feb 2018 20:00:29 +0300 Received: by smtp4p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id d7rw0280Nt-0STiSP7w; Tue, 20 Feb 2018 20:00:28 +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 20:00:21 +0300 Message-Id: <1519146027-3446-2-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519146027-3446-1-git-send-email-odpbot@yandex.ru> References: <1519146027-3446-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 467 Subject: [lng-odp] [PATCH v4 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: 911ad4bd1709c0e28617d1e82038172c21039039 **/ 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 17:00:22 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: 128930 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp4853655ljc; Tue, 20 Feb 2018 09:04:46 -0800 (PST) X-Google-Smtp-Source: AH8x22795JtI9xZNOOIhqGRh85PBmxhhUWXgJEpNlmbA7DtFnMbmMl2nyspE4B75ojztmy/IKlQK X-Received: by 10.129.94.2 with SMTP id s2mr287291ywb.222.1519146286379; Tue, 20 Feb 2018 09:04:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519146286; cv=none; d=google.com; s=arc-20160816; b=PnYg0qdEMJysPr/reBNcjVMmupnByIpP8f9zM7MRHD67SqpTkowuKqKso3nvx0tl2v zlZnTEAoXZ+qLB9IhIWOaaprqDTk6Eozt9dmI6TRiIFbCT33Qkgxk1dRMj2CgbHmK7qn eM0NWRPj4V1p0/DQhouUVkXoL9X1karuI5hWPiHtnTItiFvIBUQdO3NGSO6KmC0tTrHl caoifC7QMYLJiygi7JvQMg0LAtTpAxasERHYZJrR661xLV7O10aEA3yw3CzU2Kga8mVI uVprALsfDFpaR59YOTqxhOSFCcyaa+D+gxLW4JYBMfknKOWeM23gbLn7gvCAR1GSllPV 0Yfg== 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=NwpRkr2+BmcmGwG2UFNoibGZyiwQ5Ux5abtc6KAPBYg=; b=x/oR7nGQmY6hvuNAws2B9LuTmGYRhQAbLB4+l6RWe3TCH2J56c1Oa09EbDmn7AzsdQ oHOFXO4UvlEkgDonSf8Doa0WAhjSp7GBUsS8wXCeSRNQkbtoQKlI9COMvTSZGsLVDGoz X6KLKo0agH4OogkBYP+EKoCTRbP1aX9yN31mQk5dC97BZRRUEWBtIavZynxn2iJoC599 00Z28Ygp2F3yyHQJXFCh9l3XKmGLPYNvU9kLgJo+qRUi4Ne/ZGUXfTQpT9zfc7dOwNum E0pPv93WVFUPaDNF1Bd7r1YLZCUhWOwbcIouwh9mR6q6G1vpqcM5rgX/picsu/ZVYPYR +K1g== 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 m28si206834qta.91.2018.02.20.09.04.46; Tue, 20 Feb 2018 09:04:46 -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 0DA7D6170D; Tue, 20 Feb 2018 17:04: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, 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 908FB616F4; Tue, 20 Feb 2018 17:02:01 +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 EF6B0616FF; Tue, 20 Feb 2018 17:01:57 +0000 (UTC) Received: from forward105j.mail.yandex.net (forward105j.mail.yandex.net [5.45.198.248]) by lists.linaro.org (Postfix) with ESMTPS id D00E9608E8 for ; Tue, 20 Feb 2018 17:00:31 +0000 (UTC) Received: from mxback9o.mail.yandex.net (mxback9o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::23]) by forward105j.mail.yandex.net (Yandex) with ESMTP id 70963182942 for ; Tue, 20 Feb 2018 20:00:30 +0300 (MSK) Received: from smtp4p.mail.yandex.net (smtp4p.mail.yandex.net [2a02:6b8:0:1402::15:6]) by mxback9o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id chr397Ggse-0UD0LbM7; Tue, 20 Feb 2018 20:00:30 +0300 Received: by smtp4p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id d7rw0280Nt-0TTeGhmJ; Tue, 20 Feb 2018 20:00:29 +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 20:00:22 +0300 Message-Id: <1519146027-3446-3-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519146027-3446-1-git-send-email-odpbot@yandex.ru> References: <1519146027-3446-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 467 Subject: [lng-odp] [PATCH v4 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: 911ad4bd1709c0e28617d1e82038172c21039039 **/ 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 17:00:23 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: 128931 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp4855144ljc; Tue, 20 Feb 2018 09:06:09 -0800 (PST) X-Google-Smtp-Source: AH8x226WcdSI7CmNLCOQA9mzp3drJ+pZ3OzCkUXApzh2KIzRxCLXTZ1vZXP4zg4naj6evegWoNQ7 X-Received: by 10.55.160.2 with SMTP id j2mr491806qke.200.1519146369518; Tue, 20 Feb 2018 09:06:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519146369; cv=none; d=google.com; s=arc-20160816; b=PKJaCvSXiVXdu8s+nwk/7ipZjAgC5lTGlpF45mbUtl3UyZcsNJ6Ea8oJNiyINbyB0o pso+F8wOZFLSgS2n8vcY8O9oSeO7RuygG3kpuxROH7Iq8BxxTaBY7xvKOBJke9wmlstM hnM7HYH1bEBKwIB9023ExR5MfrwOvUbcn1qFewfCDZFnNrY3f5UIN8QmsLYz/vm33MW5 HRxdsgw6GDcpuPz43FsAW+6KlvWu4IlDpNAYulqZm3VviBDnBQhE6Mz5E9F4CruIc4jE m/w05j5AOWvbCNazEepbKj68VsrkuQ/WLbCODmSEERpOePOjs2izTZCj1UGXIYLBTyQI P40Q== 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=YEXouVSYmPsOuV4uTAYjBo2UBfDrOk/XsImsPStOXco=; b=hqisueAshUR9+bEiWSSE9rkws1PMvsgHQpElu0muwuAZNDAMgaEmG08K0s9KuCQ7m3 6Dr2srtWiujDjCEtEKsgivFgHPUju/Nwr37YrNVWLk9oFc5q8qC3DVce3AGelK0YYIe3 BH9XHARPhrRrSj+JCldIO/kn+Zs0seaTe98CE7GS+L40OpbYwR2mKQa0JHE/ZtL0dmJ2 v7iGmGjGY/HUrupltroLoyZNGztzNdaMgXnEnjc3ORrMB8Q0FW9UNA+/jiC/la+dKw45 iLX+TkPnckUGKN0pqohOmp3IhQbie0R39iLzwH8vF8MQUNOL5dV4aInFt8H+hVXud0+B 6uRA== 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 f81si226156qki.450.2018.02.20.09.06.09; Tue, 20 Feb 2018 09:06:09 -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 306C7608F9; Tue, 20 Feb 2018 17:06:09 +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 5831E61728; Tue, 20 Feb 2018 17:02:09 +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 BE9286173D; Tue, 20 Feb 2018 17:02:06 +0000 (UTC) Received: from forward106o.mail.yandex.net (forward106o.mail.yandex.net [37.140.190.187]) by lists.linaro.org (Postfix) with ESMTPS id 7E22960912 for ; Tue, 20 Feb 2018 17:00:32 +0000 (UTC) Received: from mxback10g.mail.yandex.net (mxback10g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:171]) by forward106o.mail.yandex.net (Yandex) with ESMTP id E12FD784661 for ; Tue, 20 Feb 2018 20:00:30 +0300 (MSK) Received: from smtp4p.mail.yandex.net (smtp4p.mail.yandex.net [2a02:6b8:0:1402::15:6]) by mxback10g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id YHCnW5HLM0-0U44Dg0w; Tue, 20 Feb 2018 20:00:30 +0300 Received: by smtp4p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id d7rw0280Nt-0UTWRXEe; Tue, 20 Feb 2018 20:00:30 +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 20:00:23 +0300 Message-Id: <1519146027-3446-4-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519146027-3446-1-git-send-email-odpbot@yandex.ru> References: <1519146027-3446-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 467 Subject: [lng-odp] [PATCH v4 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: 911ad4bd1709c0e28617d1e82038172c21039039 **/ 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 17:00:24 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: 128932 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp4856134ljc; Tue, 20 Feb 2018 09:07:04 -0800 (PST) X-Google-Smtp-Source: AG47ELs4SafSMJqWkTZvY6L1cNM5AIXY/8No7G5GXwfaFtpP96MdE+oAhzVQM7c3S0sgymVhf2wV X-Received: by 10.55.145.1 with SMTP id t1mr440016qkd.199.1519146424520; Tue, 20 Feb 2018 09:07:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519146424; cv=none; d=google.com; s=arc-20160816; b=JRlECr9rc47iWhASq5beXgBjgMY5YLq5ztlE6vo07HZk0xdsQB3YsDc4lLmTo00KtW F/BxxoFKn9yTUDkY8tSuoP0FWJSzov2prMAGKcT6Vk4HhiM1AHC/+6N4V/zPzA8wmizB /aenmzRsdXCBZy6hQ/rfMb+bTozsOk3tlGLrkWFopMs11jsaZAdqON79aSm/iaVIT/3q J0WKYHQHoDjXJEeFa3jPuB4Mq/b1qAfIsj4bNuIPA07DD7lpOh62FV1BJMXxmZT33TNk STTTtseOO+U5hqsb0p7C3ekQkNY+kAhZzWM+hc0y22JvyzgJ6Kgkn+00mI+wd9kQtINi y4JA== 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=yCH7xFaFDNZDY+RrzVIZKuD8pffsVajpAVGa0O+CVGc=; b=zIVVmC7s0q+byAJrbf44AQLzgOigJCW4jXLslPvkG60EDOjCepG7vo7abcU4y1Wmp2 mD2cZ0RIZjzzUbI52lY9pVNvWXBpZ8o624GT39r+Qy7THIEt3ODQSD5FdbyOWQ685EIe wkkpD4VnL5ve2T1B8EA9SpNxIpoP0drqLcp01/Q7+4F0Xr32d3EnGlDuWmbh6LtJeSuy VN6xu3+mE59KAyGVcmiilwTaeg0u8wAGkg5Hv+2zVBXZIo6Hs+/7SfpKDeJE1FMYAxiF n4cF/UyHE2vXhFI0a8OfnjAtpwlNGM9e3azgjSEPAkieWKZk+cFFj8CAHoxWePHvnrfg q5Jw== 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 r4si8687293qkk.335.2018.02.20.09.07.04; Tue, 20 Feb 2018 09:07:04 -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 2DA04609A8; Tue, 20 Feb 2018 17:07:04 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2 autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id BFDE261746; Tue, 20 Feb 2018 17:02:18 +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 81D366174A; Tue, 20 Feb 2018 17:02:13 +0000 (UTC) Received: from forward100j.mail.yandex.net (forward100j.mail.yandex.net [5.45.198.240]) by lists.linaro.org (Postfix) with ESMTPS id 036F560669 for ; Tue, 20 Feb 2018 17:00:33 +0000 (UTC) Received: from mxback17j.mail.yandex.net (mxback17j.mail.yandex.net [IPv6:2a02:6b8:0:1619::93]) by forward100j.mail.yandex.net (Yandex) with ESMTP id E254B5D835EA for ; Tue, 20 Feb 2018 20:00:31 +0300 (MSK) Received: from smtp4p.mail.yandex.net (smtp4p.mail.yandex.net [2a02:6b8:0:1402::15:6]) by mxback17j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id 6GupxRfcgZ-0VdOnGgG; Tue, 20 Feb 2018 20:00:31 +0300 Received: by smtp4p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id d7rw0280Nt-0VTWdD7C; Tue, 20 Feb 2018 20:00:31 +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 20:00:24 +0300 Message-Id: <1519146027-3446-5-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519146027-3446-1-git-send-email-odpbot@yandex.ru> References: <1519146027-3446-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 467 Subject: [lng-odp] [PATCH v4 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: 911ad4bd1709c0e28617d1e82038172c21039039 **/ 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 17:00:25 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: 128934 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp4858030ljc; Tue, 20 Feb 2018 09:08:48 -0800 (PST) X-Google-Smtp-Source: AH8x224HWbf9UVcAwpVqQAzEieJT3wpBlSBtyLdvvlNmspDwoNwpC0Ix265yAzKEEEDioneI+Ht9 X-Received: by 10.200.36.233 with SMTP id t38mr468283qtt.141.1519146528276; Tue, 20 Feb 2018 09:08:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519146528; cv=none; d=google.com; s=arc-20160816; b=a5F80o+tYMfS/R3FjBlEqg2dpZdKP+3oTr0ooRiDYIkEhnuE7iIzAYdebmnY72M22G Skuaa3DmtwmwZO2xdp/HA1mlfEa5OokTyZPzvhoAqk/RBLQfU0oP1CzspmtKXX6qt+Z0 q61gKLEfku/eAAcsIxVyLkrwjyvJhnvyQ1taQD+Gh2v9oZ51PLFUz94aOoyTbdtz5WI9 x7UNGwh9NXR+Ib/ikwN4uxx6TfCKqdHkmO+bAkreIXYVnRDfHvJQX0W91mFNj25y+2Yb Srxp6dd9+QiBGpwkcCeXNB/IltHGW6lVk3A+egElo2tS4rBqsBYGj3p3L3myaJ1NzZfy sFaQ== 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=RozIHcPypCjAs7HmXtBd3lc4xu02m7nYNFPeXVAtcYs=; b=Q8Jd9UwL5CoUX1AEFveH8nFD9e9dStbqCmIu3u01puQKroqu+3DNt9EOJoNpsJJMgw KhoZVxea3O6g9WrOy267XQ3UElPIxg4Fp3cPlZ/kdtJBig8nQtNN5QtokssnypsGmiXh t4NfEhmSmim43xkwt+7jwzUsyYxuzKtbYpyeke+Y5gPYUMAMxZC9MmeDURA7qwogqtzh imu2Pr2oJbVoBDGZ8T75ZYIf/IExB5lQxKp5QUsGQTYpNix1aCncENQfWwrsmEv18btY 7ovsZXSZXZIJ0460nXnRO5KTqSekRYL6XAVjZDemwvOYPHC3ERp8zbyBSJdtPDQVpHrX vO1g== 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 t64si2428324qkc.346.2018.02.20.09.08.48; Tue, 20 Feb 2018 09:08:48 -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 EA8F361724; Tue, 20 Feb 2018 17:08:47 +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 303AF60ABA; Tue, 20 Feb 2018 17:03:21 +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 C30DC6174A; Tue, 20 Feb 2018 17:03:11 +0000 (UTC) Received: from forward101o.mail.yandex.net (forward101o.mail.yandex.net [37.140.190.181]) by lists.linaro.org (Postfix) with ESMTPS id 6F8E8608EF for ; Tue, 20 Feb 2018 17:00:33 +0000 (UTC) Received: from mxback6o.mail.yandex.net (mxback6o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::20]) by forward101o.mail.yandex.net (Yandex) with ESMTP id 63D4613424A0 for ; Tue, 20 Feb 2018 20:00:32 +0300 (MSK) Received: from smtp4p.mail.yandex.net (smtp4p.mail.yandex.net [2a02:6b8:0:1402::15:6]) by mxback6o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id dtbBWFqTGB-0WteUsEM; Tue, 20 Feb 2018 20:00:32 +0300 Received: by smtp4p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id d7rw0280Nt-0WTWIm9E; Tue, 20 Feb 2018 20:00:32 +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 20:00:25 +0300 Message-Id: <1519146027-3446-6-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519146027-3446-1-git-send-email-odpbot@yandex.ru> References: <1519146027-3446-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 467 Subject: [lng-odp] [PATCH v4 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: 911ad4bd1709c0e28617d1e82038172c21039039 **/ .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 17:00:26 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: 128933 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp4857198ljc; Tue, 20 Feb 2018 09:08:01 -0800 (PST) X-Google-Smtp-Source: AH8x227yRS65NOViGC0nBC+N3kgOq5o2r7amC7tvbsfsfPcLvAu2C4a/jhEJ1tN+Y8GZOq5a3gGS X-Received: by 10.237.48.103 with SMTP id 94mr522757qte.48.1519146481151; Tue, 20 Feb 2018 09:08:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519146481; cv=none; d=google.com; s=arc-20160816; b=JjldDLHuIpYGO4HdeMK2yKZy3GghSUjr+UEfsnWO/n8jQUuVr+6N9I2eVP2X9Yqh69 r4Gg2RUFw6bUazCxmg2DauYfVyVx7hVXPudaM06d40b4B9UTgxHaUUQ89wG7zdKU09xw nQVDNBB8J7XJoaRdvqlzB9W9omWn6x6rsTviVhGXGqfA0bCtW/ejmgezzplTfFNaykyY BfF4EemUywsJSSsyN4yJCvJoS/vL7fjdDazCXrzNgKPZpVUz/T6leu+VUHDqrTpPPtja u+gS+/LQzFYPnhteCkhX7tS/MfzxXJBv84PCCSUQlZS5jwVk1G3iuLK8aOR+l8aO2hyU wkpw== 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=BPSXCleNb0QJX+glDcajz2oIHhHiJ/728Gtaz3FYkwA=; b=j2gE/TAIQov5IPamc9PHryKSSDO85+7PGnC5gfTJVDxnf2byLnYQiXb0fZbCHDAlwJ Vr5O1NSrbtiRSf3Hdu6f6aV4hTtV82xUcCQHKeyss8H2K1vQWTgt6BRggXrj4lHxBmNl Ckdxn9ROM5HqjVItE1VyjTGAUd7GP86VLXS0VeFc0AqOxn1D2FeqhUbwRFVkfDEnessG mI4zpqHKCJr9sz8knoAA6ygnnontdzktXDEub2VA3PjMtIq8YmHXiWQK2YiQSKcCP3N/ bxgn/JXMAVEm1U3DHR/HIgFiIh2q2pvCIT5gpte2Ry/dF3NWSvCYmzB0vgpPvZz75mpx ZTZw== 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 j62si199264qkc.241.2018.02.20.09.08.00; Tue, 20 Feb 2018 09:08: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 CAAC961702; Tue, 20 Feb 2018 17:08:00 +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 D209960C48; Tue, 20 Feb 2018 17:03:17 +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 97D3B61753; Tue, 20 Feb 2018 17:03:11 +0000 (UTC) Received: from forward105j.mail.yandex.net (forward105j.mail.yandex.net [5.45.198.248]) by lists.linaro.org (Postfix) with ESMTPS id F08F960C48 for ; Tue, 20 Feb 2018 17:00:33 +0000 (UTC) Received: from mxback16j.mail.yandex.net (mxback16j.mail.yandex.net [IPv6:2a02:6b8:0:1619::92]) by forward105j.mail.yandex.net (Yandex) with ESMTP id E5CE7184D75 for ; Tue, 20 Feb 2018 20:00:32 +0300 (MSK) Received: from smtp4p.mail.yandex.net (smtp4p.mail.yandex.net [2a02:6b8:0:1402::15:6]) by mxback16j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id KdDq824Emg-0WpC5B22; Tue, 20 Feb 2018 20:00:32 +0300 Received: by smtp4p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id d7rw0280Nt-0WTGaGWZ; Tue, 20 Feb 2018 20:00:32 +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 20:00:26 +0300 Message-Id: <1519146027-3446-7-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519146027-3446-1-git-send-email-odpbot@yandex.ru> References: <1519146027-3446-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 467 Subject: [lng-odp] [PATCH v4 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: 911ad4bd1709c0e28617d1e82038172c21039039 **/ 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 17:00:27 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: 128935 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp4858795ljc; Tue, 20 Feb 2018 09:09:30 -0800 (PST) X-Google-Smtp-Source: AG47ELueRxO0FSmo9gPdLl3wMXowdu2TVJo3BBWLyhezkqKqQgfcD04uxELtydpdF3vgqO6HHdKg X-Received: by 10.55.214.138 with SMTP id p10mr377555qkl.188.1519146570073; Tue, 20 Feb 2018 09:09:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519146570; cv=none; d=google.com; s=arc-20160816; b=qek60N5dPzuIvxFff/vwcYv2wjQBnzBr+v5qMfgtzepViEt2NYyCtHDbsy3G8B/NY1 iuYUGVcz85GUds9NWzg6KPLqo1naOh3Xsk2OAJzXMz3NuEL621O631k/xU9OMDik+4Mb 1cCzRnB1X5Hvy4ZE1D4fpaNxQaFb/aOpsMkh6TiqDJDQkbuuKjMLd6Y6/oPeQM+8kVDy l/C2NCC7o4M1/Ev/eSEMM5U5T6Dvgk4i33NGvAII0ujKrfiQUA61HWq37nocpWSzbzVH yLlWqJfZC/nvIx/txdDrVNbCGLLDsAL01gP0MKhxsb47Jt3ftVO9YPBKGlJer9SthnbY E37w== 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=P6Y+gybNOqGeD6N+SE2VoNVDM1RaKCZNkhuINJA5GJI=; b=MGvUwilopTt8ApYHZuYVzMywotxeb6ekS2aUToS+3ivClhvIl0kyNPzLJG6NL9ZsRW CCvnAH0Rayvb4Xx/WzsuVs/1UXVRsF02VWryHFn45CG+1uj5gOvqMLAljHc5QCsGyRVl +GHn8vDvaoUn+8BoYbpAQPmSFxw6N99uDFxw3ztH0pY1HIuoL4DTeUUIt2IWewTwX7tC /9dcoDQrKWzyrSvbYOYv8rUoETEzzkctmqOSIMSb5qG0Im4Xn0vzH24aVNMCIhy3iRQM Mj1FsQZ62FlB/mim0RRIpRlx/Adgxzs+ZGU2TeUQZ9ORTgrn9zx4EQJk2Ui+PKUlsrB/ Oz4Q== 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 p5si4903908qkf.339.2018.02.20.09.09.28; Tue, 20 Feb 2018 09:09: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 C0F5061520; Tue, 20 Feb 2018 17:09: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 7EEEB614E3; Tue, 20 Feb 2018 17:03:24 +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 2AB7760C48; Tue, 20 Feb 2018 17:03:13 +0000 (UTC) Received: from forward101j.mail.yandex.net (forward101j.mail.yandex.net [5.45.198.241]) by lists.linaro.org (Postfix) with ESMTPS id DDB616095E for ; Tue, 20 Feb 2018 17:00:34 +0000 (UTC) Received: from mxback5g.mail.yandex.net (mxback5g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:166]) by forward101j.mail.yandex.net (Yandex) with ESMTP id 562E6124276F for ; Tue, 20 Feb 2018 20:00:33 +0300 (MSK) Received: from smtp4p.mail.yandex.net (smtp4p.mail.yandex.net [2a02:6b8:0:1402::15:6]) by mxback5g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id CjMElPH4XJ-0XQWBEfD; Tue, 20 Feb 2018 20:00:33 +0300 Received: by smtp4p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id d7rw0280Nt-0WTeLVu3; Tue, 20 Feb 2018 20:00:32 +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 20:00:27 +0300 Message-Id: <1519146027-3446-8-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519146027-3446-1-git-send-email-odpbot@yandex.ru> References: <1519146027-3446-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 467 Subject: [lng-odp] [PATCH v4 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: 911ad4bd1709c0e28617d1e82038172c21039039 **/ .shippable.yml | 12 ++++++++---- scripts/shippable-post.sh | 8 +++++++- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/.shippable.yml b/.shippable.yml index 6b2a73c3f..c01e3608e 100644 --- a/.shippable.yml +++ b/.shippable.yml @@ -41,10 +41,14 @@ build: - if [ "${CC#clang}" != "${CC}" ] ; then export CXX="${CC/clang/clang++}"; fi - ./configure $CONF - make -j $(nproc) - - sudo env ODP_SHM_DIR=/dev/shm/odp ODP_TEST_OUT_XML=yes make check -k - - on_success: - - ./scripts/shippable-post.sh + - sudo env ODP_SHM_DIR=/dev/shm/odp ODP_TEST_OUT_XML=yes ODP_SCHEDULER=basic make check + - ./scripts/shippable-post.sh basic + - sudo env ODP_SHM_DIR=/dev/shm/odp ODP_TEST_OUT_XML=yes ODP_SCHEDULER=sp make check + - ./scripts/shippable-post.sh sp + - sudo env ODP_SHM_DIR=/dev/shm/odp ODP_TEST_OUT_XML=yes ODP_SCHEDULER=iquery make check + - ./scripts/shippable-post.sh iquery + - sudo env ODP_SHM_DIR=/dev/shm/odp ODP_TEST_OUT_XML=yes ODP_SCHEDULER=scalable make check + - ./scripts/shippable-post.sh scalable on_failure: - ./scripts/shippable-post.sh diff --git a/scripts/shippable-post.sh b/scripts/shippable-post.sh index ed5a44168..9d59da3f8 100755 --- a/scripts/shippable-post.sh +++ b/scripts/shippable-post.sh @@ -2,8 +2,14 @@ wget https://raw.githubusercontent.com/shawnliang/cunit-to-junit/master/cunit-to-junit.xsl +mkdir -p "$SHIPPABLE_BUILD_DIR/shippable/testresults" + +SCHED=${1:-default} +echo $SCHED + for FILE in `find ./test ./platform/ -name "*.xml"`; do bname="`basename $FILE`"; + echo Processing $FILE as ${SCHED}-${bname} xsltproc --novalid cunit-to-junit.xsl "$FILE" > \ - "$SHIPPABLE_BUILD_DIR/shippable/testresults/${bname}" + "$SHIPPABLE_BUILD_DIR/shippable/testresults/${SCHED}-${bname}" done