From: "McDaniel, Timothy" <timothy.mcdan...@intel.com> Previous implementation traced u8 disable_impl_release, which is now a bit field contained in the new u32 event_port_cfg field.
Signed-off-by: McDaniel, Timothy <timothy.mcdan...@intel.com> --- lib/librte_eventdev/rte_event_crypto_adapter.c | 2 +- lib/librte_eventdev/rte_event_eth_tx_adapter.c | 5 +++-- lib/librte_eventdev/rte_eventdev.c | 3 +-- lib/librte_eventdev/rte_eventdev_trace.h | 9 +++++---- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/lib/librte_eventdev/rte_event_crypto_adapter.c b/lib/librte_eventdev/rte_event_crypto_adapter.c index 8f25933..2717857 100644 --- a/lib/librte_eventdev/rte_event_crypto_adapter.c +++ b/lib/librte_eventdev/rte_event_crypto_adapter.c @@ -269,7 +269,7 @@ struct crypto_queue_pair_info { event_crypto_adapter[id] = adapter; rte_eventdev_trace_crypto_adapter_create(id, dev_id, adapter, conf_arg, - mode); + mode); return 0; } diff --git a/lib/librte_eventdev/rte_event_eth_tx_adapter.c b/lib/librte_eventdev/rte_event_eth_tx_adapter.c index 8a72256..a8a010e 100644 --- a/lib/librte_eventdev/rte_event_eth_tx_adapter.c +++ b/lib/librte_eventdev/rte_event_eth_tx_adapter.c @@ -943,8 +943,9 @@ static int txa_service_queue_del(uint8_t id, txa_dev_id_array[id] = TXA_INVALID_DEV_ID; return ret; } + rte_eventdev_trace_eth_tx_adapter_create(id, dev_id, NULL, port_conf, - ret); + ret); txa_dev_id_array[id] = dev_id; return 0; } @@ -987,7 +988,7 @@ static int txa_service_queue_del(uint8_t id, } rte_eventdev_trace_eth_tx_adapter_create(id, dev_id, conf_cb, conf_arg, - ret); + ret); txa_dev_id_array[id] = dev_id; return 0; } diff --git a/lib/librte_eventdev/rte_eventdev.c b/lib/librte_eventdev/rte_eventdev.c index db2f9b7..550de73 100644 --- a/lib/librte_eventdev/rte_eventdev.c +++ b/lib/librte_eventdev/rte_eventdev.c @@ -816,6 +816,7 @@ diag = rte_event_port_unlink(dev_id, port_id, NULL, 0); rte_eventdev_trace_port_setup(dev_id, port_id, port_conf, diag); + if (diag < 0) return diag; @@ -1425,10 +1426,8 @@ struct rte_eventdev * eventdev->data = eventdev_data; if (rte_eal_process_type() == RTE_PROC_PRIMARY) { - strlcpy(eventdev->data->name, name, RTE_EVENTDEV_NAME_MAX_LEN); - eventdev->data->dev_id = dev_id; eventdev->data->socket_id = socket_id; eventdev->data->dev_started = 0; diff --git a/lib/librte_eventdev/rte_eventdev_trace.h b/lib/librte_eventdev/rte_eventdev_trace.h index 4de6341..5dd72d9 100644 --- a/lib/librte_eventdev/rte_eventdev_trace.h +++ b/lib/librte_eventdev/rte_eventdev_trace.h @@ -53,13 +53,14 @@ RTE_TRACE_POINT( rte_eventdev_trace_port_setup, RTE_TRACE_POINT_ARGS(uint8_t dev_id, uint8_t port_id, - const struct rte_event_port_conf *port_conf, int rc), + const struct rte_event_port_conf *port_conf, + int rc), rte_trace_point_emit_u8(dev_id); rte_trace_point_emit_u8(port_id); rte_trace_point_emit_i32(port_conf->new_event_threshold); rte_trace_point_emit_u16(port_conf->dequeue_depth); rte_trace_point_emit_u16(port_conf->enqueue_depth); - rte_trace_point_emit_u8(port_conf->disable_implicit_release); + rte_trace_point_emit_u32(port_conf->event_port_cfg); rte_trace_point_emit_int(rc); ) @@ -165,7 +166,7 @@ rte_trace_point_emit_i32(port_conf->new_event_threshold); rte_trace_point_emit_u16(port_conf->dequeue_depth); rte_trace_point_emit_u16(port_conf->enqueue_depth); - rte_trace_point_emit_u8(port_conf->disable_implicit_release); + rte_trace_point_emit_u32(port_conf->event_port_cfg); rte_trace_point_emit_ptr(conf_cb); rte_trace_point_emit_int(rc); ) @@ -257,7 +258,7 @@ rte_trace_point_emit_i32(port_conf->new_event_threshold); rte_trace_point_emit_u16(port_conf->dequeue_depth); rte_trace_point_emit_u16(port_conf->enqueue_depth); - rte_trace_point_emit_u8(port_conf->disable_implicit_release); + rte_trace_point_emit_u32(port_conf->event_port_cfg); ) RTE_TRACE_POINT( -- 1.7.10