From patchwork Thu Oct 5 09:00:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 114854 Delivered-To: patch@linaro.org Received: by 10.80.163.170 with SMTP id s39csp8217edb; Thu, 5 Oct 2017 02:09:09 -0700 (PDT) X-Google-Smtp-Source: AOwi7QAlWeFYxu6ztZeWXH1nxg0tjwBpxv3bPjt5d6mVDNKLngcDR9qdmrORW5D5fdbdDgQoAYND X-Received: by 10.200.57.164 with SMTP id v33mr3128088qte.204.1507194549815; Thu, 05 Oct 2017 02:09:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507194549; cv=none; d=google.com; s=arc-20160816; b=ImNyCx4sjKU/ZcAHwQkFvJtEasqj5EYoFI14MWVaVGxT3fxwp72IyCX/th7BzEcHij tBZeAbxbIQj/nsw7/D3fzLK5m+dxnCmMXuKpIrJKqVWHkSLuon5AgmCRfGtASXU0idUj Bl/41UJ6syg5zB3OAgwQrhe4IvP0Gq00VvMZ7HCDDcn9Ayp7U+h9dVVz4DDSn66JHwKz jPW30jTSkZXz6N4OC5RNB+YwCRBiScwyDMioQTMMHqzwgRPsBgPFCUpQWmDrjCCCPaWI yVIcUVmkN7LkAxMcvsJLRpVmHjt6rQ1eBFIKbgVTpuuHeK3VgD4/gRqNrYdbbKKErOH9 olmg== 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=lstHbg7hoQMbDoYcBhC8HoniXCWRkxfAEzGimYWpdLc=; b=F/YERMpjUmoP0WiSCuo5u1u1bI2BaYkz+l8vsIPGJEmdmidTb69iSprQsPqyVM3aR3 8b79viV4BGbWxiSeSn06j9fjt+Yd5RV7FrhjazT24GKrwVwhqq0Qvntjya3jxnHQegSe q1ZaI9E3sHVUQiZkVpesfB+k4ZGSOA15jJ2N50H9gYlTGFnBx6GDdI3w8bu7Bno9Ug5a g9MJdxECIqomWa657BO7kb6vsEIR6kuHYzduEtBmdmh6bG6q6KviCcSH42cKH+6DsF49 BNW1gPLlIINIIZa7PrYnMVWU8f6rNjeY9Ps3ypOuMksA1uXsO3BfU9nl5zZnVi9tDcZu DBOA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 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 (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id k44si1898301qtc.351.2017.10.05.02.09.09; Thu, 05 Oct 2017 02:09:09 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 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 73245644A3; Thu, 5 Oct 2017 09:09: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=-5.4 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, URIBL_BLOCKED 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 DE946644CA; Thu, 5 Oct 2017 09:02:46 +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 E7E8B644C9; Thu, 5 Oct 2017 09:02:36 +0000 (UTC) Received: from forward101p.mail.yandex.net (forward101p.mail.yandex.net [77.88.28.101]) by lists.linaro.org (Postfix) with ESMTPS id 4ED256449D for ; Thu, 5 Oct 2017 09:00:34 +0000 (UTC) Received: from mxback18j.mail.yandex.net (mxback18j.mail.yandex.net [IPv6:2a02:6b8:0:1619::94]) by forward101p.mail.yandex.net (Yandex) with ESMTP id E227F6A8655E for ; Thu, 5 Oct 2017 12:00:32 +0300 (MSK) Received: from smtp1o.mail.yandex.net (smtp1o.mail.yandex.net [2a02:6b8:0:1a2d::25]) by mxback18j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id mAmyG8H3YF-0Qa0RMab; Thu, 05 Oct 2017 12:00:26 +0300 Received: by smtp1o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id crpg26GhCG-0QautOnc; Thu, 05 Oct 2017 12:00:26 +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: Thu, 5 Oct 2017 12:00:04 +0300 Message-Id: <1507194018-5453-7-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507194018-5453-1-git-send-email-odpbot@yandex.ru> References: <1507194018-5453-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 213 Subject: [lng-odp] [PATCH v1 6/20] example: switch odp_l3fwd from test_debug.h to example_debug.h 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 213 (lumag:plat-def) ** https://github.com/Linaro/odp/pull/213 ** Patch: https://github.com/Linaro/odp/pull/213.patch ** Base sha: 52cfe7ba6d2541cf5ee464e46e91b2da5efe1497 ** Merge commit sha: 62f1037bdb0ffd5482e47209bfdbf7d820204116 **/ example/l3fwd/Makefile.am | 2 +- example/l3fwd/odp_l3fwd.c | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/example/l3fwd/Makefile.am b/example/l3fwd/Makefile.am index 422a3bf3a..21d0cf1a3 100644 --- a/example/l3fwd/Makefile.am +++ b/example/l3fwd/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/example/Makefile.inc bin_PROGRAMS = odp_l3fwd$(EXEEXT) odp_l3fwd_LDFLAGS = $(AM_LDFLAGS) -static -odp_l3fwd_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/example -I${top_srcdir}/test +odp_l3fwd_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/example noinst_HEADERS = \ $(top_srcdir)/example/l3fwd/odp_l3fwd_db.h \ diff --git a/example/l3fwd/odp_l3fwd.c b/example/l3fwd/odp_l3fwd.c index f579d36d3..e6d8b2883 100644 --- a/example/l3fwd/odp_l3fwd.c +++ b/example/l3fwd/odp_l3fwd.c @@ -11,7 +11,7 @@ #include #include -#include +#include #include #include @@ -313,7 +313,7 @@ static int run_worker(void *arg) } if (num_pktio == 0) - LOG_ABORT("No pktio devices found\n"); + EXAMPLE_ABORT("No pktio devices found\n"); if_idx = input_ifs[pktio]; inq = input_queues[pktio]; @@ -740,26 +740,26 @@ static void setup_worker_qconf(app_args_t *args) q = &args->qconf_config[i]; if (q->core_idx >= nb_worker || q->if_idx >= if_count) - LOG_ABORT("Error queue (%d, %d, %d), max port: " + EXAMPLE_ABORT("Error queue (%d, %d, %d), max port: " "%d, max core: %d\n", q->if_idx, q->rxq_idx, q->core_idx, args->if_count - 1, args->worker_count - 1); /* check if one queue is configured twice or more */ if (queue_mask[q->if_idx][q->rxq_idx]) - LOG_ABORT("Error queue (%d, %d, %d), reconfig queue\n", + EXAMPLE_ABORT("Error queue (%d, %d, %d), reconfig queue\n", q->if_idx, q->rxq_idx, q->core_idx); queue_mask[q->if_idx][q->rxq_idx] = 1; port = &global.l3fwd_pktios[q->if_idx]; if (port->rxq_idx < q->rxq_idx) - LOG_ABORT("Error queue (%d, %d, %d), queue should be" + EXAMPLE_ABORT("Error queue (%d, %d, %d), queue should be" " in sequence and start from 0, queue %d\n", q->if_idx, q->rxq_idx, q->core_idx, q->rxq_idx); if (q->rxq_idx > port->nb_rxq) { - LOG_ABORT("Error queue (%d, %d, %d), max queue %d\n", + EXAMPLE_ABORT("Error queue (%d, %d, %d), max queue %d\n", q->if_idx, q->rxq_idx, q->core_idx, port->nb_rxq - 1); } @@ -822,7 +822,7 @@ static void setup_worker_qconf(app_args_t *args) } if (odp_pktin_queue_config(port->pktio, &in_queue_param)) - LOG_ABORT("Fail to config input queue for port %s\n", + EXAMPLE_ABORT("Fail to config input queue for port %s\n", name); out_queue_param.num_queues = port->txq_idx; @@ -831,19 +831,19 @@ static void setup_worker_qconf(app_args_t *args) out_queue_param.op_mode = ODP_PKTIO_OP_MT; } if (odp_pktout_queue_config(port->pktio, &out_queue_param)) - LOG_ABORT("Fail to config output queue for port %s\n", + EXAMPLE_ABORT("Fail to config output queue for port %s\n", name); inq = port->ifin; nb_rxq = in_queue_param.num_queues; if (odp_pktin_queue(port->pktio, inq, nb_rxq) != nb_rxq) - LOG_ABORT("Fail to set pktin queue for port %s\n", + EXAMPLE_ABORT("Fail to set pktin queue for port %s\n", name); outq = port->ifout; nb_txq = out_queue_param.num_queues; if (odp_pktout_queue(port->pktio, outq, nb_txq) != nb_txq) - LOG_ABORT("Fail to set pktout queue for port %s\n", + EXAMPLE_ABORT("Fail to set pktout queue for port %s\n", name); } }