[v4,6/20] example: switch odp_l3fwd from test_debug.h to example_debug.h

Message ID 1507316415-2144-7-git-send-email-odpbot@yandex.ru
State New
Headers show
Series
  • Another build system update
Related show

Commit Message

Github ODP bot Oct. 6, 2017, 7 p.m.
From: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov@linaro.org>


Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov@linaro.org>

---
/** 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(-)

Patch

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 <unistd.h>
 #include <inttypes.h>
 
-#include <test_debug.h>
+#include <example_debug.h>
 
 #include <odp_api.h>
 #include <odp/helper/odph_api.h>
@@ -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);
 	}
 }