trace-cmd: Add "tracecmd_" to namespace of filter hash

PATCH New Steven Rostedt 1 participant 1 message Jun 21, 2018

lore

Share & tools

lore

Steven Rostedt

author

2018-06-21 15:47 UTC #0 lore raw

PATCH 4/5 trace-cmd: Add "tracecmd_" to namespace of filter hash

From: "Steven Rostedt (VMware)" <[email protected]>

Now that the trace filter hash code is integrated in libtracecmd.a, it needs to have its own name space. Prefix "tracecmd_" to all the structures and functions that is used.

Signed-off-by Steven Rostedt (VMware) <[email protected]>

---
 include/trace-cmd/trace-filter-hash.h   |  35 +++----
 kernel-shark/include/kernel-shark.h     |   4 +-
 kernel-shark/include/trace-filter.h     |  12 +--
 kernel-shark/include/trace-graph.h      |  16 ++--
 kernel-shark/include/trace-view-store.h |  14 +--
 kernel-shark/include/trace-view.h       |   4 +-
 kernel-shark/kernel-shark.c             | 120 ++++++++++++------------
 kernel-shark/trace-filter.c             |  22 ++---
 kernel-shark/trace-graph.c              |  72 +++++++-------
 kernel-shark/trace-view-main.c          |  40 ++++----
 kernel-shark/trace-view-store.c         |  36 +++----
 kernel-shark/trace-view.c               |   4 +-
 lib/trace-cmd/trace-filter-hash.c       |  48 +++++-----
 13 files changed, 217 insertions(+), 210 deletions(-)

include/trace-cmd/trace-filter-hash.h +19 ~~-16~~

index cfc9115c15ce..6f4ee3c15417 100644
@@ -23,27 +23,30 @@
 
 #include <stdint.h>
 
