examples/ip_pipeline: remove config

[dpdk.git] / examples / ip_pipeline / thread.c

diff --git a/examples/ip_pipeline/thread.c b/examples/ip_pipeline/thread.c
index a0f1f12..a36bf92 100644 (file)
--- a/examples/ip_pipeline/thread.c
+++ b/examples/ip_pipeline/thread.c
@@ -1,81 +1,14 @@
-/*-
- *   BSD LICENSE
- *
- *   Copyright(c) 2010-2015 Intel Corporation. All rights reserved.
- *   All rights reserved.
- *
- *   Redistribution and use in source and binary forms, with or without
- *   modification, are permitted provided that the following conditions
- *   are met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in
- *       the documentation and/or other materials provided with the
- *       distribution.
- *     * Neither the name of Intel Corporation nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2010-2015 Intel Corporation
  */
 
 #include <rte_common.h>
 #include <rte_cycles.h>
 #include <rte_pipeline.h>
 
-#include "pipeline_common_be.h"
 #include "app.h"
 #include "thread.h"
 
-#if APP_THREAD_HEADROOM_STATS_COLLECT
-
-#define PIPELINE_RUN_REGULAR(thread, pipeline)         \
-do {                                                   \
-       uint64_t t0 = rte_rdtsc_precise();              \
-       int n_pkts = rte_pipeline_run(pipeline->p);     \
-                                                       \
-       if (n_pkts == 0) {                              \
-               uint64_t t1 = rte_rdtsc_precise();      \
-                                                       \
-               thread->headroom_cycles += t1 - t0;     \
-       }                                               \
-} while (0)
-
-
-#define PIPELINE_RUN_CUSTOM(thread, data)              \
-do {                                                   \
-       uint64_t t0 = rte_rdtsc_precise();              \
-       int n_pkts = data->f_run(data->be);             \
-                                                       \
-       if (n_pkts == 0) {                              \
-               uint64_t t1 = rte_rdtsc_precise();      \
-                                                       \
-               thread->headroom_cycles += t1 - t0;     \
-       }                                               \
-} while (0)
-
-#else
-
-#define PIPELINE_RUN_REGULAR(thread, pipeline)         \
-       rte_pipeline_run(pipeline->p)
-
-#define PIPELINE_RUN_CUSTOM(thread, data)              \
-       data->f_run(data->be)
-
-#endif
-
 static inline void *
 thread_msg_recv(struct rte_ring *r)
 {
@@ -243,21 +176,6 @@ app_thread(void *arg)
                uint32_t n_regular = RTE_MIN(t->n_regular, RTE_DIM(t->regular));
                uint32_t n_custom = RTE_MIN(t->n_custom, RTE_DIM(t->custom));
 
-               /* Run regular pipelines */
-               for (j = 0; j < n_regular; j++) {
-                       struct app_thread_pipeline_data *data = &t->regular[j];
-                       struct pipeline *p = data->be;
-
-                       PIPELINE_RUN_REGULAR(t, p);
-               }
-
-               /* Run custom pipelines */
-               for (j = 0; j < n_custom; j++) {
-                       struct app_thread_pipeline_data *data = &t->custom[j];
-
-                       PIPELINE_RUN_CUSTOM(t, data);
-               }
-
                /* Timer */
                if ((i & 0xF) == 0) {
                        uint64_t time = rte_get_tsc_cycles();