diff options
author | Matias Elo <matias.elo@nokia.com> | 2019-09-16 13:52:26 +0300 |
---|---|---|
committer | Matias Elo <matias.elo@nokia.com> | 2019-11-21 14:45:29 +0200 |
commit | b2e128af3077d6cd0559c0f55b9d5c59152cfbbc (patch) | |
tree | 0a57cfb97309a3e128970fda537ae613b14689b0 | |
parent | f7016bab23f455a4a26f6be5a6f9bf5cecaeff91 (diff) |
example: use helper library debug macros
Use ODP helper library debug macros instead of reimplementing the same
functionality in example_debug.h.
Signed-off-by: Matias Elo <matias.elo@nokia.com>
Reviewed-by: Petri Savolainen <petri.savolainen@nokia.com>
29 files changed, 371 insertions, 509 deletions
diff --git a/example/Makefile.am b/example/Makefile.am index 359031d61..6115c1982 100644 --- a/example/Makefile.am +++ b/example/Makefile.am @@ -14,5 +14,3 @@ SUBDIRS = classifier \ time \ timer \ traffic_mgmt - -noinst_HEADERS = example_debug.h diff --git a/example/classifier/odp_classifier.c b/example/classifier/odp_classifier.c index a6c959a7f..c38c6dfd8 100644 --- a/example/classifier/odp_classifier.c +++ b/example/classifier/odp_classifier.c @@ -9,10 +9,10 @@ #include <getopt.h> #include <unistd.h> #include <inttypes.h> -#include <example_debug.h> #include <odp_api.h> #include <odp/helper/odph_api.h> + #include <strings.h> #include <errno.h> #include <stdio.h> @@ -220,9 +220,9 @@ static odp_pktio_t create_pktio(const char *dev, odp_pool_t pool) pktio = odp_pktio_open(dev, pool, &pktio_param); if (pktio == ODP_PKTIO_INVALID) { if (odp_errno() == EPERM) - EXAMPLE_ERR("Root level permission required\n"); + ODPH_ERR("Root level permission required\n"); - EXAMPLE_ERR("pktio create failed for %s\n", dev); + ODPH_ERR("pktio create failed for %s\n", dev); exit(EXIT_FAILURE); } @@ -231,12 +231,12 @@ static odp_pktio_t create_pktio(const char *dev, odp_pool_t pool) pktin_param.classifier_enable = 1; if (odp_pktin_queue_config(pktio, &pktin_param)) { - EXAMPLE_ERR("pktin queue config failed for %s\n", dev); + ODPH_ERR("pktin queue config failed for %s\n", dev); exit(EXIT_FAILURE); } if (odp_pktout_queue_config(pktio, NULL)) { - EXAMPLE_ERR("pktout queue config failed for %s\n", dev); + ODPH_ERR("pktout queue config failed for %s\n", dev); exit(EXIT_FAILURE); } @@ -289,14 +289,14 @@ static int pktio_receive_thread(void *arg) /* Drop packets with errors */ if (odp_unlikely(drop_err_pkts(&pkt, 1) == 0)) { - EXAMPLE_ERR("Drop frame - err_cnt:%lu\n", ++err_cnt); + ODPH_ERR("Drop frame - err_cnt:%lu\n", ++err_cnt); continue; } pktio_tmp = odp_packet_input(pkt); if (odp_pktout_queue(pktio_tmp, &pktout, 1) != 1) { - EXAMPLE_ERR(" [%02i] Error: no output queue\n", thr); + ODPH_ERR(" [%02i] Error: no output queue\n", thr); return -1; } @@ -318,7 +318,7 @@ static int pktio_receive_thread(void *arg) } if (odp_pktout_send(pktout, &pkt, 1) < 1) { - EXAMPLE_ERR(" [%i] Packet send failed.\n", thr); + ODPH_ERR(" [%i] Packet send failed\n", thr); odp_packet_free(pkt); } } @@ -347,7 +347,7 @@ static odp_cos_t configure_default_cos(odp_pktio_t pktio, appl_args_t *args) qparam.sched.group = ODP_SCHED_GROUP_ALL; queue_default = odp_queue_create(queue_name, &qparam); if (queue_default == ODP_QUEUE_INVALID) { - EXAMPLE_ERR("Error: default queue create failed.\n"); + ODPH_ERR("Error: default queue create failed\n"); exit(EXIT_FAILURE); } @@ -359,7 +359,7 @@ static odp_cos_t configure_default_cos(odp_pktio_t pktio, appl_args_t *args) pool_default = odp_pool_create(pool_name, &pool_params); if (pool_default == ODP_POOL_INVALID) { - EXAMPLE_ERR("Error: default pool create failed.\n"); + ODPH_ERR("Error: default pool create failed\n"); exit(EXIT_FAILURE); } @@ -370,12 +370,12 @@ static odp_cos_t configure_default_cos(odp_pktio_t pktio, appl_args_t *args) cos_default = odp_cls_cos_create(cos_name, &cls_param); if (cos_default == ODP_COS_INVALID) { - EXAMPLE_ERR("Error: default cos create failed.\n"); + ODPH_ERR("Error: default cos create failed\n"); exit(EXIT_FAILURE); } if (0 > odp_pktio_default_cos_set(pktio, cos_default)) { - EXAMPLE_ERR("odp_pktio_default_cos_set failed"); + ODPH_ERR("odp_pktio_default_cos_set failed\n"); exit(EXIT_FAILURE); } stats[args->policy_count].cos = cos_default; @@ -416,7 +416,7 @@ static void configure_cos(odp_cos_t default_cos, appl_args_t *args) args->stats[i].cos_name, i); stats->queue = odp_queue_create(queue_name, &qparam); if (ODP_QUEUE_INVALID == stats->queue) { - EXAMPLE_ERR("odp_queue_create failed"); + ODPH_ERR("odp_queue_create failed\n"); exit(EXIT_FAILURE); } @@ -432,7 +432,7 @@ static void configure_cos(odp_cos_t default_cos, appl_args_t *args) stats->pool = odp_pool_create(pool_name, &pool_params); if (stats->pool == ODP_POOL_INVALID) { - EXAMPLE_ERR("Error: default pool create failed.\n"); + ODPH_ERR("Error: default pool create failed\n"); exit(EXIT_FAILURE); } @@ -454,7 +454,7 @@ static void configure_cos(odp_cos_t default_cos, appl_args_t *args) stats->pmr = odp_cls_pmr_create(&pmr_param, 1, default_cos, stats->cos); if (stats->pmr == ODP_PMR_INVALID) { - EXAMPLE_ERR("odp_pktio_pmr_cos failed"); + ODPH_ERR("odp_pktio_pmr_cos failed\n"); exit(EXIT_FAILURE); } @@ -489,7 +489,7 @@ int main(int argc, char *argv[]) /* Let helper collect its own arguments (e.g. --odph_proc) */ argc = odph_parse_options(argc, argv); if (odph_options(&helper_options)) { - EXAMPLE_ERR("Error: reading ODP helper options failed.\n"); + ODPH_ERR("Error: reading ODP helper options failed\n"); exit(EXIT_FAILURE); } @@ -498,13 +498,13 @@ int main(int argc, char *argv[]) /* Init ODP before calling anything else */ if (odp_init_global(&instance, &init_param, NULL)) { - EXAMPLE_ERR("Error: ODP global init failed.\n"); + ODPH_ERR("Error: ODP global init failed\n"); exit(EXIT_FAILURE); } /* Init this thread */ if (odp_init_local(instance, ODP_THREAD_CONTROL)) { - EXAMPLE_ERR("Error: ODP local init failed.\n"); + ODPH_ERR("Error: ODP local init failed\n"); exit(EXIT_FAILURE); } @@ -513,14 +513,14 @@ int main(int argc, char *argv[]) ODP_CACHE_LINE_SIZE, 0); if (shm == ODP_SHM_INVALID) { - EXAMPLE_ERR("Error: shared mem reserve failed.\n"); + ODPH_ERR("Error: shared mem reserve failed\n"); exit(EXIT_FAILURE); } args = odp_shm_addr(shm); if (args == NULL) { - EXAMPLE_ERR("Error: shared mem alloc failed.\n"); + ODPH_ERR("Error: shared mem alloc failed\n"); exit(EXIT_FAILURE); } @@ -553,7 +553,7 @@ int main(int argc, char *argv[]) pool = odp_pool_create("packet_pool", ¶ms); if (pool == ODP_POOL_INVALID) { - EXAMPLE_ERR("Error: packet pool create failed.\n"); + ODPH_ERR("Error: packet pool create failed\n"); exit(EXIT_FAILURE); } @@ -572,7 +572,7 @@ int main(int argc, char *argv[]) configure_cos(default_cos, args); if (odp_pktio_start(pktio)) { - EXAMPLE_ERR("Error: unable to start pktio.\n"); + ODPH_ERR("Error: unable to start pktio\n"); exit(EXIT_FAILURE); } @@ -600,28 +600,28 @@ int main(int argc, char *argv[]) for (i = 0; i < args->policy_count; i++) { if ((i != args->policy_count - 1) && odp_cls_pmr_destroy(args->stats[i].pmr)) - EXAMPLE_ERR("err: odp_cls_pmr_destroy for %d\n", i); + ODPH_ERR("err: odp_cls_pmr_destroy for %d\n", i); if (odp_cos_destroy(args->stats[i].cos)) - EXAMPLE_ERR("err: odp_cos_destroy for %d\n", i); + ODPH_ERR("err: odp_cos_destroy for %d\n", i); if (odp_queue_destroy(args->stats[i].queue)) - EXAMPLE_ERR("err: odp_queue_destroy for %d\n", i); + ODPH_ERR("err: odp_queue_destroy for %d\n", i); if (odp_pool_destroy(args->stats[i].pool)) - EXAMPLE_ERR("err: odp_pool_destroy for %d\n", i); + ODPH_ERR("err: odp_pool_destroy for %d\n", i); } free(args->if_name); odp_shm_free(shm); if (odp_pktio_close(pktio)) - EXAMPLE_ERR("err: close pktio error\n"); + ODPH_ERR("err: close pktio error\n"); if (odp_pool_destroy(pool)) - EXAMPLE_ERR("err: odp_pool_destroy error\n"); + ODPH_ERR("err: odp_pool_destroy error\n"); ret = odp_term_local(); if (ret) - EXAMPLE_ERR("odp_term_local error %d\n", ret); + ODPH_ERR("odp_term_local error %d\n", ret); ret = odp_term_global(instance); if (ret) - EXAMPLE_ERR("odp_term_global error %d\n", ret); + ODPH_ERR("odp_term_global error %d\n", ret); printf("Exit\n\n"); return ret; } @@ -731,7 +731,7 @@ static int parse_pmr_policy(appl_args_t *appl_args, char *argv[], char *optarg) /* last array index is needed for default queue */ if (policy_count >= MAX_PMR_COUNT - 1) { - EXAMPLE_ERR("Maximum allowed PMR reached\n"); + ODPH_ERR("Maximum allowed PMR reached\n"); return -1; } @@ -743,7 +743,7 @@ static int parse_pmr_policy(appl_args_t *appl_args, char *argv[], char *optarg) /* PMR TERM */ token = strtok(pmr_str, ":"); if (convert_str_to_pmr_enum(token, &term, &offset)) { - EXAMPLE_ERR("Invalid ODP_PMR_TERM string\n"); + ODPH_ERR("Invalid ODP_PMR_TERM string\n"); exit(EXIT_FAILURE); } stats[policy_count].rule.term = term; @@ -756,7 +756,7 @@ static int parse_pmr_policy(appl_args_t *appl_args, char *argv[], char *optarg) DISPLAY_STRING_LEN - 1); if (odph_ipv4_addr_parse(&ip_addr, token)) { - EXAMPLE_ERR("Bad IP address\n"); + ODPH_ERR("Bad IP address\n"); exit(EXIT_FAILURE); } diff --git a/example/example_debug.h b/example/example_debug.h deleted file mode 100644 index 84f8af1b8..000000000 --- a/example/example_debug.h +++ /dev/null @@ -1,93 +0,0 @@ -/* Copyright (c) 2014-2018, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ -/** - * @file - * - * example debug - */ - -#ifndef EXAMPLE_DEBUG_H_ -#define EXAMPLE_DEBUG_H_ - -#include <stdio.h> -#include <stdlib.h> - -#ifdef __cplusplus -extern "C" { -#endif - -#ifndef EXAMPLE_DEBUG_PRINT -#define EXAMPLE_DEBUG_PRINT 1 -#endif - -/** - * log level. - */ -typedef enum example_log_level { - EXAMPLE_LOG_DBG, - EXAMPLE_LOG_ERR, - EXAMPLE_LOG_ABORT -} example_log_level_e; - -/** - * default LOG macro. - */ -#define EXAMPLE_LOG(level, fmt, ...) \ -do { \ - switch (level) { \ - case EXAMPLE_LOG_ERR: \ - fprintf(stderr, "%s:%d:%s():" fmt, __FILE__, \ - __LINE__, __func__, ##__VA_ARGS__); \ - break; \ - case EXAMPLE_LOG_DBG: \ - if (EXAMPLE_DEBUG_PRINT == 1) \ - fprintf(stderr, "%s:%d:%s():" fmt, __FILE__, \ - __LINE__, __func__, ##__VA_ARGS__); \ - break; \ - case EXAMPLE_LOG_ABORT: \ - fprintf(stderr, "%s:%d:%s(): " fmt, __FILE__, \ - __LINE__, __func__, ##__VA_ARGS__); \ - abort(); \ - break; \ - default: \ - fprintf(stderr, "Unknown LOG level"); \ - break;\ - } \ -} while (0) - -/** - * Debug printing macro, which prints output when DEBUG flag is set. - */ -#define EXAMPLE_DBG(fmt, ...) \ - EXAMPLE_LOG(EXAMPLE_LOG_DBG, fmt, ##__VA_ARGS__) - -/** - * Print output to stderr (file, line and function). - */ -#define EXAMPLE_ERR(fmt, ...) \ - EXAMPLE_LOG(EXAMPLE_LOG_ERR, fmt, ##__VA_ARGS__) - -/** - * Print output to stderr (file, line and function), - * then abort. - */ -#define EXAMPLE_ABORT(fmt, ...) \ - EXAMPLE_LOG(EXAMPLE_LOG_ABORT, fmt, ##__VA_ARGS__) - -/** - * Intentionally unused variables to functions - */ -#define EXAMPLE_UNUSED __attribute__((__unused__)) - -/** - * @} - */ - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/example/generator/odp_generator.c b/example/generator/odp_generator.c index 976dd722a..1ed734c6e 100644 --- a/example/generator/odp_generator.c +++ b/example/generator/odp_generator.c @@ -17,8 +17,6 @@ #include <sys/time.h> #include <signal.h> -#include <example_debug.h> - #include <odp_api.h> #include <odp/helper/odph_api.h> @@ -560,13 +558,13 @@ static int create_pktio(const char *dev, odp_pool_t pool, itf->pktio = odp_pktio_open(dev, pool, &pktio_param); if (itf->pktio == ODP_PKTIO_INVALID) { - EXAMPLE_ERR("Error: pktio create failed for %s\n", dev); + ODPH_ERR("Error: pktio create failed for %s\n", dev); return -1; } if (odp_pktio_capability(itf->pktio, &capa)) { - EXAMPLE_ERR("Error: Failed to get interface capabilities %s\n", - dev); + ODPH_ERR("Error: Failed to get interface capabilities %s\n", + dev); return -1; } odp_pktio_config_init(&itf->config); @@ -604,8 +602,8 @@ static int create_pktio(const char *dev, odp_pool_t pool, itf->config.parser.layer = ODP_PROTO_LAYER_L3; if (odp_pktio_config(itf->pktio, &itf->config)) { - EXAMPLE_ERR("Error: Failed to set interface configuration %s\n", - dev); + ODPH_ERR("Error: Failed to set interface configuration %s\n", + dev); return -1; } @@ -614,8 +612,8 @@ static int create_pktio(const char *dev, odp_pool_t pool, if (num_rx_queues > capa.max_input_queues) { num_rx_queues = capa.max_input_queues; pktin_mode = ODP_PKTIO_OP_MT; - EXAMPLE_DBG("Warning: Force RX multithread safe mode " - "(slower)on %s\n", dev); + ODPH_DBG("Warning: Force RX multithread safe mode " + "(slower)on %s\n", dev); } odp_pktin_queue_param_init(&pktin_param); @@ -626,8 +624,8 @@ static int create_pktio(const char *dev, odp_pool_t pool, ODP_SCHED_SYNC_ATOMIC; if (odp_pktin_queue_config(itf->pktio, &pktin_param)) { - EXAMPLE_ERR("Error: pktin queue config failed " - "for %s\n", dev); + ODPH_ERR("Error: pktin queue config failed for %s\n", + dev); return -1; } } @@ -637,8 +635,8 @@ static int create_pktio(const char *dev, odp_pool_t pool, if (num_tx_queues > capa.max_output_queues) { num_tx_queues = capa.max_output_queues; pktout_mode = ODP_PKTIO_OP_MT; - EXAMPLE_DBG("Warning: Force TX multithread safe mode " - "(slower) on %s\n", dev); + ODPH_DBG("Warning: Force TX multithread safe mode " + "(slower) on %s\n", dev); } odp_pktout_queue_param_init(&pktout_param); @@ -646,21 +644,21 @@ static int create_pktio(const char *dev, odp_pool_t pool, pktout_param.op_mode = pktout_mode; if (odp_pktout_queue_config(itf->pktio, &pktout_param)) { - EXAMPLE_ERR("Error: pktout queue config failed for %s\n", - dev); + ODPH_ERR("Error: pktout queue config failed for %s\n", + dev); return -1; } } ret = odp_pktio_start(itf->pktio); if (ret) - EXAMPLE_ABORT("Error: unable to start %s\n", dev); + ODPH_ABORT("Error: unable to start %s\n", dev); itf->pktout_count = num_tx_queues; if (itf->pktout_count && odp_pktout_queue(itf->pktio, itf->pktout, itf->pktout_count) != (int)itf->pktout_count) { - EXAMPLE_ERR("Error: failed to get output queues for %s\n", dev); + ODPH_ERR("Error: failed to get output queues for %s\n", dev); return -1; } @@ -668,7 +666,7 @@ static int create_pktio(const char *dev, odp_pool_t pool, if (!sched && itf->pktin_count && odp_pktin_queue(itf->pktio, itf->pktin, itf->pktin_count) != (int)itf->pktin_count) { - EXAMPLE_ERR("Error: failed to get input queues for %s\n", dev); + ODPH_ERR("Error: failed to get input queues for %s\n", dev); return -1; } @@ -727,8 +725,8 @@ static int gen_send_thread(void *arg) if (args->appl.number != -1) pkt_count_max = args->appl.number; } else { - EXAMPLE_ERR(" [%02i] Error: invalid processing mode %d\n", - thr, args->appl.mode); + ODPH_ERR(" [%02i] Error: invalid processing mode %d\n", thr, + args->appl.mode); return -1; } pkt_array_size = args->tx_burst_size; @@ -736,8 +734,8 @@ static int gen_send_thread(void *arg) if (setup_pkt_ref_array(thr_args->pool, pktout_cfg, pkt_ref_array, pkt_array_size, setup_pkt_ref)) { - EXAMPLE_ERR("[%02i] Error: failed to create" - " reference packets\n", thr); + ODPH_ERR("[%02i] Error: failed to create reference packets\n", + thr); return -1; } @@ -758,8 +756,8 @@ static int gen_send_thread(void *arg) if (setup_pkt_array(pktout_cfg, counters, pkt_ref_array, pkt_array, pkt_array_size, setup_pkt, setup_pkt_arg)) { - EXAMPLE_ERR("[%02i] Error: failed to setup packets\n", - thr); + ODPH_ERR("[%02i] Error: failed to setup packets\n", + thr); break; } @@ -778,7 +776,7 @@ static int gen_send_thread(void *arg) burst_size -= ret; continue; } - EXAMPLE_ERR(" [%02i] packet send failed\n", thr); + ODPH_ERR(" [%02i] packet send failed\n", thr); odp_packet_free_multi(&pkt_array[burst_start], burst_size); break; @@ -1123,7 +1121,7 @@ int main(int argc, char *argv[]) /* Let helper collect its own arguments (e.g. --odph_proc) */ argc = odph_parse_options(argc, argv); if (odph_options(&helper_options)) { - EXAMPLE_ERR("Error: reading ODP helper options failed.\n"); + ODPH_ERR("Error: reading ODP helper options failed.\n"); exit(EXIT_FAILURE); } @@ -1132,12 +1130,12 @@ int main(int argc, char *argv[]) /* Init ODP before calling anything else */ if (odp_init_global(&instance, &init_param, NULL)) { - EXAMPLE_ERR("Error: ODP global init failed.\n"); + ODPH_ERR("Error: ODP global init failed.\n"); exit(EXIT_FAILURE); } if (odp_init_local(instance, ODP_THREAD_CONTROL)) { - EXAMPLE_ERR("Error: ODP local init failed.\n"); + ODPH_ERR("Error: ODP local init failed.\n"); exit(EXIT_FAILURE); } @@ -1146,14 +1144,14 @@ int main(int argc, char *argv[]) ODP_CACHE_LINE_SIZE, 0); if (shm == ODP_SHM_INVALID) { - EXAMPLE_ERR("Error: shared mem reserve failed.\n"); + ODPH_ERR("Error: shared mem reserve failed.\n"); exit(EXIT_FAILURE); } args = odp_shm_addr(shm); if (args == NULL) { - EXAMPLE_ERR("Error: shared mem alloc failed.\n"); + ODPH_ERR("Error: shared mem alloc failed.\n"); exit(EXIT_FAILURE); } memset(args, 0, sizeof(*args)); @@ -1187,7 +1185,7 @@ int main(int argc, char *argv[]) /* ping mode need two workers */ if (args->appl.mode == APPL_MODE_PING) { if (num_workers < 2) { - EXAMPLE_ERR("Need at least two worker threads\n"); + ODPH_ERR("Need at least two worker threads\n"); exit(EXIT_FAILURE); } else { num_workers = 2; @@ -1220,7 +1218,7 @@ int main(int argc, char *argv[]) pool = odp_pool_create("packet_pool", ¶ms); if (pool == ODP_POOL_INVALID) { - EXAMPLE_ERR("Error: packet pool create failed.\n"); + ODPH_ERR("Error: packet pool create failed.\n"); exit(EXIT_FAILURE); } odp_pool_print(pool); @@ -1245,8 +1243,8 @@ int main(int argc, char *argv[]) if (create_pktio(args->appl.if_names[i], pool, num_rx_queues, num_tx_queues, &ifs[i])) { - EXAMPLE_ERR("Error: create interface %s failed.\n", - args->appl.if_names[i]); + ODPH_ERR("Error: create interface %s failed.\n", + args->appl.if_names[i]); exit(EXIT_FAILURE); } } @@ -1374,7 +1372,7 @@ int main(int argc, char *argv[]) else thr_run_func = gen_recv_direct_thread; } else { - EXAMPLE_ERR("ERR MODE\n"); + ODPH_ERR("ERR MODE\n"); exit(EXIT_FAILURE); } /* @@ -1497,9 +1495,9 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) if (odp_cpumask_count(&cpumask_and) < odp_cpumask_count(&cpumask_args) || odp_cpumask_count(&cpumask_args) > MAX_WORKERS) { - EXAMPLE_ERR("Wrong cpu mask, max cpu's:%d\n", - num_workers < MAX_WORKERS ? - num_workers : MAX_WORKERS); + ODPH_ERR("Wrong cpu mask, max cpu's:%d\n", + num_workers < MAX_WORKERS ? + num_workers : MAX_WORKERS); exit(EXIT_FAILURE); } break; @@ -1552,35 +1550,35 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) } else if (optarg[0] == 'r') { appl_args->mode = APPL_MODE_RCV; } else { - EXAMPLE_ERR("wrong mode!\n"); + ODPH_ERR("wrong mode!\n"); exit(EXIT_FAILURE); } break; case 'a': if (odph_eth_addr_parse(&appl_args->srcmac, optarg)) { - EXAMPLE_ERR("wrong src mac:%s\n", optarg); + ODPH_ERR("wrong src mac:%s\n", optarg); exit(EXIT_FAILURE); } break; case 'b': if (odph_eth_addr_parse(&appl_args->dstmac, optarg)) { - EXAMPLE_ERR("wrong dst mac:%s\n", optarg); + ODPH_ERR("wrong dst mac:%s\n", optarg); exit(EXIT_FAILURE); } break; case 's': if (scan_ip(optarg, &appl_args->srcip) != 1) { - EXAMPLE_ERR("wrong src ip:%s\n", optarg); + ODPH_ERR("wrong src ip:%s\n", optarg); exit(EXIT_FAILURE); } break; case 'd': if (scan_ip(optarg, &appl_args->dstip) != 1) { - EXAMPLE_ERR("wrong dst ip:%s\n", optarg); + ODPH_ERR("wrong dst ip:%s\n", optarg); exit(EXIT_FAILURE); } break; @@ -1612,23 +1610,23 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) case 'i': appl_args->interval = atoi(optarg); if (appl_args->interval <= 200 && geteuid() != 0) { - EXAMPLE_ERR("should be root user\n"); + ODPH_ERR("should be root user\n"); exit(EXIT_FAILURE); } break; case 'x': appl_args->udp_tx_burst = atoi(optarg); if (appl_args->udp_tx_burst > MAX_UDP_TX_BURST) { - EXAMPLE_ERR("wrong UDP Tx burst size (max %d)\n", - MAX_UDP_TX_BURST); + ODPH_ERR("wrong UDP Tx burst size (max %d)\n", + MAX_UDP_TX_BURST); exit(EXIT_FAILURE); } break; case 'r': appl_args->rx_burst = atoi(optarg); if (appl_args->rx_burst > MAX_RX_BURST) { - EXAMPLE_ERR("wrong Rx burst size (max %d)\n", - MAX_RX_BURST); + ODPH_ERR("wrong Rx burst size (max %d)\n", + MAX_RX_BURST); exit(EXIT_FAILURE); } break; diff --git a/example/ipfragreass/odp_ipfragreass.c b/example/ipfragreass/odp_ipfragreass.c index 2d11ac0cb..baf8b13dc 100644 --- a/example/ipfragreass/odp_ipfragreass.c +++ b/example/ipfragreass/odp_ipfragreass.c @@ -16,7 +16,6 @@ #include <assert.h> #include <odp/helper/odph_api.h> -#include <example_debug.h> #include "odp_ipfragreass_fragment.h" #include "odp_ipfragreass_reassemble.h" @@ -161,7 +160,7 @@ static void init(odp_instance_t *instance, odp_pool_t *fragment_pool, * * @return Always returns zero */ -static int run_worker(void *arg EXAMPLE_UNUSED) +static int run_worker(void *arg ODP_UNUSED) { int threadno = odp_thread_id() - 1; int iterations = 0; diff --git a/example/ipfragreass/odp_ipfragreass_atomics.h b/example/ipfragreass/odp_ipfragreass_atomics.h index 2f3bb51b6..7db64911f 100644 --- a/example/ipfragreass/odp_ipfragreass_atomics.h +++ b/example/ipfragreass/odp_ipfragreass_atomics.h @@ -7,8 +7,6 @@ #ifndef ODP_FRAGREASS_PP_ATOMICS_H_ #define ODP_FRAGREASS_PP_ATOMICS_H_ -#include <example_debug.h> - #if __SIZEOF_POINTER__ == 4 /** * A wrapper function to perform a 64-bit "strong" atomic compare and swap diff --git a/example/ipfragreass/odp_ipfragreass_atomics_arm.h b/example/ipfragreass/odp_ipfragreass_atomics_arm.h index d539fa187..5d61909ab 100644 --- a/example/ipfragreass/odp_ipfragreass_atomics_arm.h +++ b/example/ipfragreass/odp_ipfragreass_atomics_arm.h @@ -7,7 +7,7 @@ #ifndef ODP_FRAGREASS_PP_ATOMICS_ARM_H_ #define ODP_FRAGREASS_PP_ATOMICS_ARM_H_ -#include <example_debug.h> +#include <odp_api.h> #if __SIZEOF_POINTER__ == 8 && defined(__aarch64__) static inline __int128 lld(__int128 *var, int mo) @@ -45,7 +45,7 @@ static inline uint32_t scd(__int128 *var, __int128 neu, int mo) static inline bool atomic_strong_cas_dblptr(__int128 *var, __int128 *exp, __int128 neu, int mo_success, - int mo_failure EXAMPLE_UNUSED) + int mo_failure ODP_UNUSED) { register __int128 old; register __int128 expected = *exp; @@ -95,7 +95,7 @@ static inline uint32_t scd(uint64_t *var, uint64_t neu, int mo) static inline bool atomic_strong_cas_dblptr(uint64_t *var, uint64_t *exp, uint64_t neu, int mo_success, - int mo_failure EXAMPLE_UNUSED) + int mo_failure ODP_UNUSED) { register uint64_t old; register uint64_t expected = *exp; diff --git a/example/ipsec/odp_ipsec.c b/example/ipsec/odp_ipsec.c index 1c26e405c..a50468d6e 100644 --- a/example/ipsec/odp_ipsec.c +++ b/example/ipsec/odp_ipsec.c @@ -20,8 +20,6 @@ #include <unistd.h> #include <inttypes.h> -#include <example_debug.h> - #include <odp_api.h> #include <odp/helper/odph_api.h> @@ -330,7 +328,7 @@ void ipsec_init_pre(void) global->completionq = queue_create("completion", &qparam); if (ODP_QUEUE_INVALID == global->completionq) { - EXAMPLE_ERR("Error: completion queue creation failed\n"); + ODPH_ERR("Error: completion queue creation failed\n"); exit(EXIT_FAILURE); } @@ -341,7 +339,7 @@ void ipsec_init_pre(void) global->seqnumq = queue_create("seqnum", &qparam); if (ODP_QUEUE_INVALID == global->seqnumq) { - EXAMPLE_ERR("Error: sequence number queue creation failed\n"); + ODPH_ERR("Error: sequence number queue creation failed\n"); exit(EXIT_FAILURE); } @@ -355,7 +353,7 @@ void ipsec_init_pre(void) global->out_pool = odp_pool_create("out_pool", ¶ms); if (ODP_POOL_INVALID == global->out_pool) { - EXAMPLE_ERR("Error: message pool create failed.\n"); + ODPH_ERR("Error: message pool create failed.\n"); exit(EXIT_FAILURE); } @@ -407,7 +405,7 @@ void ipsec_init_post(crypto_api_mode_e api_mode) entry->input, global->completionq, global->out_pool)) { - EXAMPLE_ERR("Error: IPSec cache entry failed.\n" + ODPH_ERR("Error: IPSec cache entry failed.\n" ); exit(EXIT_FAILURE); } @@ -473,7 +471,7 @@ void initialize_intf(char *intf) */ pktio = odp_pktio_open(intf, global->pkt_pool, &pktio_param); if (ODP_PKTIO_INVALID == pktio) { - EXAMPLE_ERR("Error: pktio create failed for %s\n", intf); + ODPH_ERR("Error: pktio create failed for %s\n", intf); exit(EXIT_FAILURE); } @@ -481,36 +479,35 @@ void initialize_intf(char *intf) pktin_param.queue_param.sched.sync = ODP_SCHED_SYNC_ATOMIC; if (odp_pktin_queue_config(pktio, &pktin_param)) { - EXAMPLE_ERR("Error: pktin config failed for %s\n", intf); + ODPH_ERR("Error: pktin config failed for %s\n", intf); exit(EXIT_FAILURE); } if (odp_pktout_queue_config(pktio, NULL)) { - EXAMPLE_ERR("Error: pktout config failed for %s\n", intf); + ODPH_ERR("Error: pktout config failed for %s\n", intf); exit(EXIT_FAILURE); } if (odp_pktin_event_queue(pktio, &inq, 1) != 1) { - EXAMPLE_ERR("Error: failed to get input queue for %s\n", intf); + ODPH_ERR("Error: failed to get input queue for %s\n", intf); exit(EXIT_FAILURE); } if (odp_pktout_queue(pktio, &pktout, 1) != 1) { - EXAMPLE_ERR("Error: failed to get pktout queue for %s\n", intf); + ODPH_ERR("Error: failed to get pktout queue for %s\n", intf); exit(EXIT_FAILURE); } ret = odp_pktio_start(pktio); if (ret) { - EXAMPLE_ERR("Error: unable to start %s\n", intf); + ODPH_ERR("Error: unable to start %s\n", intf); exit(EXIT_FAILURE); } /* Read the source MAC address for this interface */ ret = odp_pktio_mac_addr(pktio, src_mac, sizeof(src_mac)); if (ret <= 0) { - EXAMPLE_ERR("Error: failed during MAC address get for %s\n", - intf); + ODPH_ERR("Error: failed during MAC address get for %s\n", intf); exit(EXIT_FAILURE); } @@ -535,7 +532,7 @@ void initialize_intf(char *intf) */ static pkt_disposition_e do_input_verify(odp_packet_t pkt, - pkt_ctx_t *ctx EXAMPLE_UNUSED) + pkt_ctx_t *ctx ODP_UNUSED) { if (odp_unlikely(odp_packet_has_error(pkt))) return PKT_DROP; @@ -663,14 +660,14 @@ pkt_disposition_e do_ipsec_in_classify(odp_packet_t *pkt, ctx->state = PKT_STATE_IPSEC_IN_FINISH; if (entry->async) { if (odp_crypto_op_enq(pkt, &out_pkt, ¶ms, 1) != 1) { - EXAMPLE_ERR("Error: odp_crypto_op_enq() failed\n"); + ODPH_ERR("Error: odp_crypto_op_enq() failed\n"); exit(EXIT_FAILURE); } return PKT_POSTED; } if (odp_crypto_op(pkt, &out_pkt, ¶ms, 1) != 1) { - EXAMPLE_ERR("Error: odp_crypto_op() failed\n"); + ODPH_ERR("Error: odp_crypto_op() failed\n"); exit(EXIT_FAILURE); } *pkt = out_pkt; @@ -961,7 +958,7 @@ pkt_disposition_e do_ipsec_out_seq(odp_packet_t *pkt, sizeof(*ctx->ipsec.tun_hdr_id), 1); if (ret != sizeof(*ctx->ipsec.tun_hdr_id)) { - EXAMPLE_ERR("Error: Not enough random data\n"); + ODPH_ERR("Error: Not enough random data\n"); exit(EXIT_FAILURE); } } @@ -973,14 +970,14 @@ pkt_disposition_e do_ipsec_out_seq(odp_packet_t *pkt, if (entry->async) { if (odp_crypto_op_enq(pkt, &out_pkt, &ctx->ipsec.params, 1) != 1) { - EXAMPLE_ERR("Error: odp_crypto_op_enq() failed\n"); + ODPH_ERR("Error: odp_crypto_op_enq() failed\n"); exit(EXIT_FAILURE); } return PKT_POSTED; } if (odp_crypto_op(pkt, &out_pkt, &ctx->ipsec.params, 1) != 1) { - EXAMPLE_ERR("Error: odp_crypto_op() failed\n"); + ODPH_ERR("Error: odp_crypto_op() failed\n"); exit(EXIT_FAILURE); } *pkt = out_pkt; @@ -1041,7 +1038,7 @@ pkt_disposition_e do_ipsec_out_finish(odp_packet_t pkt, * @return NULL (should never return) */ static -int pktio_thread(void *arg EXAMPLE_UNUSED) +int pktio_thread(void *arg ODP_UNUSED) { int thr; odp_packet_t pkt; @@ -1082,7 +1079,7 @@ int pktio_thread(void *arg EXAMPLE_UNUSED) ctx->state = PKT_STATE_INPUT_VERIFY; } } else { - EXAMPLE_ERR("Error: Bad event type\n"); + ODPH_ERR("Error: Bad event type\n"); exit(EXIT_FAILURE); } @@ -1222,7 +1219,7 @@ main(int argc, char *argv[]) /* Let helper collect its own arguments (e.g. --odph_proc) */ argc = odph_parse_options(argc, argv); if (odph_options(&helper_options)) { - EXAMPLE_ERR("Error: reading ODP helper options failed.\n"); + ODPH_ERR("Error: reading ODP helper options failed.\n"); exit(EXIT_FAILURE); } @@ -1231,13 +1228,13 @@ main(int argc, char *argv[]) /* Init ODP before calling anything else */ if (odp_init_global(&instance, &init_param, NULL)) { - EXAMPLE_ERR("Error: ODP global init failed.\n"); + ODPH_ERR("Error: ODP global init failed.\n"); exit(EXIT_FAILURE); } /* Init this thread */ if (odp_init_local(instance, ODP_THREAD_CONTROL)) { - EXAMPLE_ERR("Error: ODP local init failed.\n"); + ODPH_ERR("Error: ODP local init failed.\n"); exit(EXIT_FAILURE); } @@ -1246,14 +1243,14 @@ main(int argc, char *argv[]) ODP_CACHE_LINE_SIZE, 0); if (shm == ODP_SHM_INVALID) { - EXAMPLE_ERR("Error: shared mem reserve failed.\n"); + ODPH_ERR("Error: shared mem reserve failed.\n"); exit(EXIT_FAILURE); } global = odp_shm_addr(shm); if (NULL == global) { - EXAMPLE_ERR("Error: shared mem alloc failed.\n"); + ODPH_ERR("Error: shared mem alloc failed.\n"); exit(EXIT_FAILURE); } memset(global, 0, sizeof(global_data_t)); @@ -1298,7 +1295,7 @@ main(int argc, char *argv[]) global->pkt_pool = odp_pool_create("packet_pool", ¶ms); if (ODP_POOL_INVALID == global->pkt_pool) { - EXAMPLE_ERR("Error: packet pool create failed.\n"); + ODPH_ERR("Error: packet pool create failed.\n"); exit(EXIT_FAILURE); } @@ -1311,7 +1308,7 @@ main(int argc, char *argv[]) global->ctx_pool = odp_pool_create("ctx_pool", ¶ms); if (ODP_POOL_INVALID == global->ctx_pool) { - EXAMPLE_ERR("Error: context pool create failed.\n"); + ODPH_ERR("Error: context pool create failed.\n"); exit(EXIT_FAILURE); } @@ -1367,8 +1364,8 @@ main(int argc, char *argv[]) continue; if (odp_pktio_stop(pktio) || odp_pktio_close(pktio)) { - EXAMPLE_ERR("Error: failed to close pktio %s\n", - global->appl.if_names[i]); + ODPH_ERR("Error: failed to close pktio %s\n", + global->appl.if_names[i]); exit(EXIT_FAILURE); } } @@ -1377,50 +1374,50 @@ main(int argc, char *argv[]) free(global->appl.if_str); if (destroy_ipsec_cache()) - EXAMPLE_ERR("Error: crypto session destroy failed\n"); + ODPH_ERR("Error: crypto session destroy failed\n"); if (odp_queue_destroy(global->completionq)) - EXAMPLE_ERR("Error: queue destroy failed\n"); + ODPH_ERR("Error: queue destroy failed\n"); if (odp_queue_destroy(global->seqnumq)) - EXAMPLE_ERR("Error: queue destroy failed\n"); + ODPH_ERR("Error: queue destroy failed\n"); if (odp_pool_destroy(global->pkt_pool)) - EXAMPLE_ERR("Error: pool destroy failed\n"); + ODPH_ERR("Error: pool destroy failed\n"); if (odp_pool_destroy(global->ctx_pool)) - EXAMPLE_ERR("Error: pool destroy failed\n"); + ODPH_ERR("Error: pool destroy failed\n"); if (odp_pool_destroy(global->out_pool)) - EXAMPLE_ERR("Error: pool destroy failed\n"); + ODPH_ERR("Error: pool destroy failed\n"); shm = odp_shm_lookup("shm_ipsec_cache"); if (odp_shm_free(shm) != 0) - EXAMPLE_ERR("Error: shm free shm_ipsec_cache failed\n"); + ODPH_ERR("Error: shm free shm_ipsec_cache failed\n"); shm = odp_shm_lookup("shm_fwd_db"); if (odp_shm_free(shm) != 0) - EXAMPLE_ERR("Error: shm free shm_fwd_db failed\n"); + ODPH_ERR("Error: shm free shm_fwd_db failed\n"); shm = odp_shm_lookup("shm_sa_db"); if (odp_shm_free(shm) != 0) - EXAMPLE_ERR("Error: shm free shm_sa_db failed\n"); + ODPH_ERR("Error: shm free shm_sa_db failed\n"); shm = odp_shm_lookup("shm_tun_db"); if (odp_shm_free(shm) != 0) - EXAMPLE_ERR("Error: shm free shm_tun_db failed\n"); + ODPH_ERR("Error: shm free shm_tun_db failed\n"); shm = odp_shm_lookup("shm_sp_db"); if (odp_shm_free(shm) != 0) - EXAMPLE_ERR("Error: shm free shm_sp_db failed\n"); + ODPH_ERR("Error: shm free shm_sp_db failed\n"); shm = odp_shm_lookup("stream_db"); if (odp_shm_free(shm) != 0) - EXAMPLE_ERR("Error: shm free stream_db failed\n"); + ODPH_ERR("Error: shm free stream_db failed\n"); if (odp_shm_free(global->shm)) { - EXAMPLE_ERR("Error: shm free global data failed\n"); + ODPH_ERR("Error: shm free global data failed\n"); exit(EXIT_FAILURE); } if (odp_term_local()) { - EXAMPLE_ERR("Error: term local failed\n"); + ODPH_ERR("Error: term local failed\n"); exit(EXIT_FAILURE); } if (odp_term_global(instance)) { - EXAMPLE_ERR("Error: term global failed\n"); + ODPH_ERR("Error: term global failed\n"); exit(EXIT_FAILURE); } diff --git a/example/ipsec/odp_ipsec_cache.c b/example/ipsec/odp_ipsec_cache.c index 362e64a44..044538c59 100644 --- a/example/ipsec/odp_ipsec_cache.c +++ b/example/ipsec/odp_ipsec_cache.c @@ -7,8 +7,6 @@ #include <stdlib.h> #include <string.h> -#include <example_debug.h> - #include <odp_api.h> #include <odp/helper/ipsec.h> @@ -28,14 +26,14 @@ void init_ipsec_cache(void) ODP_CACHE_LINE_SIZE, 0); if (shm == ODP_SHM_INVALID) { - EXAMPLE_ERR("Error: shared mem alloc failed.\n"); + ODPH_ERR("Error: shared mem alloc failed.\n"); exit(EXIT_FAILURE); } ipsec_cache = odp_shm_addr(shm); if (ipsec_cache == NULL) { - EXAMPLE_ERR("Error: shared mem alloc failed.\n"); + ODPH_ERR("Error: shared mem alloc failed.\n"); exit(EXIT_FAILURE); } memset(ipsec_cache, 0, sizeof(*ipsec_cache)); @@ -217,7 +215,7 @@ ipsec_cache_entry_t *find_ipsec_cache_entry_in(uint32_t src_ip, ipsec_cache_entry_t *find_ipsec_cache_entry_out(uint32_t src_ip, uint32_t dst_ip, - uint8_t proto EXAMPLE_UNUSED) + uint8_t proto ODP_UNUSED) { ipsec_cache_entry_t *entry = ipsec_cache->out_list; diff --git a/example/ipsec/odp_ipsec_fwd_db.c b/example/ipsec/odp_ipsec_fwd_db.c index 5e84656a4..ca0abf6c1 100644 --- a/example/ipsec/odp_ipsec_fwd_db.c +++ b/example/ipsec/odp_ipsec_fwd_db.c @@ -12,9 +12,8 @@ #include <stdlib.h> #include <string.h> -#include <example_debug.h> - #include <odp_api.h> +#include <odp/helper/odph_api.h> #include <odp_ipsec_fwd_db.h> @@ -31,14 +30,14 @@ void init_fwd_db(void) 0); if (shm == ODP_SHM_INVALID) { - EXAMPLE_ERR("Error: shared mem reserve failed.\n"); + ODPH_ERR("Error: shared mem reserve failed.\n"); exit(EXIT_FAILURE); } fwd_db = odp_shm_addr(shm); if (fwd_db == NULL) { - EXAMPLE_ERR("Error: shared mem alloc failed.\n"); + ODPH_ERR("Error: shared mem alloc failed.\n"); exit(EXIT_FAILURE); } memset(fwd_db, 0, sizeof(*fwd_db)); diff --git a/example/ipsec/odp_ipsec_sa_db.c b/example/ipsec/odp_ipsec_sa_db.c index 0c6fdf51a..9a7c593b3 100644 --- a/example/ipsec/odp_ipsec_sa_db.c +++ b/example/ipsec/odp_ipsec_sa_db.c @@ -12,9 +12,8 @@ #include <stdlib.h> #include <string.h> -#include <example_debug.h> - #include <odp_api.h> +#include <odp/helper/odph_api.h> #include <odp_ipsec_sa_db.h> @@ -34,14 +33,14 @@ void init_sa_db(void) 0); if (shm == ODP_SHM_INVALID) { - EXAMPLE_ERR("Error: shared mem reserve failed.\n"); + ODPH_ERR("Error: shared mem reserve failed.\n"); exit(EXIT_FAILURE); } sa_db = odp_shm_addr(shm); if (sa_db == NULL) { - EXAMPLE_ERR("Error: shared mem alloc failed.\n"); + ODPH_ERR("Error: shared mem alloc failed.\n"); exit(EXIT_FAILURE); } memset(sa_db, 0, sizeof(*sa_db)); @@ -57,14 +56,14 @@ void init_tun_db(void) 0); if (shm == ODP_SHM_INVALID) { - EXAMPLE_ERR("Error: shared mem reserve failed.\n"); + ODPH_ERR("Error: shared mem reserve failed.\n"); exit(EXIT_FAILURE); } tun_db = odp_shm_addr(shm); if (!tun_db) { - EXAMPLE_ERR("Error: shared mem alloc failed.\n"); + ODPH_ERR("Error: shared mem alloc failed.\n"); exit(EXIT_FAILURE); } memset(tun_db, 0, sizeof(*tun_db)); diff --git a/example/ipsec/odp_ipsec_sp_db.c b/example/ipsec/odp_ipsec_sp_db.c index 51690ddfe..88ac55298 100644 --- a/example/ipsec/odp_ipsec_sp_db.c +++ b/example/ipsec/odp_ipsec_sp_db.c @@ -12,9 +12,8 @@ #include <stdlib.h> #include <string.h> -#include <example_debug.h> - #include <odp_api.h> +#include <odp/helper/odph_api.h> #include <odp_ipsec_sp_db.h> @@ -31,14 +30,14 @@ void init_sp_db(void) 0); if (shm == ODP_SHM_INVALID) { - EXAMPLE_ERR("Error: shared mem reserve failed.\n"); + ODPH_ERR("Error: shared mem reserve failed.\n"); exit(EXIT_FAILURE); } sp_db = odp_shm_addr(shm); if (sp_db == NULL) { - EXAMPLE_ERR("Error: shared mem alloc failed.\n"); + ODPH_ERR("Error: shared mem alloc failed.\n"); exit(EXIT_FAILURE); } memset(sp_db, 0, sizeof(*sp_db)); diff --git a/example/ipsec/odp_ipsec_stream.c b/example/ipsec/odp_ipsec_stream.c index c55dc4845..9f953e4a9 100644 --- a/example/ipsec/odp_ipsec_stream.c +++ b/example/ipsec/odp_ipsec_stream.c @@ -17,8 +17,6 @@ #include <openssl/hmac.h> #include <openssl/evp.h> -#include <example_debug.h> - #include <odp_api.h> #include <odp/helper/odph_api.h> @@ -49,14 +47,14 @@ void init_stream_db(void) 0); if (shm == ODP_SHM_INVALID) { - EXAMPLE_ERR("Error: shared mem reserve failed.\n"); + ODPH_ERR("Error: shared mem reserve failed.\n"); exit(EXIT_FAILURE); } stream_db = odp_shm_addr(shm); if (stream_db == NULL) { - EXAMPLE_ERR("Error: shared mem alloc failed.\n"); + ODPH_ERR("Error: shared mem alloc failed.\n"); exit(EXIT_FAILURE); } memset(stream_db, 0, sizeof(*stream_db)); @@ -552,7 +550,7 @@ int create_stream_db_inputs(void) /* Lookup the packet pool */ pkt_pool = odp_pool_lookup("packet_pool"); if (pkt_pool == ODP_POOL_INVALID) { - EXAMPLE_ERR("Error: pkt_pool not found\n"); + ODPH_ERR("Error: pkt_pool not found\n"); exit(EXIT_FAILURE); } @@ -566,16 +564,15 @@ int create_stream_db_inputs(void) ret = odp_pktio_mac_addr(stream->input.pktio, dmac, sizeof(dmac)); if (ret <= 0) { - EXAMPLE_ERR("Error: failed during MAC address get " - "for %s\n", - stream->input.intf); + ODPH_ERR("Error: failed during MAC address get for " + "%s\n", stream->input.intf); continue; } ret = odp_pktout_queue(stream->input.pktio, &queue, 1); if (ret < 1) { - EXAMPLE_ERR("Error: failed to get outqueue for %s\n", - stream->input.intf); + ODPH_ERR("Error: failed to get outqueue for %s\n", + stream->input.intf); continue; } @@ -620,8 +617,8 @@ odp_bool_t verify_stream_db_outputs(void) ret = odp_pktin_event_queue(stream->output.pktio, &queue, 1); if (ret < 1) { - EXAMPLE_ERR("Error: failed to get inqueue for %s\n", - stream->output.intf); + ODPH_ERR("Error: failed to get inqueue for %s\n", + stream->output.intf); continue; } diff --git a/example/ipsec_api/odp_ipsec.c b/example/ipsec_api/odp_ipsec.c index fa977db8e..a02343467 100644 --- a/example/ipsec_api/odp_ipsec.c +++ b/example/ipsec_api/odp_ipsec.c @@ -20,8 +20,6 @@ #include <unistd.h> #include <inttypes.h> -#include <example_debug.h> - #include <odp_api.h> #include <odp/helper/odph_api.h> @@ -284,7 +282,7 @@ void ipsec_init_pre(void) global->completionq = queue_create("completion", &qparam); if (ODP_QUEUE_INVALID == global->completionq) { - EXAMPLE_ERR("Error: completion queue creation failed\n"); + ODPH_ERR("Error: completion queue creation failed\n"); exit(EXIT_FAILURE); } @@ -315,7 +313,7 @@ void ipsec_init_post(odp_ipsec_op_mode_t api_mode) odp_ipsec_capability_t ipsec_cap; if (odp_ipsec_capability(&ipsec_cap) != ODP_IPSEC_OK) { - EXAMPLE_ERR("Error: failure getting IPSec caps\n"); + ODPH_ERR("Error: failure getting IPSec caps\n"); exit(EXIT_FAILURE); } @@ -325,7 +323,7 @@ void ipsec_init_post(odp_ipsec_op_mode_t api_mode) ipsec_config.outbound_mode = api_mode; ipsec_config.inbound.default_queue = global->completionq; if (odp_ipsec_config(&ipsec_config) != ODP_IPSEC_OK) { - EXAMPLE_ERR("Error: failure setting IPSec config\n"); + ODPH_ERR("Error: failure setting IPSec config\n"); exit(EXIT_FAILURE); } @@ -356,7 +354,7 @@ void ipsec_init_post(odp_ipsec_op_mode_t api_mode) tun, entry->input, global->completionq)) { - EXAMPLE_ERR("Error: IPSec cache entry failed.\n" + ODPH_ERR("Error: IPSec cache entry failed.\n" ); exit(EXIT_FAILURE); } @@ -444,7 +442,7 @@ void initialize_intf(char *intf) */ pktio = odp_pktio_open(intf, global->pkt_pool, &pktio_param); if (ODP_PKTIO_INVALID == pktio) { - EXAMPLE_ERR("Error: pktio create failed for %s\n", intf); + ODPH_ERR("Error: pktio create failed for %s\n", intf); exit(EXIT_FAILURE); } @@ -452,27 +450,27 @@ void initialize_intf(char *intf) pktin_param.queue_param.sched.sync = ODP_SCHED_SYNC_ATOMIC; if (odp_pktin_queue_config(pktio, &pktin_param)) { - EXAMPLE_ERR("Error: pktin config failed for %s\n", intf); + ODPH_ERR("Error: pktin config failed for %s\n", intf); exit(EXIT_FAILURE); } if (odp_pktout_queue_config(pktio, NULL)) { - EXAMPLE_ERR("Error: pktout config failed for %s\n", intf); + ODPH_ERR("Error: pktout config failed for %s\n", intf); exit(EXIT_FAILURE); } if (odp_pktin_event_queue(pktio, &inq, 1) != 1) { - EXAMPLE_ERR("Error: failed to get input queue for %s\n", intf); + ODPH_ERR("Error: failed to get input queue for %s\n", intf); exit(EXIT_FAILURE); } if (odp_pktout_queue(pktio, &pktout, 1) != 1) { - EXAMPLE_ERR("Error: failed to get pktout queue for %s\n", intf); + ODPH_ERR("Error: failed to get pktout queue for %s\n", intf); exit(EXIT_FAILURE); } if (odp_pktio_capability(pktio, &capa) != 0) { - EXAMPLE_ERR("Error: failed to get capabilities for %s\n", intf); + ODPH_ERR("Error: failed to get capabilities for %s\n", intf); exit(EXIT_FAILURE); } @@ -485,21 +483,20 @@ void initialize_intf(char *intf) config.outbound_ipsec = capa.config.outbound_ipsec; if (odp_pktio_config(pktio, &config) != 0) { - EXAMPLE_ERR("Error: failed to set config for %s\n", intf); + ODPH_ERR("Error: failed to set config for %s\n", intf); exit(EXIT_FAILURE); } ret = odp_pktio_start(pktio); if (ret) { - EXAMPLE_ERR("Error: unable to start %s\n", intf); + ODPH_ERR("Error: unable to start %s\n", intf); exit(EXIT_FAILURE); } /* Read the source MAC address for this interface */ ret = odp_pktio_mac_addr(pktio, src_mac, sizeof(src_mac)); if (ret <= 0) { - EXAMPLE_ERR("Error: failed during MAC address get for %s\n", - intf); + ODPH_ERR("Error: failed during MAC address get for %s\n", intf); exit(EXIT_FAILURE); } @@ -524,7 +521,7 @@ void initialize_intf(char *intf) */ static pkt_disposition_e do_input_verify(odp_packet_t pkt, - pkt_ctx_t *ctx EXAMPLE_UNUSED) + pkt_ctx_t *ctx ODP_UNUSED) { if (odp_unlikely(odp_packet_has_error(pkt))) return PKT_DROP; @@ -723,7 +720,7 @@ pkt_disposition_e do_ipsec_out_classify(odp_packet_t *ppkt, pkt_ctx_t *ctx) * @return NULL (should never return) */ static -int pktio_thread(void *arg EXAMPLE_UNUSED) +int pktio_thread(void *arg ODP_UNUSED) { int thr; odp_packet_t pkt; @@ -764,13 +761,13 @@ int pktio_thread(void *arg EXAMPLE_UNUSED) if (odp_unlikely(odp_ipsec_result(&result, pkt) < 0)) { - EXAMPLE_DBG("Error Event\n"); + ODPH_DBG("Error Event\n"); odp_event_free(ev); continue; } if (result.status.error.all != 0) { - EXAMPLE_DBG("Error in IPsec\n"); + ODPH_DBG("Error in IPsec\n"); rc = PKT_DROP; } @@ -789,7 +786,7 @@ int pktio_thread(void *arg EXAMPLE_UNUSED) ctx = odp_packet_user_ptr(pkt); } } else { - EXAMPLE_DBG("Unsupported Packet\n"); + ODPH_DBG("Unsupported Packet\n"); odp_event_free(ev); continue; } @@ -797,7 +794,7 @@ int pktio_thread(void *arg EXAMPLE_UNUSED) odp_ipsec_status_t status; if (odp_unlikely(odp_ipsec_status(&status, ev) < 0)) { - EXAMPLE_DBG("Error Event\n"); + ODPH_DBG("Error Event\n"); odp_event_free(ev); continue; } @@ -916,7 +913,7 @@ main(int argc, char *argv[]) /* Let helper collect its own arguments (e.g. --odph_proc) */ argc = odph_parse_options(argc, argv); if (odph_options(&helper_options)) { - EXAMPLE_ERR("Error: reading ODP helper options failed.\n"); + ODPH_ERR("Error: reading ODP helper options failed.\n"); exit(EXIT_FAILURE); } @@ -925,13 +922,13 @@ main(int argc, char *argv[]) /* Init ODP before calling anything else */ if (odp_init_global(&instance, &init_param, NULL)) { - EXAMPLE_ERR("Error: ODP global init failed.\n"); + ODPH_ERR("Error: ODP global init failed.\n"); exit(EXIT_FAILURE); } /* Init this thread */ if (odp_init_local(instance, ODP_THREAD_CONTROL)) { - EXAMPLE_ERR("Error: ODP local init failed.\n"); + ODPH_ERR("Error: ODP local init failed.\n"); exit(EXIT_FAILURE); } @@ -940,14 +937,14 @@ main(int argc, char *argv[]) ODP_CACHE_LINE_SIZE, 0); if (shm == ODP_SHM_INVALID) { - EXAMPLE_ERR("Error: shared mem reserve failed.\n"); + ODPH_ERR("Error: shared mem reserve failed.\n"); exit(EXIT_FAILURE); } global = odp_shm_addr(shm); if (NULL == global) { - EXAMPLE_ERR("Error: shared mem alloc failed.\n"); + ODPH_ERR("Error: shared mem alloc failed.\n"); exit(EXIT_FAILURE); } memset(global, 0, sizeof(global_data_t)); @@ -992,7 +989,7 @@ main(int argc, char *argv[]) global->pkt_pool = odp_pool_create("packet_pool", ¶ms); if (ODP_POOL_INVALID == global->pkt_pool) { - EXAMPLE_ERR("Error: packet pool create failed.\n"); + ODPH_ERR("Error: packet pool create failed.\n"); exit(EXIT_FAILURE); } @@ -1005,7 +1002,7 @@ main(int argc, char *argv[]) global->ctx_pool = odp_pool_create("ctx_pool", ¶ms); if (ODP_POOL_INVALID == global->ctx_pool) { - EXAMPLE_ERR("Error: context pool create failed.\n"); + ODPH_ERR("Error: context pool create failed.\n"); exit(EXIT_FAILURE); } @@ -1062,8 +1059,8 @@ main(int argc, char *argv[]) continue; if (odp_pktio_stop(pktio) || odp_pktio_close(pktio)) { - EXAMPLE_ERR("Error: failed to close pktio %s\n", - global->appl.if_names[i]); + ODPH_ERR("Error: failed to close pktio %s\n", + global->appl.if_names[i]); exit(EXIT_FAILURE); } } @@ -1072,7 +1069,7 @@ main(int argc, char *argv[]) free(global->appl.if_str); if (destroy_ipsec_cache()) - EXAMPLE_ERR("Error: crypto session destroy failed\n"); + ODPH_ERR("Error: crypto session destroy failed\n"); /* Drop any remaining events. ipsec_sa_disable sends status event in * async mode */ @@ -1080,43 +1077,43 @@ main(int argc, char *argv[]) odp_event_free(ev); if (odp_queue_destroy(global->completionq)) - EXAMPLE_ERR("Error: queue destroy failed\n"); + ODPH_ERR("Error: queue destroy failed\n"); if (odp_pool_destroy(global->pkt_pool)) - EXAMPLE_ERR("Error: pool destroy failed\n"); + ODPH_ERR("Error: pool destroy failed\n"); if (odp_pool_destroy(global->ctx_pool)) - EXAMPLE_ERR("Error: pool destroy failed\n"); + ODPH_ERR("Error: pool destroy failed\n"); shm = odp_shm_lookup("shm_ipsec_cache"); if (odp_shm_free(shm) != 0) - EXAMPLE_ERR("Error: shm free shm_ipsec_cache failed\n"); + ODPH_ERR("Error: shm free shm_ipsec_cache failed\n"); shm = odp_shm_lookup("shm_fwd_db"); if (odp_shm_free(shm) != 0) - EXAMPLE_ERR("Error: shm free shm_fwd_db failed\n"); + ODPH_ERR("Error: shm free shm_fwd_db failed\n"); shm = odp_shm_lookup("shm_sa_db"); if (odp_shm_free(shm) != 0) - EXAMPLE_ERR("Error: shm free shm_sa_db failed\n"); + ODPH_ERR("Error: shm free shm_sa_db failed\n"); shm = odp_shm_lookup("shm_tun_db"); if (odp_shm_free(shm) != 0) - EXAMPLE_ERR("Error: shm free shm_tun_db failed\n"); + ODPH_ERR("Error: shm free shm_tun_db failed\n"); shm = odp_shm_lookup("shm_sp_db"); if (odp_shm_free(shm) != 0) - EXAMPLE_ERR("Error: shm free shm_sp_db failed\n"); + ODPH_ERR("Error: shm free shm_sp_db failed\n"); shm = odp_shm_lookup("stream_db"); if (odp_shm_free(shm) != 0) - EXAMPLE_ERR("Error: shm free stream_db failed\n"); + ODPH_ERR("Error: shm free stream_db failed\n"); if (odp_shm_free(global->shm)) { - EXAMPLE_ERR("Error: shm free global data failed\n"); + ODPH_ERR("Error: shm free global data failed\n"); exit(EXIT_FAILURE); } if (odp_term_local()) { - EXAMPLE_ERR("Error: term local failed\n"); + ODPH_ERR("Error: term local failed\n"); exit(EXIT_FAILURE); } if (odp_term_global(instance)) { - EXAMPLE_ERR("Error: term global failed\n"); + ODPH_ERR("Error: term global failed\n"); exit(EXIT_FAILURE); } diff --git a/example/ipsec_api/odp_ipsec_cache.c b/example/ipsec_api/odp_ipsec_cache.c index e408899ac..c16c71115 100644 --- a/example/ipsec_api/odp_ipsec_cache.c +++ b/example/ipsec_api/odp_ipsec_cache.c @@ -7,11 +7,8 @@ #include <stdlib.h> #include <string.h> -#include <example_debug.h> - #include <odp_api.h> - -#include <odp/helper/ipsec.h> +#include <odp/helper/odph_api.h> #include <odp_ipsec_cache.h> @@ -29,14 +26,14 @@ void init_ipsec_cache(void) 0); if (shm == ODP_SHM_INVALID) { - EXAMPLE_ERR("Error: shared mem reserve failed.\n"); + ODPH_ERR("Error: shared mem reserve failed.\n"); exit(EXIT_FAILURE); } ipsec_cache = odp_shm_addr(shm); if (ipsec_cache == NULL) { - EXAMPLE_ERR("Error: shared mem alloc failed.\n"); + ODPH_ERR("Error: shared mem alloc failed.\n"); exit(EXIT_FAILURE); } memset(ipsec_cache, 0, sizeof(*ipsec_cache)); @@ -102,7 +99,7 @@ int create_ipsec_cache_entry(sa_db_entry_t *cipher_sa, ipsec_sa = odp_ipsec_sa_create(¶m); if (ODP_IPSEC_SA_INVALID == ipsec_sa) { - EXAMPLE_ERR("Error: SA creation failed\n"); + ODPH_ERR("Error: SA creation failed\n"); exit(EXIT_FAILURE); } @@ -176,7 +173,7 @@ ipsec_cache_entry_t *find_ipsec_cache_entry_in(uint32_t src_ip, ipsec_cache_entry_t *find_ipsec_cache_entry_out(uint32_t src_ip, uint32_t dst_ip, - uint8_t proto EXAMPLE_UNUSED) + uint8_t proto ODP_UNUSED) { ipsec_cache_entry_t *entry = ipsec_cache->out_list; diff --git a/example/ipsec_offload/odp_ipsec_offload.c b/example/ipsec_offload/odp_ipsec_offload.c index f6936b335..a75b15c2a 100644 --- a/example/ipsec_offload/odp_ipsec_offload.c +++ b/example/ipsec_offload/odp_ipsec_offload.c @@ -20,15 +20,8 @@ #include <unistd.h> #include <inttypes.h> -#include <example_debug.h> - #include <odp_api.h> -#include <odp/helper/linux.h> -#include <odp/helper/eth.h> -#include <odp/helper/ip.h> -#include <odp/helper/icmp.h> -#include <odp/helper/udp.h> -#include <odp/helper/ipsec.h> +#include <odp/helper/odph_api.h> #include <stdbool.h> #include <sys/socket.h> @@ -177,7 +170,7 @@ void ipsec_init_post(void) entry->input, queue) ) { - EXAMPLE_ABORT("Error: IPSec cache entry failed.\n"); + ODPH_ABORT("Error: IPSec cache entry failed\n"); } } else { printf(" WARNING: SA not found for SP\n"); @@ -214,14 +207,14 @@ static void initialize_intf(char *intf, int queue_type) */ pktio = odp_pktio_open(intf, global->pkt_pool, &pktio_param); if (ODP_PKTIO_INVALID == pktio) - EXAMPLE_ABORT("Error: pktio create failed for %s\n", intf); + ODPH_ABORT("Error: pktio create failed for %s\n", intf); odp_pktin_queue_param_init(&pktin_param); ret = odp_pktio_capability(pktio, &capa); if (ret != 0) - EXAMPLE_ABORT("Error: Unable to get pktio capability %s\n", - intf); + ODPH_ABORT("Error: Unable to get pktio capability %s\n", + intf); pktin_param.queue_param.type = ODP_QUEUE_TYPE_SCHED; pktin_param.queue_param.sched.sync = queue_type; @@ -232,24 +225,24 @@ static void initialize_intf(char *intf, int queue_type) pktin_param.hash_enable = 1; if (odp_pktin_queue_config(pktio, &pktin_param)) - EXAMPLE_ABORT("Error: pktin config failed for %s\n", intf); + ODPH_ABORT("Error: pktin config failed for %s\n", intf); if (odp_pktout_queue_config(pktio, NULL)) - EXAMPLE_ABORT("Error: pktout config failed for %s\n", intf); + ODPH_ABORT("Error: pktout config failed for %s\n", intf); if (odp_pktout_queue(pktio, &pktout, 1) != 1) - EXAMPLE_ABORT("Error: failed to get pktout queue for %s\n", - intf); + ODPH_ABORT("Error: failed to get pktout queue for %s\n", + intf); ret = odp_pktio_start(pktio); if (ret) - EXAMPLE_ABORT("Error: unable to start %s\n", intf); + ODPH_ABORT("Error: unable to start %s\n", intf); /* Read the source MAC address for this interface */ ret = odp_pktio_mac_addr(pktio, src_mac, sizeof(src_mac)); if (ret < 0) { - EXAMPLE_ABORT("Error: failed during MAC address get for %s\n", - intf); + ODPH_ABORT("Error: failed during MAC address get for %s\n", + intf); } printf("Created pktio:%02" PRIu64 "\n", odp_pktio_to_u64(pktio)); @@ -326,7 +319,7 @@ pkt_disposition_e do_route_fwd_db(odp_packet_t pkt) /*Check into Routing table*/ fwd_entry = find_fwd_db_entry(dip); if (!fwd_entry) { - EXAMPLE_DBG("No flow match found. Packet is dropped.\n"); + ODPH_DBG("No flow match found. Packet is dropped.\n"); odp_packet_free(pkt); return PKT_DROP; } @@ -334,7 +327,7 @@ pkt_disposition_e do_route_fwd_db(odp_packet_t pkt) /*Entry found. Updated in Flow table first.*/ flow = calloc(1, sizeof(flow_entry_t)); if (!flow) { - EXAMPLE_ABORT("Failure to allocate memory"); + ODPH_ABORT("Failure to allocate memory"); return PKT_DROP; } flow->l3_src = sip; @@ -369,7 +362,7 @@ pkt_disposition_e do_route_fwd_db(odp_packet_t pkt) /* Issue ipsec request */ if (odp_unlikely(odp_ipsec_out_enq(&pkt, 1, ¶ms) < 0)) { - EXAMPLE_DBG("Unable to out enqueue\n"); + ODPH_DBG("Unable to out enqueue\n"); odp_packet_free(pkt); return PKT_DROP; } @@ -400,7 +393,7 @@ pkt_disposition_e do_ipsec_in_classify(odp_packet_t pkt) /* Issue ipsec request */ if (odp_unlikely(odp_ipsec_in_enq(&pkt, 1, ¶ms) < 0)) { - EXAMPLE_DBG("Unable to in enqueue\n"); + ODPH_DBG("Unable to in enqueue\n"); odp_packet_free(pkt); return PKT_DROP; } @@ -421,7 +414,7 @@ pkt_disposition_e do_ipsec_in_classify(odp_packet_t pkt) * @return NULL (should never return) */ static -int pktio_thread(void *arg EXAMPLE_UNUSED) +int pktio_thread(void *arg ODP_UNUSED) { int thr = odp_thread_id(); odp_packet_t pkt; @@ -448,7 +441,7 @@ int pktio_thread(void *arg EXAMPLE_UNUSED) if (odp_unlikely(odp_ipsec_result(&res, pkt) < 0)) { - EXAMPLE_DBG("Error Event\n"); + ODPH_DBG("Error Event\n"); odp_event_free((odp_event_t)ev); continue; } @@ -479,7 +472,7 @@ int pktio_thread(void *arg EXAMPLE_UNUSED) odp_packet_free(pkt); } else { - EXAMPLE_DBG("Invalid Event\n"); + ODPH_DBG("Invalid Event\n"); odp_event_free(ev); continue; } @@ -517,21 +510,21 @@ main(int argc, char *argv[]) /* Initialize ODP before calling anything else */ if (odp_init_global(&instance, NULL, NULL)) - EXAMPLE_ABORT("Error: ODP global init failed.\n"); + ODPH_ABORT("Error: ODP global init failed.\n"); /* Initialize this thread */ if (odp_init_local(instance, ODP_THREAD_CONTROL)) - EXAMPLE_ABORT("Error: ODP local init failed.\n"); + ODPH_ABORT("Error: ODP local init failed.\n"); /* Reserve memory for arguments from shared memory */ shm = odp_shm_reserve("shm_args", sizeof(global_data_t), ODP_CACHE_LINE_SIZE, 0); if (shm == ODP_SHM_INVALID) - EXAMPLE_ABORT("Error: shared mem reserve failed.\n"); + ODPH_ABORT("Error: shared mem reserve failed.\n"); global = odp_shm_addr(shm); if (NULL == global) - EXAMPLE_ABORT("Error: shared mem alloc failed.\n"); + ODPH_ABORT("Error: shared mem alloc failed.\n"); memset(global, 0, sizeof(global_data_t)); /* Must init our databases before parsing args */ @@ -548,7 +541,7 @@ main(int argc, char *argv[]) print_info(NO_PATH(argv[0]), &global->appl); if (odp_ipsec_capability(&capa)) - EXAMPLE_ABORT("Error: Capability not configured.\n"); + ODPH_ABORT("Error: Capability not configured.\n"); odp_ipsec_config_init(&config); @@ -556,11 +549,11 @@ main(int argc, char *argv[]) config.inbound_mode = ODP_IPSEC_OP_MODE_ASYNC; config.outbound_mode = ODP_IPSEC_OP_MODE_ASYNC; } else { - EXAMPLE_ABORT("Error: Sync mode not supported.\n"); + ODPH_ABORT("Error: Sync mode not supported.\n"); } if (odp_ipsec_config(&config)) - EXAMPLE_ABORT("Error: IPSec not configured.\n"); + ODPH_ABORT("Error: IPSec not configured.\n"); global->num_workers = MAX_WORKERS; if (global->appl.cpu_count && global->appl.cpu_count < MAX_WORKERS) @@ -587,7 +580,7 @@ main(int argc, char *argv[]) global->completionq[i] = odp_queue_create("completion", &qparam); if (ODP_QUEUE_INVALID == global->completionq[i]) - EXAMPLE_ABORT("Error: completion queue creation failed\n"); + ODPH_ABORT("Error: completion queue creation failed\n"); } printf("num worker threads: %i\n", global->num_workers); printf("first CPU: %i\n", odp_cpumask_first(&cpumask)); @@ -606,7 +599,7 @@ main(int argc, char *argv[]) global->pkt_pool = odp_pool_create("packet_pool", ¶ms); if (ODP_POOL_INVALID == global->pkt_pool) - EXAMPLE_ABORT("Error: packet pool create failed.\n"); + ODPH_ABORT("Error: packet pool create failed.\n"); ipsec_init_post(); @@ -642,8 +635,8 @@ main(int argc, char *argv[]) continue; if (odp_pktio_stop(pktio) || odp_pktio_close(pktio)) { - EXAMPLE_ERR("Error: failed to close pktio %s\n", - global->appl.if_names[i]); + ODPH_ERR("Error: failed to close pktio %s\n", + global->appl.if_names[i]); exit(EXIT_FAILURE); } } @@ -652,7 +645,7 @@ main(int argc, char *argv[]) free(global->appl.if_str); if (odp_shm_free(shm)) { - EXAMPLE_ERR("Error: shm free global data\n"); + ODPH_ERR("Error: shm free global data\n"); exit(EXIT_FAILURE); } @@ -710,7 +703,7 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) printf("-f must be the 1st argument of the command\n"); rc = -1; } - EXAMPLE_DBG("Bucket count = %d\n", bucket_count); + ODPH_DBG("Bucket count = %d\n", bucket_count); break; case 'c': appl_args->cpu_count = atoi(optarg); @@ -745,7 +738,7 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) appl_args->if_names = calloc(appl_args->if_count, sizeof(char *)); if (!appl_args->if_names) - EXAMPLE_ABORT("Memory allocation failure\n"); + ODPH_ABORT("Memory allocation failure\n"); /* Store the if names (reset names string) */ strcpy(appl_args->if_str, optarg); for (token = strtok(appl_args->if_str, ","), i = 0; diff --git a/example/ipsec_offload/odp_ipsec_offload_cache.c b/example/ipsec_offload/odp_ipsec_offload_cache.c index 6f0e09398..e4ac3c6f3 100644 --- a/example/ipsec_offload/odp_ipsec_offload_cache.c +++ b/example/ipsec_offload/odp_ipsec_offload_cache.c @@ -10,12 +10,8 @@ #include <stdlib.h> #include <string.h> -#include <example_debug.h> - #include <odp.h> - -#include <odp/helper/ipsec.h> -#include <odp/helper/ip.h> +#include <odp/helper/odph_api.h> #include <odp_ipsec_offload_cache.h> @@ -34,12 +30,12 @@ void init_ipsec_cache(void) 0); if (shm == ODP_SHM_INVALID) - EXAMPLE_ABORT("Error: shared mem reserve failed.\n"); + ODPH_ABORT("Error: shared mem reserve failed.\n"); ipsec_cache = odp_shm_addr(shm); if (ipsec_cache == NULL) - EXAMPLE_ABORT("Error: shared mem alloc failed.\n"); + ODPH_ABORT("Error: shared mem alloc failed.\n"); memset(ipsec_cache, 0, sizeof(*ipsec_cache)); } diff --git a/example/ipsec_offload/odp_ipsec_offload_fwd_db.c b/example/ipsec_offload/odp_ipsec_offload_fwd_db.c index a92a566f6..8d87051f5 100644 --- a/example/ipsec_offload/odp_ipsec_offload_fwd_db.c +++ b/example/ipsec_offload/odp_ipsec_offload_fwd_db.c @@ -10,8 +10,8 @@ #include <stdlib.h> #include <string.h> -#include <example_debug.h> #include <odp.h> +#include <odp/helper/odph_api.h> #include <odp_ipsec_offload_fwd_db.h> @@ -39,10 +39,10 @@ void init_routing_table(void) sizeof(flow_bucket_t) * bucket_count, ODP_CACHE_LINE_SIZE, 0); if (hash_shm == ODP_SHM_INVALID) - EXAMPLE_ABORT("Error: shared mem alloc failed.\n"); + ODPH_ABORT("Error: shared mem alloc failed.\n"); flow_table = odp_shm_addr(hash_shm); if (!flow_table) - EXAMPLE_ABORT("Error: shared mem alloc failed.\n"); + ODPH_ABORT("Error: shared mem alloc failed.\n"); /*Inialize Locks*/ for (i = 0; i < bucket_count; i++) { bucket = &flow_table[i]; @@ -62,12 +62,12 @@ void init_fwd_db(void) 0); if (shm == ODP_SHM_INVALID) - EXAMPLE_ABORT("Error: shared mem reserve failed.\n"); + ODPH_ABORT("Error: shared mem reserve failed.\n"); fwd_db = odp_shm_addr(shm); if (fwd_db == NULL) - EXAMPLE_ABORT("Error: shared mem alloc failed.\n"); + ODPH_ABORT("Error: shared mem alloc failed.\n"); memset(fwd_db, 0, sizeof(*fwd_db)); } diff --git a/example/ipsec_offload/odp_ipsec_offload_fwd_db.h b/example/ipsec_offload/odp_ipsec_offload_fwd_db.h index 864c0ab55..f9f448aea 100644 --- a/example/ipsec_offload/odp_ipsec_offload_fwd_db.h +++ b/example/ipsec_offload/odp_ipsec_offload_fwd_db.h @@ -12,7 +12,8 @@ extern "C" { #endif #include <odp.h> -#include <odp/helper/eth.h> +#include <odp/helper/odph_api.h> + #include <odp_ipsec_offload_misc.h> #define OIF_LEN 32 @@ -120,7 +121,7 @@ static inline void route_flow_insert_in_bucket(flow_entry_t *flow, flow_bucket_t *bkt = (flow_bucket_t *)bucket; if (!flow) { - EXAMPLE_ERR("Invalid flow entry passed\n"); + ODPH_ERR("Invalid flow entry passed\n"); return; } diff --git a/example/ipsec_offload/odp_ipsec_offload_sa_db.c b/example/ipsec_offload/odp_ipsec_offload_sa_db.c index 5c1264838..f61fd34db 100644 --- a/example/ipsec_offload/odp_ipsec_offload_sa_db.c +++ b/example/ipsec_offload/odp_ipsec_offload_sa_db.c @@ -10,9 +10,8 @@ #include <stdlib.h> #include <string.h> -#include <example_debug.h> - #include <odp.h> +#include <odp/helper/odph_api.h> #include <odp_ipsec_offload_sa_db.h> @@ -32,12 +31,12 @@ void init_sa_db(void) 0); if (shm == ODP_SHM_INVALID) - EXAMPLE_ABORT("Error: shared mem reserve failed.\n"); + ODPH_ABORT("Error: shared mem reserve failed.\n"); sa_db = odp_shm_addr(shm); if (sa_db == NULL) - EXAMPLE_ABORT("Error: shared mem alloc failed.\n"); + ODPH_ABORT("Error: shared mem alloc failed.\n"); memset(sa_db, 0, sizeof(*sa_db)); } @@ -51,12 +50,12 @@ void init_tun_db(void) 0); if (shm == ODP_SHM_INVALID) - EXAMPLE_ABORT("Error: shared mem reserve failed.\n"); + ODPH_ABORT("Error: shared mem reserve failed.\n"); tun_db = odp_shm_addr(shm); if (!tun_db) - EXAMPLE_ABORT("Error: shared mem alloc failed.\n"); + ODPH_ABORT("Error: shared mem alloc failed.\n"); memset(tun_db, 0, sizeof(*tun_db)); } diff --git a/example/ipsec_offload/odp_ipsec_offload_sp_db.c b/example/ipsec_offload/odp_ipsec_offload_sp_db.c index cfa8cb94c..ac8aa148e 100644 --- a/example/ipsec_offload/odp_ipsec_offload_sp_db.c +++ b/example/ipsec_offload/odp_ipsec_offload_sp_db.c @@ -10,9 +10,8 @@ #include <stdlib.h> #include <string.h> -#include <example_debug.h> - #include <odp.h> +#include <odp/helper/odph_api.h> #include <odp_ipsec_offload_sp_db.h> @@ -29,12 +28,12 @@ void init_sp_db(void) 0); if (shm == ODP_SHM_INVALID) - EXAMPLE_ABORT("Error: shared mem reserve failed.\n"); + ODPH_ABORT("Error: shared mem reserve failed.\n"); sp_db = odp_shm_addr(shm); if (sp_db == NULL) - EXAMPLE_ABORT("Error: shared mem alloc failed.\n"); + ODPH_ABORT("Error: shared mem alloc failed.\n"); memset(sp_db, 0, sizeof(*sp_db)); } diff --git a/example/l3fwd/odp_l3fwd.c b/example/l3fwd/odp_l3fwd.c index 4bf265863..79613d672 100644 --- a/example/l3fwd/odp_l3fwd.c +++ b/example/l3fwd/odp_l3fwd.c @@ -11,8 +11,6 @@ #include <unistd.h> #include <inttypes.h> -#include <example_debug.h> - #include <odp_api.h> #include <odp/helper/odph_api.h> @@ -317,7 +315,7 @@ static int run_worker(void *arg) } if (num_pktio == 0) - EXAMPLE_ABORT("No pktio devices found\n"); + ODPH_ABORT("No pktio devices found\n"); if_idx = input_ifs[pktio]; inq = input_queues[pktio]; @@ -735,31 +733,28 @@ 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) - 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); + ODPH_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]) - EXAMPLE_ABORT("Error queue (%d, %d, %d)," - " reconfig queue\n", - q->if_idx, q->rxq_idx, q->core_idx); + ODPH_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) - 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); + ODPH_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) { - EXAMPLE_ABORT("Error queue (%d, %d, %d), max queue %d\n", - q->if_idx, q->rxq_idx, q->core_idx, - port->nb_rxq - 1); + ODPH_ABORT("Error queue (%d, %d, %d), max queue %d\n", + q->if_idx, q->rxq_idx, q->core_idx, + port->nb_rxq - 1); } port->rxq_idx = q->rxq_idx + 1; @@ -820,8 +815,8 @@ static void setup_worker_qconf(app_args_t *args) } if (odp_pktin_queue_config(port->pktio, &in_queue_param)) - EXAMPLE_ABORT("Fail to config input queue for port %s\n", - name); + ODPH_ABORT("Fail to config input queue for port %s\n", + name); out_queue_param.num_queues = port->txq_idx; if (port->txq_idx > port->nb_txq) { @@ -829,20 +824,20 @@ 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)) - EXAMPLE_ABORT("Fail to config output queue for port %s\n", - name); + ODPH_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) - EXAMPLE_ABORT("Fail to set pktin queue for port %s\n", - name); + ODPH_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) - EXAMPLE_ABORT("Fail to set pktout queue for port %s\n", - name); + ODPH_ABORT("Fail to set pktout queue for port %s\n", + name); } } diff --git a/example/l3fwd/odp_l3fwd_db.c b/example/l3fwd/odp_l3fwd_db.c index a27801a5a..a4e4681f6 100644 --- a/example/l3fwd/odp_l3fwd_db.c +++ b/example/l3fwd/odp_l3fwd_db.c @@ -11,8 +11,9 @@ #include <stdlib.h> #include <string.h> -#include <example_debug.h> #include <odp_api.h> +#include <odp/helper/odph_api.h> + #include <odp_l3fwd_db.h> /** Jenkins hash support. @@ -203,13 +204,13 @@ static void create_fwd_hash_cache(void) hash_shm = odp_shm_reserve("flow_table", size, ODP_CACHE_LINE_SIZE, 0); if (hash_shm == ODP_SHM_INVALID) { - EXAMPLE_ERR("Error: shared mem reserve failed.\n"); + ODPH_ERR("Error: shared mem reserve failed.\n"); exit(EXIT_FAILURE); } bucket = odp_shm_addr(hash_shm); if (!bucket) { - EXAMPLE_ERR("Error: shared mem alloc failed.\n"); + ODPH_ERR("Error: shared mem alloc failed.\n"); exit(-1); } } @@ -349,14 +350,14 @@ void init_fwd_db(void) 0); if (shm == ODP_SHM_INVALID) { - EXAMPLE_ERR("Error: shared mem reserve failed.\n"); + ODPH_ERR("Error: shared mem reserve failed.\n"); exit(EXIT_FAILURE); } fwd_db = odp_shm_addr(shm); if (fwd_db == NULL) { - EXAMPLE_ERR("Error: shared mem alloc failed.\n"); + ODPH_ERR("Error: shared mem alloc failed.\n"); exit(EXIT_FAILURE); } memset(fwd_db, 0, sizeof(*fwd_db)); diff --git a/example/l3fwd/odp_l3fwd_lpm.c b/example/l3fwd/odp_l3fwd_lpm.c index f88303399..7eb32b5d0 100644 --- a/example/l3fwd/odp_l3fwd_lpm.c +++ b/example/l3fwd/odp_l3fwd_lpm.c @@ -10,8 +10,8 @@ #include <stdio.h> #include <stdlib.h> -#include <example_debug.h> #include <odp_api.h> +#include <odp/helper/odph_api.h> #include <odp_l3fwd_lpm.h> @@ -155,13 +155,13 @@ void fib_tbl_init(void) /*Reserve memory for Routing hash table*/ lpm_shm = odp_shm_reserve("fib_lpm_sub", size, ODP_CACHE_LINE_SIZE, 0); if (lpm_shm == ODP_SHM_INVALID) { - EXAMPLE_ERR("Error: shared mem reserve failed.\n"); + ODPH_ERR("Error: shared mem reserve failed.\n"); exit(EXIT_FAILURE); } fe = odp_shm_addr(lpm_shm); if (!fe) { - EXAMPLE_ERR("Error: shared mem alloc failed for lpm cache.\n"); + ODPH_ERR("Error: shared mem alloc failed for lpm cache.\n"); exit(-1); } diff --git a/example/packet/odp_pktio.c b/example/packet/odp_pktio.c index 55e217e54..24aa039d5 100644 --- a/example/packet/odp_pktio.c +++ b/example/packet/odp_pktio.c @@ -10,8 +10,6 @@ #include <unistd.h> #include <inttypes.h> -#include <example_debug.h> - #include <odp_api.h> #include <odp/helper/odph_api.h> @@ -133,13 +131,13 @@ static odp_pktio_t create_pktio(const char *dev, odp_pool_t pool, int mode) pktio_param.in_mode = ODP_PKTIN_MODE_SCHED; break; default: - EXAMPLE_ABORT("invalid mode %d\n", mode); + ODPH_ABORT("invalid mode %d\n", mode); } /* Open a packet IO instance */ pktio = odp_pktio_open(dev, pool, &pktio_param); if (pktio == ODP_PKTIO_INVALID) - EXAMPLE_ABORT("Error: pktio create failed for %s\n", dev); + ODPH_ABORT("Error: pktio create failed for %s\n", dev); odp_pktin_queue_param_init(&pktin_param); @@ -147,14 +145,14 @@ static odp_pktio_t create_pktio(const char *dev, odp_pool_t pool, int mode) pktin_param.queue_param.sched.sync = ODP_SCHED_SYNC_ATOMIC; if (odp_pktin_queue_config(pktio, &pktin_param)) - EXAMPLE_ABORT("Error: pktin config failed for %s\n", dev); + ODPH_ABORT("Error: pktin config failed for %s\n", dev); if (odp_pktout_queue_config(pktio, NULL)) - EXAMPLE_ABORT("Error: pktout config failed for %s\n", dev); + ODPH_ABORT("Error: pktout config failed for %s\n", dev); ret = odp_pktio_start(pktio); if (ret != 0) - EXAMPLE_ABORT("Error: unable to start %s\n", dev); + ODPH_ABORT("Error: unable to start %s\n", dev); printf(" created pktio:%02" PRIu64 ", dev:%s, queue mode (ATOMIC queues)\n" @@ -188,8 +186,8 @@ static int pktio_queue_thread(void *arg) pktio = odp_pktio_lookup(thr_args->pktio_dev); if (pktio == ODP_PKTIO_INVALID) { - EXAMPLE_ERR(" [%02i] Error: lookup of pktio %s failed\n", - thr, thr_args->pktio_dev); + ODPH_ERR(" [%02i] Error: lookup of pktio %s failed\n", + thr, thr_args->pktio_dev); return -1; } @@ -202,8 +200,8 @@ static int pktio_queue_thread(void *arg) if ((thr_args->mode == APPL_MODE_PKT_QUEUE) && (odp_pktin_event_queue(pktio, &inq, 1) != 1)) { - EXAMPLE_ERR(" [%02i] Error: no input queue for %s\n", - thr, thr_args->pktio_dev); + ODPH_ERR(" [%02i] Error: no input queue for %s\n", + thr, thr_args->pktio_dev); return -1; } @@ -225,14 +223,14 @@ static int pktio_queue_thread(void *arg) /* Drop packets with errors */ if (odp_unlikely(drop_err_pkts(&pkt, 1) == 0)) { - EXAMPLE_ERR("Drop frame - err_cnt:%lu\n", ++err_cnt); + ODPH_ERR("Drop frame - err_cnt:%lu\n", ++err_cnt); continue; } pktio_tmp = odp_packet_input(pkt); if (odp_pktout_queue(pktio_tmp, &pktout, 1) != 1) { - EXAMPLE_ERR(" [%02i] Error: no pktout queue\n", thr); + ODPH_ERR(" [%02i] Error: no pktout queue\n", thr); return -1; } @@ -241,7 +239,7 @@ static int pktio_queue_thread(void *arg) /* Enqueue the packet for output */ if (odp_pktout_send(pktout, &pkt, 1) != 1) { - EXAMPLE_ERR(" [%i] Packet send failed.\n", thr); + ODPH_ERR(" [%i] Packet send failed.\n", thr); odp_packet_free(pkt); continue; } @@ -279,8 +277,8 @@ static int pktio_ifburst_thread(void *arg) pktio = odp_pktio_lookup(thr_args->pktio_dev); if (pktio == ODP_PKTIO_INVALID) { - EXAMPLE_ERR(" [%02i] Error: lookup of pktio %s failed\n", - thr, thr_args->pktio_dev); + ODPH_ERR(" [%02i] Error: lookup of pktio %s failed\n", + thr, thr_args->pktio_dev); return -1; } @@ -288,12 +286,12 @@ static int pktio_ifburst_thread(void *arg) thr, odp_pktio_to_u64(pktio)); if (odp_pktin_queue(pktio, &pktin, 1) != 1) { - EXAMPLE_ERR(" [%02i] Error: no pktin queue\n", thr); + ODPH_ERR(" [%02i] Error: no pktin queue\n", thr); return -1; } if (odp_pktout_queue(pktio, &pktout, 1) != 1) { - EXAMPLE_ERR(" [%02i] Error: no pktout queue\n", thr); + ODPH_ERR(" [%02i] Error: no pktout queue\n", thr); return -1; } @@ -320,8 +318,8 @@ static int pktio_ifburst_thread(void *arg) } if (odp_unlikely(pkts_ok != pkts)) - EXAMPLE_ERR("Dropped frames:%u - err_cnt:%lu\n", - pkts-pkts_ok, ++err_cnt); + ODPH_ERR("Dropped frames:%u - err_cnt:%lu\n", + pkts - pkts_ok, ++err_cnt); /* Print packet counts every once in a while */ tmp += pkts_ok; @@ -360,7 +358,7 @@ int main(int argc, char *argv[]) /* Let helper collect its own arguments (e.g. --odph_proc) */ argc = odph_parse_options(argc, argv); if (odph_options(&helper_options)) { - EXAMPLE_ERR("Error: reading ODP helper options failed.\n"); + ODPH_ERR("Error: reading ODP helper options failed.\n"); exit(EXIT_FAILURE); } @@ -369,13 +367,13 @@ int main(int argc, char *argv[]) /* Init ODP before calling anything else */ if (odp_init_global(&instance, &init_param, NULL)) { - EXAMPLE_ERR("Error: ODP global init failed.\n"); + ODPH_ERR("Error: ODP global init failed.\n"); exit(EXIT_FAILURE); } /* Init this thread */ if (odp_init_local(instance, ODP_THREAD_CONTROL)) { - EXAMPLE_ERR("Error: ODP local init failed.\n"); + ODPH_ERR("Error: ODP local init failed.\n"); exit(EXIT_FAILURE); } @@ -383,13 +381,13 @@ int main(int argc, char *argv[]) shm = odp_shm_reserve("_appl_global_data", sizeof(args_t), ODP_CACHE_LINE_SIZE, 0); if (shm == ODP_SHM_INVALID) { - EXAMPLE_ERR("Error: shared mem reserve failed.\n"); + ODPH_ERR("Error: shared mem reserve failed.\n"); exit(EXIT_FAILURE); } args = odp_shm_addr(shm); if (args == NULL) { - EXAMPLE_ERR("Error: shared mem alloc failed.\n"); + ODPH_ERR("Error: shared mem alloc failed.\n"); exit(EXIT_FAILURE); } @@ -424,7 +422,7 @@ int main(int argc, char *argv[]) pool = odp_pool_create("packet_pool", ¶ms); if (pool == ODP_POOL_INVALID) { - EXAMPLE_ERR("Error: packet pool create failed.\n"); + ODPH_ERR("Error: packet pool create failed.\n"); exit(EXIT_FAILURE); } odp_pool_print(pool); @@ -500,7 +498,7 @@ int main(int argc, char *argv[]) odp_pool_destroy(pool); if (odp_shm_free(args->shm)) { - EXAMPLE_ERR("Error: shm free global data\n"); + ODPH_ERR("Error: shm free global data\n"); exit(EXIT_FAILURE); } diff --git a/example/time/time_global_test.c b/example/time/time_global_test.c index 1e5cb0bd4..3c5d15b85 100644 --- a/example/time/time_global_test.c +++ b/example/time/time_global_test.c @@ -7,7 +7,6 @@ #include <inttypes.h> #include <odp_api.h> -#include <example_debug.h> #include <odp/helper/odph_api.h> #define MAX_WORKERS 32 @@ -106,8 +105,8 @@ static void generate_next_queue(test_globals_t *gbls, odp_queue_t *queue, *queue = odp_queue_lookup(queue_name); if (ODP_QUEUE_INVALID == *queue) - EXAMPLE_ABORT("Cannot lookup thread queue \"%s\", thread %d\n", - queue_name, thr); + ODPH_ABORT("Cannot lookup thread queue \"%s\", thread %d\n", + queue_name, thr); } static void test_global_timestamps(test_globals_t *gbls, @@ -134,11 +133,11 @@ static void test_global_timestamps(test_globals_t *gbls, time = odp_time_global(); if (odp_time_cmp(time, timestamp_ev->timestamp) < 0) { - EXAMPLE_ERR("timestamp is less than previous time_prev=%" - PRIu64 "ns, time_next=%" - PRIu64 "ns, thread %d\n", - odp_time_to_ns(timestamp_ev->timestamp), - odp_time_to_ns(time), thr); + ODPH_ERR("timestamp is less than previous time_prev=%" + PRIu64 "ns, time_next=%" + PRIu64 "ns, thread %d\n", + odp_time_to_ns(timestamp_ev->timestamp), + odp_time_to_ns(time), thr); odp_atomic_inc_u32(&gbls->err_counter); } @@ -152,11 +151,10 @@ static void test_global_timestamps(test_globals_t *gbls, generate_next_queue(gbls, &queue_next, id); timestamp_ev->timestamp = time; if (odp_queue_enq(queue_next, ev)) - EXAMPLE_ABORT("Cannot enqueue event %" - PRIu64 " on queue %" - PRIu64 ", thread %d\n", - odp_event_to_u64(ev), - odp_queue_to_u64(queue_next), thr); + ODPH_ABORT("Cannot enqueue event %" PRIu64 " on queue " + "%" PRIu64 ", thread %d\n", + odp_event_to_u64(ev), + odp_queue_to_u64(queue_next), thr); odp_atomic_inc_u32(&gbls->iteration_counter); } @@ -194,16 +192,16 @@ static int run_thread(void *ptr) sprintf(queue_name, QUEUE_NAME_PREFIX "%d", id); queue = odp_queue_create(queue_name, NULL); if (queue == ODP_QUEUE_INVALID) - EXAMPLE_ABORT("Cannot create thread queue, thread %d", thr); + ODPH_ABORT("Cannot create thread queue, thread %d", thr); /* allocate buffer for timestamp */ buffer_pool = odp_pool_lookup("time buffers pool"); if (buffer_pool == ODP_POOL_INVALID) - EXAMPLE_ABORT("Buffer pool was not found, thread %d\n", thr); + ODPH_ABORT("Buffer pool was not found, thread %d\n", thr); buf = odp_buffer_alloc(buffer_pool); if (buf == ODP_BUFFER_INVALID) - EXAMPLE_ABORT("Buffer was not allocated, thread %d\n", thr); + ODPH_ABORT("Buffer was not allocated, thread %d\n", thr); /* wait all threads allocated their queues */ odp_barrier_wait(&gbls->start_barrier); @@ -217,10 +215,9 @@ static int run_thread(void *ptr) timestamp_ev->id = id; timestamp_ev->timestamp = odp_time_global(); if (odp_queue_enq(queue_next, ev)) - EXAMPLE_ABORT("Cannot enqueue timestamp event %" - PRIu64 " on queue %" PRIu64 ", thread %d", - odp_event_to_u64(ev), - odp_queue_to_u64(queue_next), thr); + ODPH_ABORT("Cannot enqueue timestamp event %" PRIu64 " on " + "queue %" PRIu64 ", thread %d", odp_event_to_u64(ev), + odp_queue_to_u64(queue_next), thr); test_global_timestamps(gbls, queue, id); @@ -239,8 +236,8 @@ static int run_thread(void *ptr) /* free allocated queue */ if (odp_queue_destroy(queue)) - EXAMPLE_ABORT("Cannot destroy queue %" PRIu64 "", - odp_queue_to_u64(queue)); + ODPH_ABORT("Cannot destroy queue %" PRIu64 "", + odp_queue_to_u64(queue)); printf("Thread %i exits\n", thr); fflush(NULL); @@ -271,7 +268,7 @@ int main(int argc, char *argv[]) /* Let helper collect its own arguments (e.g. --odph_proc) */ argc = odph_parse_options(argc, argv); if (odph_options(&helper_options)) { - EXAMPLE_ERR("Error: reading ODP helper options failed.\n"); + ODPH_ERR("Error: reading ODP helper options failed.\n"); exit(EXIT_FAILURE); } @@ -280,14 +277,14 @@ int main(int argc, char *argv[]) if (odp_init_global(&instance, &init_param, NULL)) { err = 1; - EXAMPLE_ERR("ODP global init failed.\n"); + ODPH_ERR("ODP global init failed.\n"); goto end; } /* Init this thread. */ if (odp_init_local(instance, ODP_THREAD_CONTROL)) { err = 1; - EXAMPLE_ERR("ODP local init failed.\n"); + ODPH_ERR("ODP local init failed.\n"); goto err_global; } @@ -298,7 +295,7 @@ int main(int argc, char *argv[]) ODP_CACHE_LINE_SIZE, 0); if (ODP_SHM_INVALID == shm_glbls) { err = 1; - EXAMPLE_ERR("Error: shared mem reserve failed.\n"); + ODPH_ERR("Error: shared mem reserve failed.\n"); goto err; } @@ -307,7 +304,7 @@ int main(int argc, char *argv[]) shm_log = odp_shm_reserve("test_log", log_size, ODP_CACHE_LINE_SIZE, 0); if (ODP_SHM_INVALID == shm_log) { err = 1; - EXAMPLE_ERR("Error: shared mem reserve failed.\n"); + ODPH_ERR("Error: shared mem reserve failed.\n"); goto err; } @@ -326,7 +323,7 @@ int main(int argc, char *argv[]) if (odp_pool_capability(&pool_capa)) { err = 1; - EXAMPLE_ERR("Error: pool capability failed.\n"); + ODPH_ERR("Error: pool capability failed.\n"); goto err; } @@ -343,7 +340,7 @@ int main(int argc, char *argv[]) pool = odp_pool_create("time buffers pool", &pool_param); if (pool == ODP_POOL_INVALID) { err = 1; - EXAMPLE_ERR("Pool create failed.\n"); + ODPH_ERR("Pool create failed.\n"); goto err; } @@ -386,7 +383,7 @@ err_global: err = 1; end: if (err) { - EXAMPLE_ERR("Err: ODP global time test failed\n\n"); + ODPH_ERR("Err: ODP global time test failed\n\n"); return -1; } diff --git a/example/timer/odp_timer_simple.c b/example/timer/odp_timer_simple.c index ddefb0d2a..8084a4568 100644 --- a/example/timer/odp_timer_simple.c +++ b/example/timer/odp_timer_simple.c @@ -13,11 +13,12 @@ #include <string.h> #include <stdlib.h> #include <inttypes.h> -#include <example_debug.h> /* ODP main header */ #include <odp_api.h> +#include <odp/helper/odph_api.h> + #define MAX(a, b) (((a) > (b)) ? (a) : (b)) int main(int argc ODP_UNUSED, char *argv[] ODP_UNUSED) @@ -101,14 +102,14 @@ int main(int argc ODP_UNUSED, char *argv[] ODP_UNUSED) tim = odp_timer_alloc(timer_pool, queue, NULL); if (tim == ODP_TIMER_INVALID) { - EXAMPLE_ERR("Failed to allocate timer\n"); + ODPH_ERR("Failed to allocate timer\n"); ret += 1; goto err; } tmo = odp_timeout_alloc(timeout_pool); if (tmo == ODP_TIMEOUT_INVALID) { - EXAMPLE_ERR("Failed to allocate timeout\n"); + ODPH_ERR("Failed to allocate timeout\n"); return -1; } @@ -131,16 +132,15 @@ int main(int argc ODP_UNUSED, char *argv[] ODP_UNUSED) rc = odp_timer_set_abs(tim, tick + period, &ev); /* Too early or too late timeout requested */ if (odp_unlikely(rc != ODP_TIMER_SUCCESS)) - EXAMPLE_ABORT("odp_timer_set_abs() failed: %d\n", - rc); + ODPH_ABORT("odp_timer_set_abs() failed: %d\n", rc); /* Wait for 2 seconds for timeout action to be generated */ ev = odp_schedule(&queue, sched_tmo); if (ev == ODP_EVENT_INVALID) - EXAMPLE_ABORT("Invalid event\n"); + ODPH_ABORT("Invalid event\n"); if (odp_event_type(ev) != ODP_EVENT_TIMEOUT) - EXAMPLE_ABORT("Unexpected event type (%u) received\n", - odp_event_type(ev)); + ODPH_ABORT("Unexpected event type (%u) received\n", + odp_event_type(ev)); time = odp_time_global(); printf("timer tick %d, time ns %" PRIu64 "\n", diff --git a/example/timer/odp_timer_test.c b/example/timer/odp_timer_test.c index ca3e8ddf5..a6c8dc73f 100644 --- a/example/timer/odp_timer_test.c +++ b/example/timer/odp_timer_test.c @@ -8,8 +8,6 @@ #include <stdlib.h> #include <inttypes.h> -#include <example_debug.h> - /* ODP main header */ #include <odp_api.h> @@ -92,28 +90,28 @@ static void test_abs_timeouts(int thr, test_globals_t *gbls) odp_timeout_t tmo; uint32_t num_workers = gbls->num_workers; - EXAMPLE_DBG(" [%i] test_timeouts\n", thr); + ODPH_DBG(" [%i] test_timeouts\n", thr); queue = odp_queue_lookup("timer_queue"); period_ns = gbls->args.period_us * ODP_TIME_USEC_IN_NS; period = odp_timer_ns_to_tick(gbls->tp, period_ns); - EXAMPLE_DBG(" [%i] period %"PRIu64" ticks, %"PRIu64" ns\n", thr, - period, period_ns); + ODPH_DBG(" [%i] period %" PRIu64 " ticks, %" PRIu64 " ns\n", thr, + period, period_ns); - EXAMPLE_DBG(" [%i] current tick %"PRIu64"\n", thr, - odp_timer_current_tick(gbls->tp)); + ODPH_DBG(" [%i] current tick %" PRIu64 "\n", thr, + odp_timer_current_tick(gbls->tp)); ttp = &gbls->tt[thr]; ttp->tim = odp_timer_alloc(gbls->tp, queue, ttp); if (ttp->tim == ODP_TIMER_INVALID) { - EXAMPLE_ERR("Failed to allocate timer\n"); + ODPH_ERR("Failed to allocate timer\n"); return; } tmo = odp_timeout_alloc(gbls->pool); if (tmo == ODP_TIMEOUT_INVALID) { - EXAMPLE_ERR("Failed to allocate timeout\n"); + ODPH_ERR("Failed to allocate timeout\n"); return; } ttp->ev = odp_timeout_to_event(tmo); @@ -129,8 +127,8 @@ static void test_abs_timeouts(int thr, test_globals_t *gbls) rc = odp_timer_set_abs(ttp->tim, tick, &ttp->ev); if (odp_unlikely(rc != ODP_TIMER_SUCCESS)) { /* Too early or too late timeout requested */ - EXAMPLE_ABORT("odp_timer_set_abs() failed: %s\n", - timerset2str(rc)); + ODPH_ABORT("odp_timer_set_abs() failed: %s\n", + timerset2str(rc)); } } @@ -148,7 +146,7 @@ static void test_abs_timeouts(int thr, test_globals_t *gbls) * are no remaining timeouts to receive */ if (++wait > WAIT_NUM && odp_atomic_load_u32(&gbls->remain) < num_workers) - EXAMPLE_ABORT("At least one TMO was lost\n"); + ODPH_ABORT("At least one TMO was lost\n"); } while (ev == ODP_EVENT_INVALID && (int)odp_atomic_load_u32(&gbls->remain) > 0); @@ -156,8 +154,8 @@ static void test_abs_timeouts(int thr, test_globals_t *gbls) break; /* No more timeouts */ if (odp_event_type(ev) != ODP_EVENT_TIMEOUT) { /* Not a default timeout event */ - EXAMPLE_ABORT("Unexpected event type (%u) received\n", - odp_event_type(ev)); + ODPH_ABORT("Unexpected event type (%u) received\n", + odp_event_type(ev)); } odp_timeout_t tmo = odp_timeout_from_event(ev); tick = odp_timeout_tick(tmo); @@ -166,18 +164,18 @@ static void test_abs_timeouts(int thr, test_globals_t *gbls) if (!odp_timeout_fresh(tmo)) { /* Not the expected expiration tick, timer has * been reset or cancelled or freed */ - EXAMPLE_ABORT("Unexpected timeout received (timer " - "%" PRIu64", tick %" PRIu64 ")\n", - odp_timer_to_u64(ttp->tim), tick); + ODPH_ABORT("Unexpected timeout received (timer " + "%" PRIu64 ", tick %" PRIu64 ")\n", + odp_timer_to_u64(ttp->tim), tick); } - EXAMPLE_DBG(" [%i] timeout, tick %"PRIu64"\n", thr, tick); + ODPH_DBG(" [%i] timeout, tick %" PRIu64 "\n", thr, tick); uint32_t rx_num = odp_atomic_fetch_dec_u32(&gbls->remain); if (!rx_num) - EXAMPLE_ABORT("Unexpected timeout received (timer " - "%" PRIu64 ", tick %" PRIu64 ")\n", - odp_timer_to_u64(ttp->tim), tick); + ODPH_ABORT("Unexpected timeout received (timer " + "%" PRIu64 ", tick %" PRIu64 ")\n", + odp_timer_to_u64(ttp->tim), tick); else if (rx_num > num_workers) continue; @@ -215,7 +213,7 @@ static int run_thread(void *ptr) msg_pool = odp_pool_lookup("msg_pool"); if (msg_pool == ODP_POOL_INVALID) { - EXAMPLE_ERR(" [%i] msg_pool not found\n", thr); + ODPH_ERR(" [%i] msg_pool not found\n", thr); return -1; } @@ -354,7 +352,7 @@ int main(int argc, char *argv[]) /* Let helper collect its own arguments (e.g. --odph_proc) */ argc = odph_parse_options(argc, argv); if (odph_options(&helper_options)) { - EXAMPLE_ERR("Error: reading ODP helper options failed.\n"); + ODPH_ERR("Error: reading ODP helper options failed.\n"); exit(EXIT_FAILURE); } @@ -382,14 +380,14 @@ int main(int argc, char *argv[]) ODP_CACHE_LINE_SIZE, 0); if (ODP_SHM_INVALID == shm) { err = 1; - EXAMPLE_ERR("Error: shared mem reserve failed.\n"); + ODPH_ERR("Error: shared mem reserve failed.\n"); goto err; } gbls = odp_shm_addr(shm); if (NULL == gbls) { err = 1; - EXAMPLE_ERR("Error: shared mem alloc failed.\n"); + ODPH_ERR("Error: shared mem alloc failed.\n"); goto err; } memset(gbls, 0, sizeof(test_globals_t)); @@ -432,7 +430,7 @@ int main(int argc, char *argv[]) if (gbls->pool == ODP_POOL_INVALID) { err = 1; - EXAMPLE_ERR("Pool create failed.\n"); + ODPH_ERR("Pool create failed.\n"); goto err; } @@ -445,7 +443,7 @@ int main(int argc, char *argv[]) gbls->tp = odp_timer_pool_create("timer_pool", &tparams); if (gbls->tp == ODP_TIMER_POOL_INVALID) { err = 1; - EXAMPLE_ERR("Timer pool create failed.\n"); + ODPH_ERR("Timer pool create failed.\n"); goto err; } odp_timer_pool_start(); @@ -473,7 +471,7 @@ int main(int argc, char *argv[]) if (queue == ODP_QUEUE_INVALID) { err = 1; - EXAMPLE_ERR("Timer queue create failed.\n"); + ODPH_ERR("Timer queue create failed.\n"); goto err; } diff --git a/example/traffic_mgmt/odp_traffic_mgmt.c b/example/traffic_mgmt/odp_traffic_mgmt.c index dbc659589..c80e03bab 100644 --- a/example/traffic_mgmt/odp_traffic_mgmt.c +++ b/example/traffic_mgmt/odp_traffic_mgmt.c @@ -8,14 +8,16 @@ #define _GNU_SOURCE -#include <unistd.h> -#include <signal.h> -#include <string.h> +#include <execinfo.h> #include <inttypes.h> +#include <signal.h> #include <sys/resource.h> -#include <execinfo.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <unistd.h> + #include <odp_api.h> -#include <example_debug.h> #define NUM_SVC_CLASSES 4 #define USERS_PER_SVC_CLASS 2 |