-struct filter_id_item {
-	struct filter_id_item	*next;
-	int			id;
+struct tracecmd_filter_id_item {
+	struct tracecmd_filter_id_item	*next;
+	int				id;
 };
 
-struct filter_id {
-	struct filter_id_item **hash;
-	int			count;
+struct tracecmd_filter_id {
+	struct tracecmd_filter_id_item **hash;
+	int				count;
 };
 
-struct filter_id_item *filter_id_find(struct filter_id *hash, int id);
-void filter_id_add(struct filter_id *hash, int id);
-void filter_id_remove(struct filter_id *hash, int id);
-void filter_id_clear(struct filter_id *hash);
-struct filter_id *filter_id_hash_alloc(void);
-void filter_id_hash_free(struct filter_id *hash);
-struct filter_id *filter_id_hash_copy(struct filter_id *hash);
-int *filter_ids(struct filter_id *hash);
-int filter_id_compare(struct filter_id *hash1, struct filter_id *hash2);
+struct tracecmd_filter_id_item *
+  tracecmd_filter_id_find(struct tracecmd_filter_id *hash, int id);
+void tracecmd_filter_id_add(struct tracecmd_filter_id *hash, int id);
+void tracecmd_filter_id_remove(struct tracecmd_filter_id *hash, int id);
+void tracecmd_filter_id_clear(struct tracecmd_filter_id *hash);
+struct tracecmd_filter_id *tracecmd_filter_id_hash_alloc(void);
+void tracecmd_filter_id_hash_free(struct tracecmd_filter_id *hash);
+struct tracecmd_filter_id *
+  tracecmd_filter_id_hash_copy(struct tracecmd_filter_id *hash);
+int *tracecmd_filter_ids(struct tracecmd_filter_id *hash);
+int tracecmd_filter_id_compare(struct tracecmd_filter_id *hash1,
+			       struct tracecmd_filter_id *hash2);
 
-static inline int filter_task_count(struct filter_id *hash)
+static inline int tracecmd_filter_task_count(struct tracecmd_filter_id *hash)
 {
 	return hash->count;
 }

kernel-shark/include/kernel-shark.h +2 -2

index 193458364972..de00512ce5ed 100644
@@ -48,8 +48,8 @@ struct shark_info {
 	gboolean			graph_follows;
 	gboolean			sync_task_filters;
 	gboolean			sync_event_filters;
-	struct filter_id		*list_task_filter;
-	struct filter_id		*list_hide_tasks;
+	struct tracecmd_filter_id	*list_task_filter;
+	struct tracecmd_filter_id	*list_hide_tasks;
 
 	/* Save capture state. */
 	gboolean			cap_all_events;

kernel-shark/include/trace-filter.h +6 -6

index 4ddbd2273895..070d3db91aa0 100644
@@ -146,21 +146,21 @@ void trace_array_add(gint **array, gint *count, gint val);
 int trace_filter_save_events(struct tracecmd_xml_handle *handle,
 			     struct event_filter *filter);
 int trace_filter_save_tasks(struct tracecmd_xml_handle *handle,
-			    struct filter_id *filter);
+			    struct tracecmd_filter_id *filter);
 int trace_filter_load_events(struct event_filter *event_filter,
 			     struct tracecmd_xml_handle *handle,
 			     struct tracecmd_xml_system_node *node);
-int trace_filter_load_task_filter(struct filter_id *filter,
+int trace_filter_load_task_filter(struct tracecmd_filter_id *filter,
 				  struct tracecmd_xml_handle *handle,
 				  struct tracecmd_xml_system_node *node);
 int trace_filter_load_filters(struct tracecmd_xml_handle *handle,
 			      const char *system_name,
-			      struct filter_id *task_filter,
-			      struct filter_id *hide_tasks);
+			      struct tracecmd_filter_id *task_filter,
+			      struct tracecmd_filter_id *hide_tasks);
 int trace_filter_save_filters(struct tracecmd_xml_handle *handle,
 			      const char *system_name,
-			      struct filter_id *task_filter,
-			      struct filter_id *hide_tasks);
+			      struct tracecmd_filter_id *task_filter,
+			      struct tracecmd_filter_id *hide_tasks);
 
 GtkWidget *trace_create_event_list_view(struct pevent *pevent,
 					struct event_filter *filter,

kernel-shark/include/trace-graph.h +8 -8

index 0f35e5946c1c..92b2747287eb 100644
@@ -29,8 +29,8 @@ struct graph_info;
 
 typedef void (graph_select_cb)(struct graph_info *ginfo, guint64 time);
 typedef void (graph_filter_cb)(struct graph_info *ginfo,
-			       struct filter_id *task_filter,
-			       struct filter_id *hide_tasks);
+			       struct tracecmd_filter_id *task_filter,
+			       struct tracecmd_filter_id *hide_tasks);
 
 /* Used for quereing what plots are defined */
 enum graph_plot_type {

@@ -248,10 +248,10 @@ struct graph_info {
 
 	gboolean		read_comms;	/* Read all comms on first load */
 
-	struct filter_id	*task_filter;
+	struct tracecmd_filter_id *task_filter;
 	gint			filter_task_selected;
 
-	struct filter_id	*hide_tasks;
+	struct tracecmd_filter_id *hide_tasks;
 
 	/* Box info for plot data info window */
 	gint			plot_data_x;

@@ -296,9 +296,9 @@ static inline GtkWidget *trace_graph_get_window(struct graph_info *ginfo)
 
 void trace_graph_refresh(struct graph_info *ginfo);
 
-struct filter_id_item *
+struct tracecmd_filter_id_item *
 trace_graph_filter_task_find_pid(struct graph_info *ginfo, gint pid);
-struct filter_id_item *
+struct tracecmd_filter_id_item *
 trace_graph_hide_task_find_pid(struct graph_info *ginfo, gint pid);
 void trace_graph_filter_toggle(struct graph_info *ginfo);
 void trace_graph_filter_add_remove_task(struct graph_info *info,

@@ -331,8 +331,8 @@ int trace_graph_load_filters(struct graph_info *ginfo,
 int trace_graph_save_filters(struct graph_info *ginfo,
 			     struct tracecmd_xml_handle *handle);
 void trace_graph_update_filters(struct graph_info *ginfo,
-				struct filter_id *task_filter,
-				struct filter_id *hide_tasks);
+				struct tracecmd_filter_id *task_filter,
+				struct tracecmd_filter_id *hide_tasks);
 void trace_graph_refresh_filters(struct graph_info *ginfo);
 
 /* plots */

kernel-shark/include/trace-view-store.h +7 -7

index 1204c4b73285..61ce974db9c6 100644
@@ -116,9 +116,9 @@ struct trace_view_store
 	/* filters */
 	gint			all_events; /* set 1 when all events are enabled */
 						/* else */
-	struct event_filter	*event_filter; /* Filtered events */
-	struct filter_id	*task_filter;	/* hash of tasks to filter on */
-	struct filter_id	*hide_tasks;	/* hash of tasks to not display */
+	struct event_filter		*event_filter; /* Filtered events */
+	struct tracecmd_filter_id	*task_filter;	/* hash of tasks to filter on */
+	struct tracecmd_filter_id	*hide_tasks;	/* hash of tasks to not display */
 
 	gint			all_cpus;   /* set 1 when all cpus are enabled */
 						/* else */

@@ -141,13 +141,13 @@ gint trace_view_store_get_timestamp_page(TraceViewStore *store, guint64 ts);
 
 gint trace_view_store_get_timestamp_visible_row(TraceViewStore *store, guint64 ts);
 
-void trace_view_store_filter_tasks(TraceViewStore *store, struct filter_id *filter);
+void trace_view_store_filter_tasks(TraceViewStore *store, struct tracecmd_filter_id *filter);
 
-void trace_view_store_hide_tasks(TraceViewStore *store, struct filter_id *filter);
+void trace_view_store_hide_tasks(TraceViewStore *store, struct tracecmd_filter_id *filter);
 
 void trace_view_store_assign_filters(TraceViewStore *store,
-				     struct filter_id *task_filter,
-				     struct filter_id *hide_tasks);
+				     struct tracecmd_filter_id *task_filter,
+				     struct tracecmd_filter_id *hide_tasks);
 
 TraceViewRecord *trace_view_store_get_row(TraceViewStore *store, gint row);

kernel-shark/include/trace-view.h +2 -2

index 036f51e0932e..84870bd5b278 100644
@@ -34,8 +34,8 @@ void trace_view_reload(GtkWidget *view, struct tracecmd_input *handle,
 void trace_view(int argc, char **argv);
 
 void trace_view_update_filters(GtkWidget *treeview,
-			       struct filter_id *task_filter,
-			       struct filter_id *hide_tasks);
+			       struct tracecmd_filter_id *task_filter,
+			       struct tracecmd_filter_id *hide_tasks);
 
 void trace_view_make_selection_visible(GtkWidget *treeview);

kernel-shark/kernel-shark.c +60 ~~-60~~

319 lines not on this page · raw message

kernel-shark/trace-filter.c +11 ~~-11~~

index f5c3f29fcf80..32ddccef4bde 100644
@@ -2076,13 +2076,13 @@ int trace_filter_save_events(struct tracecmd_xml_handle *handle,
 }
 
 int trace_filter_save_tasks(struct tracecmd_xml_handle *handle,
-			    struct filter_id *filter)
+			    struct tracecmd_filter_id *filter)
 {
 	char buffer[100];
 	int *pids;
 	int i;
 
-	pids = filter_ids(filter);
+	pids = tracecmd_filter_ids(filter);
 	if (!pids)
 		return -1;

@@ -2171,7 +2171,7 @@ int trace_filter_load_events(struct event_filter *event_filter,
 	return 0;
 }
 
-int trace_filter_load_task_filter(struct filter_id *filter,
+int trace_filter_load_task_filter(struct tracecmd_filter_id *filter,
 				  struct tracecmd_xml_handle *handle,
 				  struct tracecmd_xml_system_node *node)
 {

@@ -2190,8 +2190,8 @@ int trace_filter_load_task_filter(struct filter_id *filter,
 		if (strcmp(name, "Task") == 0) {
 			task = tracecmd_xml_node_value(handle, node);
 			pid = atoi(task);
-			if (!filter_id_find(filter, pid))
-				filter_id_add(filter, pid);
+			if (!tracecmd_filter_id_find(filter, pid))
+				tracecmd_filter_id_add(filter, pid);
 		}
 		node = tracecmd_xml_node_next(node);
 	}

@@ -2201,8 +2201,8 @@ int trace_filter_load_task_filter(struct filter_id *filter,
 
 int trace_filter_load_filters(struct tracecmd_xml_handle *handle,
 			      const char *system_name,
-			      struct filter_id *task_filter,
-			      struct filter_id *hide_tasks)
+			      struct tracecmd_filter_id *task_filter,
+			      struct tracecmd_filter_id *hide_tasks)
 {
 	struct tracecmd_xml_system *system;
 	struct tracecmd_xml_system_node *syschild;

@@ -2240,19 +2240,19 @@ int trace_filter_load_filters(struct tracecmd_xml_handle *handle,
 
 int trace_filter_save_filters(struct tracecmd_xml_handle *handle,
 			      const char *system_name,
-			      struct filter_id *task_filter,
-			      struct filter_id *hide_tasks)
+			      struct tracecmd_filter_id *task_filter,
+			      struct tracecmd_filter_id *hide_tasks)
 {
 
 	tracecmd_xml_start_system(handle, system_name);
 
-	if (task_filter && filter_task_count(task_filter)) {
+	if (task_filter && tracecmd_filter_task_count(task_filter)) {
 		tracecmd_xml_start_sub_system(handle, "TaskFilter");
 		trace_filter_save_tasks(handle, task_filter);
 		tracecmd_xml_end_sub_system(handle);
 	}
 
-	if (hide_tasks && filter_task_count(hide_tasks)) {
+	if (hide_tasks && tracecmd_filter_task_count(hide_tasks)) {
 		tracecmd_xml_start_sub_system(handle, "HideTasks");
 		trace_filter_save_tasks(handle, hide_tasks);
 		tracecmd_xml_end_sub_system(handle);

kernel-shark/trace-graph.c +36 ~~-36~~

181 lines not on this page · raw message

kernel-shark/trace-view-main.c +20 ~~-20~~

index a088bbb332a6..b61dc02cd82f 100644
@@ -44,13 +44,13 @@
 static char *input_file;
 
 struct trace_tree_info {
-	struct tracecmd_input	*handle;
-	GtkWidget		*trace_tree;
-	GtkWidget		*spin;
-	gint			filter_enabled;
-	gint			filter_task_selected;
-	struct filter_id	*task_filter;
-	struct filter_id	*hide_tasks;
+	struct tracecmd_input		*handle;
+	GtkWidget			*trace_tree;
+	GtkWidget			*spin;
+	gint				filter_enabled;
+	gint				filter_task_selected;
+	struct tracecmd_filter_id	*task_filter;
+	struct tracecmd_filter_id	*hide_tasks;
 };
 
 void usage(char *prog)

@@ -228,8 +228,8 @@ filter_list_clicked (gpointer data)
 {
 	struct trace_tree_info *info = data;
 
-	if (!filter_task_count(info->task_filter) &&
-	    !filter_task_count(info->hide_tasks))
+	if (!tracecmd_filter_task_count(info->task_filter) &&
+	    !tracecmd_filter_task_count(info->hide_tasks))
 		return;
 
 	info->filter_enabled ^= 1;

@@ -243,17 +243,17 @@ filter_list_clicked (gpointer data)
 }
 
 static void update_task_filter(struct trace_tree_info *info,
-			       struct filter_id *filter)
+			       struct tracecmd_filter_id *filter)
 {
-	struct filter_id_item *task;
+	struct tracecmd_filter_id_item *task;
 	gint pid = info->filter_task_selected;
 
-	task = filter_id_find(filter, pid);
+	task = tracecmd_filter_id_find(filter, pid);
 
 	if (task)
-		filter_id_remove(filter, pid);
+		tracecmd_filter_id_remove(filter, pid);
 	else
-		filter_id_add(filter, pid);
+		tracecmd_filter_id_add(filter, pid);
 
 	if (info->filter_enabled)
 		trace_view_update_filters(info->trace_tree,

@@ -399,7 +399,7 @@ do_tree_popup(GtkWidget *widget, GdkEventButton *event, gpointer data)
 			text = g_malloc(len);
 			g_assert(text);
 
-			if (filter_id_find(info->task_filter, pid))
+			if (tracecmd_filter_id_find(info->task_filter, pid))
 				snprintf(text, len, "Remove %s-%d from filter", comm, pid);
 			else
 				snprintf(text, len, "Add %s-%d to filter", comm, pid);

@@ -409,7 +409,7 @@ do_tree_popup(GtkWidget *widget, GdkEventButton *event, gpointer data)
 			gtk_menu_item_set_label(GTK_MENU_ITEM(menu_filter_add_task),
 						text);
 
-			if (filter_id_find(info->hide_tasks, pid))
+			if (tracecmd_filter_id_find(info->hide_tasks, pid))
 				snprintf(text, len, "Show %s-%d", comm, pid);
 			else
 				snprintf(text, len, "Hide %s-%d", comm, pid);

@@ -442,8 +442,8 @@ do_tree_popup(GtkWidget *widget, GdkEventButton *event, gpointer data)
 		gtk_menu_item_set_label(GTK_MENU_ITEM(menu_filter_enable),
 					"Enable List Filter");
 
-	if (filter_task_count(info->task_filter) ||
-	    filter_task_count(info->hide_tasks)) {
+	if (tracecmd_filter_task_count(info->task_filter) ||
+	    tracecmd_filter_task_count(info->hide_tasks)) {
 		gtk_widget_set_sensitive(menu_filter_clear_tasks, TRUE);
 		gtk_widget_set_sensitive(menu_filter_enable, TRUE);
 	} else {

@@ -519,8 +519,8 @@ void trace_view(int argc, char **argv)
 
 	memset(&tree_info, 0, sizeof(tree_info));
 	tree_info.handle = handle;
-	tree_info.task_filter = filter_id_hash_alloc();
-	tree_info.hide_tasks = filter_id_hash_alloc();
+	tree_info.task_filter = tracecmd_filter_id_hash_alloc();
+	tree_info.hide_tasks = tracecmd_filter_id_hash_alloc();
 
 	/* --- Main window --- */

kernel-shark/trace-view-store.c +19 ~~-17~~

index 29e064e2bbea..dcf6e2dc0982 100644
@@ -231,7 +231,7 @@ trace_view_store_finalize (GObject *object)
 	g_free(store->rows);
 	g_free(store->cpu_items);
 
-	filter_id_hash_free(store->task_filter);
+	tracecmd_filter_id_hash_free(store->task_filter);
 
 	if (store->spin) {
 		g_object_unref(store->spin);

@@ -1183,11 +1183,11 @@ gint get_wakeup_new_pid(TraceViewStore *store, struct pevent *pevent, struct pev
 static gboolean view_task(TraceViewStore *store, gint pid)
 {
 	return (!store->task_filter ||
-		!filter_task_count(store->task_filter) ||
-		filter_id_find(store->task_filter, pid)) &&
+		!tracecmd_filter_task_count(store->task_filter) ||
+		tracecmd_filter_id_find(store->task_filter, pid)) &&
 		(!store->hide_tasks ||
-		 !filter_task_count(store->hide_tasks) ||
-		 !filter_id_find(store->hide_tasks, pid));
+		 !tracecmd_filter_task_count(store->hide_tasks) ||
+		 !tracecmd_filter_id_find(store->hide_tasks, pid));
 }
 
 static gboolean show_task(TraceViewStore *store, struct pevent *pevent,

@@ -1295,30 +1295,32 @@ static void update_filter_tasks(TraceViewStore *store)
 	merge_sort_rows_ts(store);
 }
 
-void trace_view_store_filter_tasks(TraceViewStore *store, struct filter_id *filter)
+void trace_view_store_filter_tasks(TraceViewStore *store,
+				   struct tracecmd_filter_id *filter)
 {
 	g_return_if_fail (TRACE_VIEW_IS_LIST (store));
 
 	/* We may pass in the store->task_filter. Don't free it if we do */
 	if (store->task_filter && store->task_filter != filter)
-		filter_id_hash_free(store->task_filter);
+		tracecmd_filter_id_hash_free(store->task_filter);
 
 	if (store->task_filter != filter)
-		store->task_filter = filter_id_hash_copy(filter);
+		store->task_filter = tracecmd_filter_id_hash_copy(filter);
 
 	update_filter_tasks(store);
 }
 
-void trace_view_store_hide_tasks(TraceViewStore *store, struct filter_id *filter)
+void trace_view_store_hide_tasks(TraceViewStore *store,
+				 struct tracecmd_filter_id *filter)
 {
 	g_return_if_fail (TRACE_VIEW_IS_LIST (store));
 
 	/* We may pass in the store->task_filter. Don't free it if we do */
 	if (store->hide_tasks && store->hide_tasks != filter)
-		filter_id_hash_free(store->hide_tasks);
+		tracecmd_filter_id_hash_free(store->hide_tasks);
 
 	if (store->hide_tasks != filter)
-		store->hide_tasks = filter_id_hash_copy(filter);
+		store->hide_tasks = tracecmd_filter_id_hash_copy(filter);
 
 	update_filter_tasks(store);
 }

@@ -1331,23 +1333,23 @@ void trace_view_store_update_filter(TraceViewStore *store)
 }
 
 void trace_view_store_assign_filters(TraceViewStore *store,
-				     struct filter_id *task_filter,
-				     struct filter_id *hide_tasks)
+				     struct tracecmd_filter_id *task_filter,
+				     struct tracecmd_filter_id *hide_tasks)
 {
 	g_return_if_fail (TRACE_VIEW_IS_LIST (store));
 
 	/* We may pass in the store->task_filter. Don't free it if we do */
 	if (store->task_filter && store->task_filter != task_filter)
-		filter_id_hash_free(store->task_filter);
+		tracecmd_filter_id_hash_free(store->task_filter);
 
 	if (store->hide_tasks && store->hide_tasks != hide_tasks)
-		filter_id_hash_free(store->hide_tasks);
+		tracecmd_filter_id_hash_free(store->hide_tasks);
 
 	if (store->hide_tasks != hide_tasks)
-		store->hide_tasks = filter_id_hash_copy(hide_tasks);
+		store->hide_tasks = tracecmd_filter_id_hash_copy(hide_tasks);
 
 	if (store->task_filter != task_filter)
-		store->task_filter = filter_id_hash_copy(task_filter);
+		store->task_filter = tracecmd_filter_id_hash_copy(task_filter);
 }
 
 /*****************************************************************************

kernel-shark/trace-view.c +2 -2

index 377f2db9df10..8ee118e2813f 100644
@@ -301,8 +301,8 @@ void trace_view_make_selection_visible(GtkWidget *treeview)
 }
 
 void trace_view_update_filters(GtkWidget *treeview,
-			       struct filter_id *task_filter,
-			       struct filter_id *hide_tasks)
+			       struct tracecmd_filter_id *task_filter,
+			       struct tracecmd_filter_id *hide_tasks)
 {
 	GtkTreeView *tree = GTK_TREE_VIEW(treeview);
 	TraceViewRecord *vrec;

lib/trace-cmd/trace-filter-hash.c +25 ~~-23~~

126 lines not on this page · raw message

Signature · 1 line

2.17.1