From patchwork Fri Oct 6 19:00:01 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: 115117 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp2131507qgn; Fri, 6 Oct 2017 12:06:58 -0700 (PDT) X-Google-Smtp-Source: AOwi7QA5M01SbYccgnpZG+9vDt5sph5Xx+RWdiO4cYUkMOTVM+KRxfHqVY9Gzkx0uPKUkqLvvuuC X-Received: by 10.200.40.117 with SMTP id 50mr4528091qtr.167.1507316818120; Fri, 06 Oct 2017 12:06:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507316818; cv=none; d=google.com; s=arc-20160816; b=EuX5L+1CYEHVVg+dslKsP4eXeSYgdYraCfo6kJU67VuTE6t7Doe0sZ7r7eKMCO6+ku S3VQezW+oMtuh+zl37cXvxw4uQgSAXw+EAnnxzn37mDWrIUeFDSDJBR0y0tyi9ECg0Fr Sdm9POkuHyRT04aSXtvC42k7ZG/zn+LZWTkrdeIc80WuWwJxeWadXh6E8u2S5HlHXAaB QIFgEvkE1b7prqh8vvd1DSjaR/kzpe32opFTTawqiVXUiL/xMxKfb7WCNgxRuVQ+9+34 HLmb5FaFATuDXRQQs4kY2Bi1brqRqHdZumzkXwO4WFV41JL9GXCC6k/Yfvw2Nd+zBk8U fVBg== 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=AauB6/SUUBEBfifC6OesxBQCSY4EwjvBlmc898/SInM=; b=UpZ7A9rtrM7cELiYjcY1/yFL5LCS9X5dvZiXcCHW4NrHP/OCWhUQQxonIJBZgnRDSS wYDGYK84P96Pd4Hcki5iuPnAFSjM2FpXZG5L7nJ3Au+4Cp8W9A/O4+m1VZDNYnrXRb8j H+Ww8KuYSeDClPMOhqLF007xkYjrgjxL76EZPQOBpdI8Ms4/sohfpTl2+AudIj5yGHkU PQZ5FWd0RPlepHv3K3Uo77p35oABSFy+ejDw0n5mkOyeTXUUaq1OI9SOJHILHi6WYEJp OZPQcvhFleVMNbtjMhRfck7SIWxG9z9iw82MoCbSbOgqCa0LvV7ud+iX1g8nqCbQ/Dv5 qGcg== 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 y25si379019qtb.300.2017.10.06.12.06.57; Fri, 06 Oct 2017 12:06:58 -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 C684360765; Fri, 6 Oct 2017 19:06:57 +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 57952608E4; Fri, 6 Oct 2017 19: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 4624260845; Fri, 6 Oct 2017 19:02:05 +0000 (UTC) Received: from forward100p.mail.yandex.net (forward100p.mail.yandex.net [77.88.28.100]) by lists.linaro.org (Postfix) with ESMTPS id 64E8C65BC9 for ; Fri, 6 Oct 2017 19:00:37 +0000 (UTC) Received: from mxback6o.mail.yandex.net (mxback6o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::20]) by forward100p.mail.yandex.net (Yandex) with ESMTP id 63CD3510320B for ; Fri, 6 Oct 2017 22:00:36 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback6o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id xA0XKIZkjm-0axaFTSh; Fri, 06 Oct 2017 22:00:36 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id d2nf8B3eVo-0ZtS5XBx; Fri, 06 Oct 2017 22:00:35 +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: Fri, 6 Oct 2017 22:00:01 +0300 Message-Id: <1507316415-2144-7-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507316415-2144-1-git-send-email-odpbot@yandex.ru> References: <1507316415-2144-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 213 Subject: [lng-odp] [PATCH v4 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: a63f25ff2994b2df78c24f1f8b63d0e06628eb68 ** Merge commit sha: d50e2e291ff11c1319e66c699d2f82260d59c383 **/ 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); } }