X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Futils_dpdk.h;h=d4551d86f4190131945becd5dde42e905195efc6;hb=1ae2c06ca9744a592696115b69c1d8785a4bd7f7;hp=a4731d03e394aef556b5cc04e40fedda61839aaa;hpb=6afa9f179a95e0d75ed9c277e864ad47e87477ef;p=collectd.git diff --git a/src/utils_dpdk.h b/src/utils_dpdk.h index a4731d03..d4551d86 100644 --- a/src/utils_dpdk.h +++ b/src/utils_dpdk.h @@ -37,15 +37,6 @@ #define ERR_BUF_SIZE 1024 -#if RTE_VER_RELEASE == 16 && RTE_VER_MINOR == 0 -#if RTE_VER_MONTH == 4 -#define DPDK_VER_16_04 RTE_VERSION_NUM(16, 4, 0, 16) -#endif -#if RTE_VER_MONTH == 7 -#define DPDK_VER_16_07 RTE_VERSION_NUM(16, 7, 0, 16) -#endif -#endif - enum DPDK_CMD { DPDK_CMD_NONE = 0, DPDK_CMD_QUIT, @@ -59,8 +50,9 @@ struct dpdk_eal_config_s { char coremask[DATA_MAX_NAME_LEN]; char memory_channels[DATA_MAX_NAME_LEN]; char socket_memory[DATA_MAX_NAME_LEN]; - char process_type[DATA_MAX_NAME_LEN]; char file_prefix[DATA_MAX_NAME_LEN]; + char log_level[DATA_MAX_NAME_LEN]; + char rte_driver_lib_path[PATH_MAX]; }; typedef struct dpdk_eal_config_s dpdk_eal_config_t; @@ -74,7 +66,7 @@ typedef struct dpdk_helper_ctx_s dpdk_helper_ctx_t; int dpdk_helper_init(const char *name, size_t data_size, dpdk_helper_ctx_t **pphc); -int dpdk_helper_shutdown(dpdk_helper_ctx_t *phc); +void dpdk_helper_shutdown(dpdk_helper_ctx_t *phc); int dpdk_helper_eal_config_parse(dpdk_helper_ctx_t *phc, oconfig_item_t *ci); int dpdk_helper_eal_config_set(dpdk_helper_ctx_t *phc, dpdk_eal_config_t *ec); int dpdk_helper_eal_config_get(dpdk_helper_ctx_t *phc, dpdk_eal_config_t *ec); @@ -82,6 +74,7 @@ int dpdk_helper_command(dpdk_helper_ctx_t *phc, enum DPDK_CMD cmd, int *result, cdtime_t cmd_wait_time); void *dpdk_helper_priv_get(dpdk_helper_ctx_t *phc); int dpdk_helper_data_size_get(dpdk_helper_ctx_t *phc); +uint8_t dpdk_helper_eth_dev_count(void); /* forward declaration of handler function that is called by helper from * child process. not implemented in helper. must be provided by client. */