X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Feventdev%2Frte_event_timer_adapter.c;h=e0d978d641225d05fee96774ef75ea71bb00ab27;hb=c6db4a15749c497d162f035130887f3fd83b7892;hp=af76b77a19d6b00e6b15980fa0248e639bf82c69;hpb=f3f3a91788ade63aff8b1254910cdf99e3ae53af;p=dpdk.git

diff --git a/lib/eventdev/rte_event_timer_adapter.c b/lib/eventdev/rte_event_timer_adapter.c
index af76b77a19..e0d978d641 100644
--- a/lib/eventdev/rte_event_timer_adapter.c
+++ b/lib/eventdev/rte_event_timer_adapter.c
@@ -6,25 +6,21 @@
 #include <string.h>
 #include <inttypes.h>
 #include <stdbool.h>
-#include <sys/queue.h>
 
 #include <rte_memzone.h>
-#include <rte_memory.h>
-#include <rte_dev.h>
 #include <rte_errno.h>
 #include <rte_malloc.h>
-#include <rte_ring.h>
 #include <rte_mempool.h>
 #include <rte_common.h>
 #include <rte_timer.h>
 #include <rte_service_component.h>
-#include <rte_cycles.h>
+#include <rte_telemetry.h>
 
 #include "event_timer_adapter_pmd.h"
 #include "eventdev_pmd.h"
 #include "rte_event_timer_adapter.h"
 #include "rte_eventdev.h"
-#include "rte_eventdev_trace.h"
+#include "eventdev_trace.h"
 
 #define DATA_MZ_NAME_MAX_LEN 64
 #define DATA_MZ_NAME_FORMAT "rte_event_timer_adapter_data_%d"
@@ -525,7 +521,7 @@ event_buffer_flush(struct event_buffer *bufp, uint8_t dev_id, uint8_t port_id,
 
 	RTE_ASSERT(head_idx < EVENT_BUFFER_SZ && tail_idx < EVENT_BUFFER_SZ);
 
-	/* Determine the largest contigous run we can attempt to enqueue to the
+	/* Determine the largest contiguous run we can attempt to enqueue to the
 	 * event device.
 	 */
 	if (head_idx > tail_idx)
@@ -786,6 +782,9 @@ swtim_service_func(void *arg)
 		sw->stats.adapter_tick_count++;
 	}
 
+	rte_event_maintain(adapter->data->event_dev_id,
+			   adapter->data->event_port_id, 0);
+
 	return 0;
 }
 
@@ -1251,3 +1250,93 @@ static const struct event_timer_adapter_ops swtim_ops = {
 	.arm_tmo_tick_burst = swtim_arm_tmo_tick_burst,
 	.cancel_burst = swtim_cancel_burst,
 };
+
+static int
+handle_ta_info(const char *cmd __rte_unused, const char *params,
+		struct rte_tel_data *d)
+{
+	struct rte_event_timer_adapter_info adapter_info;
+	struct rte_event_timer_adapter *adapter;
+	uint16_t adapter_id;
+	int ret;
+
+	if (params == NULL || strlen(params) == 0 || !isdigit(*params))
+		return -1;
+
+	adapter_id = atoi(params);
+
+	if (adapter_id >= RTE_EVENT_TIMER_ADAPTER_NUM_MAX) {
+		EVTIM_LOG_ERR("Invalid timer adapter id %u", adapter_id);
+		return -EINVAL;
+	}
+
+	adapter = &adapters[adapter_id];
+
+	ret = rte_event_timer_adapter_get_info(adapter, &adapter_info);
+	if (ret < 0) {
+		EVTIM_LOG_ERR("Failed to get info for timer adapter id %u", adapter_id);
+		return ret;
+	}
+
+	rte_tel_data_start_dict(d);
+	rte_tel_data_add_dict_u64(d, "timer_adapter_id", adapter_id);
+	rte_tel_data_add_dict_u64(d, "min_resolution_ns", adapter_info.min_resolution_ns);
+	rte_tel_data_add_dict_u64(d, "max_tmo_ns", adapter_info.max_tmo_ns);
+	rte_tel_data_add_dict_u64(d, "event_dev_id", adapter_info.conf.event_dev_id);
+	rte_tel_data_add_dict_u64(d, "socket_id", adapter_info.conf.socket_id);
+	rte_tel_data_add_dict_u64(d, "clk_src", adapter_info.conf.clk_src);
+	rte_tel_data_add_dict_u64(d, "timer_tick_ns", adapter_info.conf.timer_tick_ns);
+	rte_tel_data_add_dict_u64(d, "nb_timers", adapter_info.conf.nb_timers);
+	rte_tel_data_add_dict_u64(d, "flags", adapter_info.conf.flags);
+
+	return 0;
+}
+
+static int
+handle_ta_stats(const char *cmd __rte_unused, const char *params,
+		struct rte_tel_data *d)
+{
+	struct rte_event_timer_adapter_stats stats;
+	struct rte_event_timer_adapter *adapter;
+	uint16_t adapter_id;
+	int ret;
+
+	if (params == NULL || strlen(params) == 0 || !isdigit(*params))
+		return -1;
+
+	adapter_id = atoi(params);
+
+	if (adapter_id >= RTE_EVENT_TIMER_ADAPTER_NUM_MAX) {
+		EVTIM_LOG_ERR("Invalid timer adapter id %u", adapter_id);
+		return -EINVAL;
+	}
+
+	adapter = &adapters[adapter_id];
+
+	ret = rte_event_timer_adapter_stats_get(adapter, &stats);
+	if (ret < 0) {
+		EVTIM_LOG_ERR("Failed to get stats for timer adapter id %u", adapter_id);
+		return ret;
+	}
+
+	rte_tel_data_start_dict(d);
+	rte_tel_data_add_dict_u64(d, "timer_adapter_id", adapter_id);
+	rte_tel_data_add_dict_u64(d, "evtim_exp_count", stats.evtim_exp_count);
+	rte_tel_data_add_dict_u64(d, "ev_enq_count", stats.ev_enq_count);
+	rte_tel_data_add_dict_u64(d, "ev_inv_count", stats.ev_inv_count);
+	rte_tel_data_add_dict_u64(d, "evtim_retry_count", stats.evtim_retry_count);
+	rte_tel_data_add_dict_u64(d, "adapter_tick_count", stats.adapter_tick_count);
+
+	return 0;
+}
+
+RTE_INIT(ta_init_telemetry)
+{
+	rte_telemetry_register_cmd("/eventdev/ta_info",
+		handle_ta_info,
+		"Returns Timer adapter info. Parameter: Timer adapter id");
+
+	rte_telemetry_register_cmd("/eventdev/ta_stats",
+		handle_ta_stats,
+		"Returns Timer adapter stats. Parameter: Timer adapter id");
+}