Message ID | 20170123194608.4552-4-mike.holmes@linaro.org |
---|---|
State | New |
Headers | show |
Series | introduce odph_api.h and clean up public helper API | expand |
diff --git a/test/common_plat/common/odp_cunit_common.c b/test/common_plat/common/odp_cunit_common.c index 6d18fa0..d3328af 100644 --- a/test/common_plat/common/odp_cunit_common.c +++ b/test/common_plat/common/odp_cunit_common.c @@ -7,7 +7,7 @@ #include <string.h> #include <odp_api.h> #include <odp_cunit_common.h> -#include <odp/helper/threads.h> +#include <odp/helper/odph_api.h> /* Globals */ static odph_odpthread_t thread_tbl[MAX_WORKERS]; static odp_instance_t instance; diff --git a/test/common_plat/performance/odp_crypto.c b/test/common_plat/performance/odp_crypto.c index bff20e5..954bdb7 100644 --- a/test/common_plat/performance/odp_crypto.c +++ b/test/common_plat/performance/odp_crypto.c @@ -17,7 +17,7 @@ #include <sys/resource.h> #include <odp_api.h> -#include <odp/helper/threads.h> +#include <odp/helper/odph_api.h> #define app_err(fmt, ...) \ fprintf(stderr, "%s:%d:%s(): Error: " fmt, __FILE__, \ diff --git a/test/common_plat/performance/odp_l2fwd.c b/test/common_plat/performance/odp_l2fwd.c index fa59d5e..54dc4cf 100644 --- a/test/common_plat/performance/odp_l2fwd.c +++ b/test/common_plat/performance/odp_l2fwd.c @@ -25,9 +25,7 @@ #include <test_debug.h> #include <odp_api.h> -#include <odp/helper/threads.h> -#include <odp/helper/eth.h> -#include <odp/helper/ip.h> +#include <odp/helper/odph_api.h> /** @def MAX_WORKERS * @brief Maximum number of worker threads diff --git a/test/common_plat/performance/odp_pktio_perf.c b/test/common_plat/performance/odp_pktio_perf.c index ee3b8ab..0946308 100644 --- a/test/common_plat/performance/odp_pktio_perf.c +++ b/test/common_plat/performance/odp_pktio_perf.c @@ -22,10 +22,7 @@ */ #include <odp_api.h> -#include <odp/helper/eth.h> -#include <odp/helper/ip.h> -#include <odp/helper/udp.h> -#include <odp/helper/threads.h> +#include <odp/helper/odph_api.h> #include <getopt.h> #include <stdlib.h> diff --git a/test/common_plat/performance/odp_sched_latency.c b/test/common_plat/performance/odp_sched_latency.c index 2066f91..2b28cd7 100644 --- a/test/common_plat/performance/odp_sched_latency.c +++ b/test/common_plat/performance/odp_sched_latency.c @@ -20,7 +20,7 @@ #include <odp_api.h> /* ODP helper for Linux apps */ -#include <odp/helper/threads.h> +#include <odp/helper/odph_api.h> /* GNU lib C */ #include <getopt.h> diff --git a/test/common_plat/performance/odp_scheduling.c b/test/common_plat/performance/odp_scheduling.c index 713dba1..c74a071 100644 --- a/test/common_plat/performance/odp_scheduling.c +++ b/test/common_plat/performance/odp_scheduling.c @@ -20,7 +20,7 @@ #include <odp_api.h> /* ODP helper for Linux apps */ -#include <odp/helper/threads.h> +#include <odp/helper/odph_api.h> /* Needs librt*/ #include <time.h> diff --git a/test/common_plat/validation/api/classification/odp_classification_common.c b/test/common_plat/validation/api/classification/odp_classification_common.c index 2923a71..f7ec6e5 100644 --- a/test/common_plat/validation/api/classification/odp_classification_common.c +++ b/test/common_plat/validation/api/classification/odp_classification_common.c @@ -7,10 +7,6 @@ #include "odp_classification_testsuites.h" #include "classification.h" #include <odp_cunit_common.h> -#include <odp/helper/eth.h> -#include <odp/helper/ip.h> -#include <odp/helper/udp.h> -#include <odp/helper/tcp.h> #include "test_debug.h" typedef struct cls_test_packet { diff --git a/test/common_plat/validation/api/classification/odp_classification_test_pmr.c b/test/common_plat/validation/api/classification/odp_classification_test_pmr.c index 88fbf8f..a54954e 100644 --- a/test/common_plat/validation/api/classification/odp_classification_test_pmr.c +++ b/test/common_plat/validation/api/classification/odp_classification_test_pmr.c @@ -7,10 +7,6 @@ #include "odp_classification_testsuites.h" #include "classification.h" #include <odp_cunit_common.h> -#include <odp/helper/eth.h> -#include <odp/helper/ip.h> -#include <odp/helper/udp.h> -#include <odp/helper/tcp.h> static odp_pool_t pkt_pool; diff --git a/test/common_plat/validation/api/classification/odp_classification_tests.c b/test/common_plat/validation/api/classification/odp_classification_tests.c index ed45518..4f1aecd 100644 --- a/test/common_plat/validation/api/classification/odp_classification_tests.c +++ b/test/common_plat/validation/api/classification/odp_classification_tests.c @@ -7,10 +7,6 @@ #include "odp_classification_testsuites.h" #include "classification.h" #include <odp_cunit_common.h> -#include <odp/helper/eth.h> -#include <odp/helper/ip.h> -#include <odp/helper/udp.h> -#include <odp/helper/tcp.h> static odp_cos_t cos_list[CLS_ENTRIES]; static odp_pmr_t pmr_list[CLS_ENTRIES]; diff --git a/test/common_plat/validation/api/classification/odp_classification_testsuites.h b/test/common_plat/validation/api/classification/odp_classification_testsuites.h index aea3de1..f9fd908 100644 --- a/test/common_plat/validation/api/classification/odp_classification_testsuites.h +++ b/test/common_plat/validation/api/classification/odp_classification_testsuites.h @@ -8,6 +8,7 @@ #define ODP_CLASSIFICATION_TESTSUITES_H_ #include <odp_api.h> +#include <odp/helper/odph_api.h> #include <odp_cunit_common.h> #include <stdbool.h> diff --git a/test/common_plat/validation/api/pktio/pktio.c b/test/common_plat/validation/api/pktio/pktio.c index c23e2cc..4f3c0c0 100644 --- a/test/common_plat/validation/api/pktio/pktio.c +++ b/test/common_plat/validation/api/pktio/pktio.c @@ -6,9 +6,7 @@ #include <odp_api.h> #include <odp_cunit_common.h> -#include <odp/helper/eth.h> -#include <odp/helper/ip.h> -#include <odp/helper/udp.h> +#include <odp/helper/odph_api.h> #include <stdlib.h> #include "pktio.h" diff --git a/test/common_plat/validation/api/timer/timer.c b/test/common_plat/validation/api/timer/timer.c index 304b1d5..b7d84c6 100644 --- a/test/common_plat/validation/api/timer/timer.c +++ b/test/common_plat/validation/api/timer/timer.c @@ -15,7 +15,7 @@ #include <time.h> #include <odp.h> -#include <odp/helper/threads.h> +#include <odp/helper/odph_api.h> #include "odp_cunit_common.h" #include "test_debug.h" #include "timer.h" diff --git a/test/common_plat/validation/api/traffic_mngr/traffic_mngr.c b/test/common_plat/validation/api/traffic_mngr/traffic_mngr.c index 0271758..88a7d8c 100644 --- a/test/common_plat/validation/api/traffic_mngr/traffic_mngr.c +++ b/test/common_plat/validation/api/traffic_mngr/traffic_mngr.c @@ -12,11 +12,7 @@ #include <unistd.h> #include <math.h> #include <odp.h> -#include <odp/helper/eth.h> -#include <odp/helper/ip.h> -#include <odp/helper/udp.h> -#include <odp/helper/tcp.h> -#include <odp/helper/chksum.h> +#include <odp/helper/odph_api.h> #include <test_debug.h> #include "odp_cunit_common.h" #include "traffic_mngr.h" diff --git a/test/linux-generic/mmap_vlan_ins/mmap_vlan_ins.c b/test/linux-generic/mmap_vlan_ins/mmap_vlan_ins.c index a12eb3c..bda810e 100644 --- a/test/linux-generic/mmap_vlan_ins/mmap_vlan_ins.c +++ b/test/linux-generic/mmap_vlan_ins/mmap_vlan_ins.c @@ -10,9 +10,7 @@ #include <signal.h> #include <odp_api.h> -#include <odp/helper/threads.h> -#include <odp/helper/eth.h> -#include <odp/helper/ip.h> +#include <odp/helper/odph_api.h> #define POOL_NUM_PKT 8192 #define POOL_SEG_LEN 1856 diff --git a/test/linux-generic/pktio_ipc/ipc_common.h b/test/linux-generic/pktio_ipc/ipc_common.h index d2a355d..6245577 100644 --- a/test/linux-generic/pktio_ipc/ipc_common.h +++ b/test/linux-generic/pktio_ipc/ipc_common.h @@ -17,10 +17,7 @@ #include <example_debug.h> #include <odp.h> -#include <odp/helper/threads.h> -#include <odp/helper/eth.h> -#include <odp/helper/ip.h> -#include <odp/helper/udp.h> +#include <odp/helper/odph_api.h> /** @def SHM_PKT_POOL_SIZE * @brief Size of the shared memory block diff --git a/test/linux-generic/ring/ring_stress.c b/test/linux-generic/ring/ring_stress.c index 19bd65b..b6ddb34 100644 --- a/test/linux-generic/ring/ring_stress.c +++ b/test/linux-generic/ring/ring_stress.c @@ -18,7 +18,7 @@ #include <unistd.h> #include <odp_api.h> -#include <odp/helper/threads.h> +#include <odp/helper/odph_api.h> #include <odp_packet_io_ring_internal.h> #include <test_debug.h> #include <odp_cunit_common.h>
Clean up all the includes and replace them with odph_api.h Signed-off-by: Mike Holmes <mike.holmes@linaro.org> --- test/common_plat/common/odp_cunit_common.c | 2 +- test/common_plat/performance/odp_crypto.c | 2 +- test/common_plat/performance/odp_l2fwd.c | 4 +--- test/common_plat/performance/odp_pktio_perf.c | 5 +---- test/common_plat/performance/odp_sched_latency.c | 2 +- test/common_plat/performance/odp_scheduling.c | 2 +- .../validation/api/classification/odp_classification_common.c | 4 ---- .../validation/api/classification/odp_classification_test_pmr.c | 4 ---- .../validation/api/classification/odp_classification_tests.c | 4 ---- .../validation/api/classification/odp_classification_testsuites.h | 1 + test/common_plat/validation/api/pktio/pktio.c | 4 +--- test/common_plat/validation/api/timer/timer.c | 2 +- test/common_plat/validation/api/traffic_mngr/traffic_mngr.c | 6 +----- test/linux-generic/mmap_vlan_ins/mmap_vlan_ins.c | 4 +--- test/linux-generic/pktio_ipc/ipc_common.h | 5 +---- test/linux-generic/ring/ring_stress.c | 2 +- 16 files changed, 13 insertions(+), 40 deletions(-) -- 2.9.3