This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "".
The branch, master has been updated via f603483a31d03e5647c409f8ce71d72ebaadd93b (commit) via 29889bf258fc52ae7c950c11eb17503883cff47e (commit) via 88ed645e7378b955c580ec2b8ce9b846a5fb48f0 (commit) via 722fd6f8286722d30d50c00769fa4fcad5935dd2 (commit) from bbabb79cfaf5e28ec9e804b95a23605038b39d39 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit f603483a31d03e5647c409f8ce71d72ebaadd93b Author: Mike Holmes mike.holmes@linaro.org Date: Mon Jan 23 14:46:08 2017 -0500
examples: use odph_api.h
clean up all the examples and just use odph_api.h
Signed-off-by: Mike Holmes mike.holmes@linaro.org Reviewed-by: Christophe Milard christophe.milard@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/example/classifier/odp_classifier.c b/example/classifier/odp_classifier.c index c2f69d4..d67fe5a 100644 --- a/example/classifier/odp_classifier.c +++ b/example/classifier/odp_classifier.c @@ -12,9 +12,7 @@ #include <example_debug.h>
#include <odp_api.h> -#include <odp/helper/eth.h> -#include <odp/helper/ip.h> -#include <odp/helper/threads.h> +#include <odp/helper/odph_api.h> #include <strings.h> #include <errno.h> #include <stdio.h> diff --git a/example/generator/odp_generator.c b/example/generator/odp_generator.c index 194c0a0..6ac8f2d 100644 --- a/example/generator/odp_generator.c +++ b/example/generator/odp_generator.c @@ -20,11 +20,7 @@
#include <odp_api.h>
-#include <odp/helper/threads.h> -#include <odp/helper/eth.h> -#include <odp/helper/ip.h> -#include <odp/helper/udp.h> -#include <odp/helper/icmp.h> +#include <odp/helper/odph_api.h>
#define MAX_WORKERS 32 /**< max number of works */ #define SHM_PKT_POOL_SIZE (512*2048) /**< pkt pool size */ diff --git a/example/ipsec/odp_ipsec.c b/example/ipsec/odp_ipsec.c index d686160..9ed3aa2 100644 --- a/example/ipsec/odp_ipsec.c +++ b/example/ipsec/odp_ipsec.c @@ -24,11 +24,7 @@
#include <odp_api.h>
-#include <odp/helper/threads.h> -#include <odp/helper/eth.h> -#include <odp/helper/ip.h> -#include <odp/helper/icmp.h> -#include <odp/helper/ipsec.h> +#include <odp/helper/odph_api.h>
#include <stdbool.h> #include <sys/socket.h> diff --git a/example/ipsec/odp_ipsec_fwd_db.h b/example/ipsec/odp_ipsec_fwd_db.h index 748ae04..152bdfb 100644 --- a/example/ipsec/odp_ipsec_fwd_db.h +++ b/example/ipsec/odp_ipsec_fwd_db.h @@ -12,7 +12,6 @@ extern "C" { #endif
#include <odp_api.h> -#include <odp/helper/eth.h> #include <odp_ipsec_misc.h>
#define OIF_LEN 32 diff --git a/example/ipsec/odp_ipsec_loop_db.h b/example/ipsec/odp_ipsec_loop_db.h index 0778186..1f9ade6 100644 --- a/example/ipsec/odp_ipsec_loop_db.h +++ b/example/ipsec/odp_ipsec_loop_db.h @@ -12,7 +12,6 @@ extern "C" { #endif
#include <odp_api.h> -#include <odp/helper/eth.h> #include <odp_ipsec_misc.h>
/** diff --git a/example/ipsec/odp_ipsec_misc.h b/example/ipsec/odp_ipsec_misc.h index 6a49dcb..e0320eb 100644 --- a/example/ipsec/odp_ipsec_misc.h +++ b/example/ipsec/odp_ipsec_misc.h @@ -12,9 +12,7 @@ extern "C" { #endif
#include <odp_api.h> -#include <odp/helper/eth.h> -#include <odp/helper/ip.h> -#include <odp/helper/ipsec.h> +#include <odp/helper/odph_api.h>
#ifndef TRUE #define TRUE 1 diff --git a/example/ipsec/odp_ipsec_stream.c b/example/ipsec/odp_ipsec_stream.c index 4dc9acf..428ec04 100644 --- a/example/ipsec/odp_ipsec_stream.c +++ b/example/ipsec/odp_ipsec_stream.c @@ -21,9 +21,7 @@
#include <odp_api.h>
-#include <odp/helper/eth.h> -#include <odp/helper/ip.h> -#include <odp/helper/icmp.h> +#include <odp/helper/odph_api.h>
#include <odp_ipsec_stream.h> #include <odp_ipsec_loop_db.h> diff --git a/example/l2fwd_simple/odp_l2fwd_simple.c b/example/l2fwd_simple/odp_l2fwd_simple.c index 2473a11..b97808f 100644 --- a/example/l2fwd_simple/odp_l2fwd_simple.c +++ b/example/l2fwd_simple/odp_l2fwd_simple.c @@ -10,9 +10,7 @@ #include <signal.h>
#include <odp_api.h> -#include <odp/helper/eth.h> -#include <odp/helper/ip.h> -#include <odp/helper/threads.h> +#include <odp/helper/odph_api.h>
#define POOL_NUM_PKT 8192 #define POOL_SEG_LEN 1856 diff --git a/example/l3fwd/odp_l3fwd.c b/example/l3fwd/odp_l3fwd.c index 4e35b64..ba06972 100644 --- a/example/l3fwd/odp_l3fwd.c +++ b/example/l3fwd/odp_l3fwd.c @@ -14,11 +14,7 @@ #include <test_debug.h>
#include <odp_api.h> -#include <odp/helper/eth.h> -#include <odp/helper/ip.h> -#include <odp/helper/udp.h> -#include <odp/helper/tcp.h> -#include <odp/helper/threads.h> +#include <odp/helper/odph_api.h>
#include "odp_l3fwd_db.h" #include "odp_l3fwd_lpm.h" diff --git a/example/l3fwd/odp_l3fwd_db.h b/example/l3fwd/odp_l3fwd_db.h index 1b24f1a..8df2999 100644 --- a/example/l3fwd/odp_l3fwd_db.h +++ b/example/l3fwd/odp_l3fwd_db.h @@ -12,7 +12,7 @@ extern "C" { #endif
#include <odp_api.h> -#include <odp/helper/eth.h> +#include <odp/helper/odph_api.h>
#define OIF_LEN 32 #define MAX_DB 32 diff --git a/example/packet/odp_pktio.c b/example/packet/odp_pktio.c index 6e24deb..ea84282 100644 --- a/example/packet/odp_pktio.c +++ b/example/packet/odp_pktio.c @@ -13,9 +13,7 @@ #include <example_debug.h>
#include <odp_api.h> -#include <odp/helper/eth.h> -#include <odp/helper/ip.h> -#include <odp/helper/threads.h> +#include <odp/helper/odph_api.h>
/** @def MAX_WORKERS * @brief Maximum number of worker threads diff --git a/example/switch/odp_switch.c b/example/switch/odp_switch.c index 2bbce10..561c293 100644 --- a/example/switch/odp_switch.c +++ b/example/switch/odp_switch.c @@ -11,9 +11,7 @@ #include <inttypes.h>
#include <odp_api.h> -#include <odp/helper/eth.h> -#include <odp/helper/ip.h> -#include <odp/helper/threads.h> +#include <odp/helper/odph_api.h>
/** Maximum number of worker threads */ #define MAX_WORKERS 32 diff --git a/example/time/time_global_test.c b/example/time/time_global_test.c index dd33949..e24e9f4 100644 --- a/example/time/time_global_test.c +++ b/example/time/time_global_test.c @@ -8,7 +8,7 @@
#include <odp_api.h> #include <example_debug.h> -#include <odp/helper/threads.h> +#include <odp/helper/odph_api.h>
#define MAX_WORKERS 32 #define ITERATION_NUM 2048 diff --git a/example/timer/odp_timer_test.c b/example/timer/odp_timer_test.c index b847e2b..1088a74 100644 --- a/example/timer/odp_timer_test.c +++ b/example/timer/odp_timer_test.c @@ -14,7 +14,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>
commit 29889bf258fc52ae7c950c11eb17503883cff47e Author: Mike Holmes mike.holmes@linaro.org Date: Mon Jan 23 14:46:07 2017 -0500
test: use odph_api.h
Clean up all the includes and replace them with odph_api.h
Signed-off-by: Mike Holmes mike.holmes@linaro.org Reviewed-by: Christophe Milard christophe.milard@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
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>
commit 88ed645e7378b955c580ec2b8ce9b846a5fb48f0 Author: Mike Holmes mike.holmes@linaro.org Date: Mon Jan 23 14:46:06 2017 -0500
helper: use odph_api.h for test include for unexported files
Adding the previously missing table functions to the public helper api allows the tests to use just odph_api.h
Signed-off-by: Mike Holmes mike.holmes@linaro.org Reviewed-by: Christophe Milard christophe.milard@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/helper/Makefile.am b/helper/Makefile.am index 76cad1b..4d24a69 100644 --- a/helper/Makefile.am +++ b/helper/Makefile.am @@ -20,6 +20,10 @@ helperinclude_HEADERS = \ $(srcdir)/include/odp/helper/ip.h\ $(srcdir)/include/odp/helper/ipsec.h\ $(srcdir)/include/odp/helper/odph_api.h\ + $(srcdir)/include/odp/helper/odph_cuckootable.h\ + $(srcdir)/include/odp/helper/odph_hashtable.h\ + $(srcdir)/include/odp/helper/odph_iplookuptable.h\ + $(srcdir)/include/odp/helper/odph_lineartable.h\ $(srcdir)/include/odp/helper/strong_types.h\ $(srcdir)/include/odp/helper/tcp.h\ $(srcdir)/include/odp/helper/table.h\ @@ -33,11 +37,7 @@ endif
noinst_HEADERS = \ $(srcdir)/odph_debug.h \ - $(srcdir)/odph_hashtable.h \ - $(srcdir)/odph_lineartable.h \ - $(srcdir)/odph_cuckootable.h \ - $(srcdir)/odph_list_internal.h \ - $(srcdir)/odph_iplookuptable.h + $(srcdir)/odph_list_internal.h
__LIB__libodphelper_@with_platform@_la_SOURCES = \ eth.c \ diff --git a/helper/cuckootable.c b/helper/cuckootable.c index b4fce6c..83647ec 100644 --- a/helper/cuckootable.c +++ b/helper/cuckootable.c @@ -42,7 +42,7 @@ #include <errno.h> #include <stdio.h>
-#include "odph_cuckootable.h" +#include "odp/helper/odph_cuckootable.h" #include "odph_debug.h" #include <odp_api.h>
diff --git a/helper/hashtable.c b/helper/hashtable.c index 8bb1ae5..983b3da 100644 --- a/helper/hashtable.c +++ b/helper/hashtable.c @@ -7,7 +7,7 @@ #include <string.h> #include <malloc.h>
-#include "odph_hashtable.h" +#include "odp/helper/odph_hashtable.h" #include "odph_list_internal.h" #include "odph_debug.h" #include <odp_api.h> diff --git a/helper/include/odp/helper/odph_api.h b/helper/include/odp/helper/odph_api.h index ae6e77b..7ed0e77 100644 --- a/helper/include/odp/helper/odph_api.h +++ b/helper/include/odp/helper/odph_api.h @@ -19,10 +19,14 @@ extern "C" { #endif
#include <odp/helper/chksum.h> +#include <odp/helper/odph_cuckootable.h> #include <odp/helper/eth.h> +#include <odp/helper/odph_hashtable.h> #include <odp/helper/icmp.h> #include <odp/helper/ip.h> #include <odp/helper/ipsec.h> +#include <odp/helper/odph_lineartable.h> +#include <odp/helper/odph_iplookuptable.h> #include <odp/helper/strong_types.h> #include <odp/helper/tcp.h> #include <odp/helper/table.h> diff --git a/helper/odph_cuckootable.h b/helper/include/odp/helper/odph_cuckootable.h similarity index 100% rename from helper/odph_cuckootable.h rename to helper/include/odp/helper/odph_cuckootable.h diff --git a/helper/odph_hashtable.h b/helper/include/odp/helper/odph_hashtable.h similarity index 100% rename from helper/odph_hashtable.h rename to helper/include/odp/helper/odph_hashtable.h diff --git a/helper/odph_iplookuptable.h b/helper/include/odp/helper/odph_iplookuptable.h similarity index 100% rename from helper/odph_iplookuptable.h rename to helper/include/odp/helper/odph_iplookuptable.h diff --git a/helper/odph_lineartable.h b/helper/include/odp/helper/odph_lineartable.h similarity index 100% rename from helper/odph_lineartable.h rename to helper/include/odp/helper/odph_lineartable.h diff --git a/helper/iplookuptable.c b/helper/iplookuptable.c index 5f80743..f6d6f88 100644 --- a/helper/iplookuptable.c +++ b/helper/iplookuptable.c @@ -9,7 +9,7 @@ #include <errno.h> #include <stdio.h>
-#include "odph_iplookuptable.h" +#include <odp/helper/odph_iplookuptable.h> #include "odph_list_internal.h" #include "odph_debug.h" #include <odp_api.h> diff --git a/helper/lineartable.c b/helper/lineartable.c index e82c165..8917901 100644 --- a/helper/lineartable.c +++ b/helper/lineartable.c @@ -8,7 +8,7 @@ #include <string.h> #include <malloc.h>
-#include "odph_lineartable.h" +#include "odp/helper/odph_lineartable.h" #include "odph_debug.h" #include <odp_api.h>
diff --git a/helper/test/cuckootable.c b/helper/test/cuckootable.c index 6736f2b..002e52e 100644 --- a/helper/test/cuckootable.c +++ b/helper/test/cuckootable.c @@ -49,7 +49,7 @@
#include <odp_api.h> #include <odph_debug.h> -#include <../odph_cuckootable.h> +#include <odp/helper/odph_api.h>
/******************************************************************************* * Hash function performance test configuration section. diff --git a/helper/test/iplookuptable.c b/helper/test/iplookuptable.c index 86aa1b3..b5d774c 100644 --- a/helper/test/iplookuptable.c +++ b/helper/test/iplookuptable.c @@ -12,7 +12,7 @@
#include <odp_api.h> #include <odph_debug.h> -#include <../odph_iplookuptable.h> +#include <odp/helper/odph_api.h> #include <odp/helper/ip.h>
static void print_prefix_info( diff --git a/helper/test/table.c b/helper/test/table.c index 3b74b22..ac454da 100644 --- a/helper/test/table.c +++ b/helper/test/table.c @@ -5,8 +5,7 @@ */
#include <odph_debug.h> -#include <../odph_hashtable.h> -#include <../odph_lineartable.h> +#include <odp/helper/odph_api.h> #include <odp_api.h>
/**
commit 722fd6f8286722d30d50c00769fa4fcad5935dd2 Author: Mike Holmes mike.holmes@linaro.org Date: Mon Jan 23 14:46:05 2017 -0500
helper: add odph_api.h for existing exported headers
Rather than have all applications include a variable number of helper api files, consolidate them into one include odph_api.h
Signed-off-by: Mike Holmes mike.holmes@linaro.org Reviewed-by: Christophe Milard christophe.milard@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/helper/Makefile.am b/helper/Makefile.am index 9b2f18a..76cad1b 100644 --- a/helper/Makefile.am +++ b/helper/Makefile.am @@ -19,6 +19,7 @@ helperinclude_HEADERS = \ $(srcdir)/include/odp/helper/icmp.h\ $(srcdir)/include/odp/helper/ip.h\ $(srcdir)/include/odp/helper/ipsec.h\ + $(srcdir)/include/odp/helper/odph_api.h\ $(srcdir)/include/odp/helper/strong_types.h\ $(srcdir)/include/odp/helper/tcp.h\ $(srcdir)/include/odp/helper/table.h\ diff --git a/helper/include/odp/helper/odph_api.h b/helper/include/odp/helper/odph_api.h new file mode 100644 index 0000000..ae6e77b --- /dev/null +++ b/helper/include/odp/helper/odph_api.h @@ -0,0 +1,35 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/** + * @file + * + * The OpenDataPlane helper API + * + */ + +#ifndef ODP_HELPER_H_ +#define ODP_HELPER_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include <odp/helper/chksum.h> +#include <odp/helper/eth.h> +#include <odp/helper/icmp.h> +#include <odp/helper/ip.h> +#include <odp/helper/ipsec.h> +#include <odp/helper/strong_types.h> +#include <odp/helper/tcp.h> +#include <odp/helper/table.h> +#include <odp/helper/threads.h> +#include <odp/helper/udp.h> + +#ifdef __cplusplus +} +#endif +#endif diff --git a/helper/test/chksum.c b/helper/test/chksum.c index 7c572ae..1beae47 100644 --- a/helper/test/chksum.c +++ b/helper/test/chksum.c @@ -6,9 +6,7 @@
#include "odph_debug.h" #include <odp_api.h> -#include <odp/helper/eth.h> -#include <odp/helper/ip.h> -#include <odp/helper/udp.h> +#include <odp/helper/odph_api.h>
struct udata_struct { uint64_t u64; diff --git a/helper/test/odpthreads.c b/helper/test/odpthreads.c index 4bb3c3b..219e1b6 100644 --- a/helper/test/odpthreads.c +++ b/helper/test/odpthreads.c @@ -15,7 +15,7 @@
#include <odph_debug.h> #include <odp_api.h> -#include <odp/helper/threads.h> +#include <odp/helper/odph_api.h>
#define NUMBER_WORKERS 16
diff --git a/helper/test/parse.c b/helper/test/parse.c index 26dfc68..0429f2c 100644 --- a/helper/test/parse.c +++ b/helper/test/parse.c @@ -7,8 +7,7 @@ #include <odph_debug.h>
#include <odp_api.h> -#include <odp/helper/eth.h> -#include <odp/helper/ip.h> +#include <odp/helper/odph_api.h>
#include <stdio.h> #include <string.h>
-----------------------------------------------------------------------
Summary of changes: example/classifier/odp_classifier.c | 4 +-- example/generator/odp_generator.c | 6 +--- example/ipsec/odp_ipsec.c | 6 +--- example/ipsec/odp_ipsec_fwd_db.h | 1 - example/ipsec/odp_ipsec_loop_db.h | 1 - example/ipsec/odp_ipsec_misc.h | 4 +-- example/ipsec/odp_ipsec_stream.c | 4 +-- example/l2fwd_simple/odp_l2fwd_simple.c | 4 +-- example/l3fwd/odp_l3fwd.c | 6 +--- example/l3fwd/odp_l3fwd_db.h | 2 +- example/packet/odp_pktio.c | 4 +-- example/switch/odp_switch.c | 4 +-- example/time/time_global_test.c | 2 +- example/timer/odp_timer_test.c | 2 +- helper/Makefile.am | 11 +++--- helper/cuckootable.c | 2 +- helper/hashtable.c | 2 +- helper/include/odp/helper/odph_api.h | 39 ++++++++++++++++++++++ helper/{ => include/odp/helper}/odph_cuckootable.h | 0 helper/{ => include/odp/helper}/odph_hashtable.h | 0 .../{ => include/odp/helper}/odph_iplookuptable.h | 0 helper/{ => include/odp/helper}/odph_lineartable.h | 0 helper/iplookuptable.c | 2 +- helper/lineartable.c | 2 +- helper/test/chksum.c | 4 +-- helper/test/cuckootable.c | 2 +- helper/test/iplookuptable.c | 2 +- helper/test/odpthreads.c | 2 +- helper/test/parse.c | 3 +- helper/test/table.c | 3 +- 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 +- .../api/classification/odp_classification_common.c | 4 --- .../classification/odp_classification_test_pmr.c | 4 --- .../api/classification/odp_classification_tests.c | 4 --- .../classification/odp_classification_testsuites.h | 1 + test/common_plat/validation/api/pktio/pktio.c | 4 +-- test/common_plat/validation/api/timer/timer.c | 2 +- .../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 +- 46 files changed, 80 insertions(+), 97 deletions(-) create mode 100644 helper/include/odp/helper/odph_api.h rename helper/{ => include/odp/helper}/odph_cuckootable.h (100%) rename helper/{ => include/odp/helper}/odph_hashtable.h (100%) rename helper/{ => include/odp/helper}/odph_iplookuptable.h (100%) rename helper/{ => include/odp/helper}/odph_lineartable.h (100%)
hooks/post-receive