Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 687fcc4a authored by Steven Rostedt (Red Hat)'s avatar Steven Rostedt (Red Hat) Committed by Steven Rostedt
Browse files

tracing: Rename ftrace_event_name() to trace_event_name() 



The name "ftrace" really refers to the function hook infrastructure. It
is not about the trace_events. ftrace_event_name() returns the name of
an event tracepoint, has nothing to do with function tracing. Rename it
to trace_event_name().

Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent 609a7404

include/linux/trace_events.h

+1 −1
Original line number Diff line number Diff line
@@ -304,7 +304,7 @@ struct trace_event_call { 
};



static inline const char *

ftrace_event_name(struct trace_event_call *call)

trace_event_name(struct trace_event_call *call)

{

	if (call->flags & TRACE_EVENT_FL_TRACEPOINT)

		return call->tp ? call->tp->name : NULL;

kernel/trace/trace_events.c

+13 −13
Original line number Diff line number Diff line
@@ -387,7 +387,7 @@ static int __ftrace_event_enable_disable(struct trace_event_file *file, 
			if (ret) {

				tracing_stop_cmdline_record();

				pr_info("event trace: Could not enable event "

					"%s\n", ftrace_event_name(call));

					"%s\n", trace_event_name(call));

				break;

			}

			set_bit(FTRACE_EVENT_FL_ENABLED_BIT, &file->flags);
@@ -523,7 +523,7 @@ __ftrace_set_clr_event_nolock(struct trace_array *tr, const char *match, 
	list_for_each_entry(file, &tr->events, list) {



		call = file->event_call;

		name = ftrace_event_name(call);

		name = trace_event_name(call);



		if (!name || !call->class || !call->class->reg)

			continue;
@@ -747,7 +747,7 @@ static int t_show(struct seq_file *m, void *v) 


	if (strcmp(call->class->system, TRACE_SYSTEM) != 0)

		seq_printf(m, "%s:", call->class->system);

	seq_printf(m, "%s\n", ftrace_event_name(call));

	seq_printf(m, "%s\n", trace_event_name(call));



	return 0;

}
@@ -840,7 +840,7 @@ system_enable_read(struct file *filp, char __user *ubuf, size_t cnt, 
	mutex_lock(&event_mutex);

	list_for_each_entry(file, &tr->events, list) {

		call = file->event_call;

		if (!ftrace_event_name(call) || !call->class || !call->class->reg)

		if (!trace_event_name(call) || !call->class || !call->class->reg)

			continue;



		if (system && strcmp(call->class->system, system->name) != 0)
@@ -955,7 +955,7 @@ static int f_show(struct seq_file *m, void *v) 


	switch ((unsigned long)v) {

	case FORMAT_HEADER:

		seq_printf(m, "name: %s\n", ftrace_event_name(call));

		seq_printf(m, "name: %s\n", trace_event_name(call));

		seq_printf(m, "ID: %d\n", call->event.type);

		seq_puts(m, "format:\n");

		return 0;
@@ -1591,7 +1591,7 @@ event_create_dir(struct dentry *parent, struct trace_event_file *file) 
	} else

		d_events = parent;



	name = ftrace_event_name(call);

	name = trace_event_name(call);

	file->dir = tracefs_create_dir(name, d_events);

	if (!file->dir) {

		pr_warn("Could not create tracefs '%s' directory\n", name);
@@ -1683,7 +1683,7 @@ static int event_init(struct trace_event_call *call) 
	int ret = 0;

	const char *name;



	name = ftrace_event_name(call);

	name = trace_event_name(call);

	if (WARN_ON(!name))

		return -EINVAL;
@@ -2062,7 +2062,7 @@ __trace_add_event_dirs(struct trace_array *tr) 
		ret = __trace_add_new_event(call, tr);

		if (ret < 0)

			pr_warn("Could not create directory for event %s\n",

				ftrace_event_name(call));

				trace_event_name(call));

	}

}
@@ -2076,7 +2076,7 @@ find_event_file(struct trace_array *tr, const char *system, const char *event) 
	list_for_each_entry(file, &tr->events, list) {



		call = file->event_call;

		name = ftrace_event_name(call);

		name = trace_event_name(call);



		if (!name || !call->class || !call->class->reg)

			continue;
@@ -2152,7 +2152,7 @@ event_enable_print(struct seq_file *m, unsigned long ip, 
	seq_printf(m, "%s:%s:%s",

		   data->enable ? ENABLE_EVENT_STR : DISABLE_EVENT_STR,

		   data->file->event_call->class->system,

		   ftrace_event_name(data->file->event_call));

		   trace_event_name(data->file->event_call));



	if (data->count == -1)

		seq_puts(m, ":unlimited\n");
@@ -2375,7 +2375,7 @@ __trace_early_add_event_dirs(struct trace_array *tr) 
		ret = event_create_dir(tr->event_dir, file);

		if (ret < 0)

			pr_warn("Could not create directory for event %s\n",

				ftrace_event_name(file->event_call));

				trace_event_name(file->event_call));

	}

}
@@ -2399,7 +2399,7 @@ __trace_early_add_events(struct trace_array *tr) 
		ret = __trace_early_add_new_event(call, tr);

		if (ret < 0)

			pr_warn("Could not create early event %s\n",

				ftrace_event_name(call));

				trace_event_name(call));

	}

}
@@ -2787,7 +2787,7 @@ static __init void event_trace_self_tests(void) 
			continue;

#endif



		pr_info("Testing event %s: ", ftrace_event_name(call));

		pr_info("Testing event %s: ", trace_event_name(call));



		/*

		 * If an event is already enabled, someone is using

kernel/trace/trace_events_trigger.c

+1 −1
Original line number Diff line number Diff line
@@ -1095,7 +1095,7 @@ event_enable_trigger_print(struct seq_file *m, struct event_trigger_ops *ops, 
	seq_printf(m, "%s:%s:%s",

		   enable_data->enable ? ENABLE_EVENT_STR : DISABLE_EVENT_STR,

		   enable_data->file->event_call->class->system,

		   ftrace_event_name(enable_data->file->event_call));

		   trace_event_name(enable_data->file->event_call));



	if (data->count == -1)

		seq_puts(m, ":unlimited");

kernel/trace/trace_kprobe.c

+8 −8
Original line number Diff line number Diff line
@@ -348,7 +348,7 @@ static struct trace_kprobe *find_trace_kprobe(const char *event, 
	struct trace_kprobe *tk;



	list_for_each_entry(tk, &probe_list, list)

		if (strcmp(ftrace_event_name(&tk->tp.call), event) == 0 &&

		if (strcmp(trace_event_name(&tk->tp.call), event) == 0 &&

		    strcmp(tk->tp.call.class->system, group) == 0)

			return tk;

	return NULL;
@@ -523,7 +523,7 @@ static int register_trace_kprobe(struct trace_kprobe *tk) 
	mutex_lock(&probe_lock);



	/* Delete old (same name) event if exist */

	old_tk = find_trace_kprobe(ftrace_event_name(&tk->tp.call),

	old_tk = find_trace_kprobe(trace_event_name(&tk->tp.call),

			tk->tp.call.class->system);

	if (old_tk) {

		ret = unregister_trace_kprobe(old_tk);
@@ -572,7 +572,7 @@ static int trace_kprobe_module_callback(struct notifier_block *nb, 
			if (ret)

				pr_warning("Failed to re-register probe %s on"

					   "%s: %d\n",

					   ftrace_event_name(&tk->tp.call),

					   trace_event_name(&tk->tp.call),

					   mod->name, ret);

		}

	}
@@ -829,7 +829,7 @@ static int probes_seq_show(struct seq_file *m, void *v) 


	seq_putc(m, trace_kprobe_is_return(tk) ? 'r' : 'p');

	seq_printf(m, ":%s/%s", tk->tp.call.class->system,

			ftrace_event_name(&tk->tp.call));

			trace_event_name(&tk->tp.call));



	if (!tk->symbol)

		seq_printf(m, " 0x%p", tk->rp.kp.addr);
@@ -888,7 +888,7 @@ static int probes_profile_seq_show(struct seq_file *m, void *v) 
	struct trace_kprobe *tk = v;



	seq_printf(m, "  %-44s %15lu %15lu\n",

		   ftrace_event_name(&tk->tp.call), tk->nhit,

		   trace_event_name(&tk->tp.call), tk->nhit,

		   tk->rp.kp.nmissed);



	return 0;
@@ -1025,7 +1025,7 @@ print_kprobe_event(struct trace_iterator *iter, int flags, 
	field = (struct kprobe_trace_entry_head *)iter->ent;

	tp = container_of(event, struct trace_probe, call.event);



	trace_seq_printf(s, "%s: (", ftrace_event_name(&tp->call));

	trace_seq_printf(s, "%s: (", trace_event_name(&tp->call));



	if (!seq_print_ip_sym(s, field->ip, flags | TRACE_ITER_SYM_OFFSET))

		goto out;
@@ -1056,7 +1056,7 @@ print_kretprobe_event(struct trace_iterator *iter, int flags, 
	field = (struct kretprobe_trace_entry_head *)iter->ent;

	tp = container_of(event, struct trace_probe, call.event);



	trace_seq_printf(s, "%s: (", ftrace_event_name(&tp->call));

	trace_seq_printf(s, "%s: (", trace_event_name(&tp->call));



	if (!seq_print_ip_sym(s, field->ret_ip, flags | TRACE_ITER_SYM_OFFSET))

		goto out;
@@ -1301,7 +1301,7 @@ static int register_kprobe_event(struct trace_kprobe *tk) 
	ret = trace_add_event_call(call);

	if (ret) {

		pr_info("Failed to register kprobe event: %s\n",

			ftrace_event_name(call));

			trace_event_name(call));

		kfree(call->print_fmt);

		unregister_trace_event(&call->event);

	}

kernel/trace/trace_output.c

+1 −1
Original line number Diff line number Diff line
@@ -239,7 +239,7 @@ int trace_raw_output_prep(struct trace_iterator *iter, 
	}



	trace_seq_init(p);

	trace_seq_printf(s, "%s: ", ftrace_event_name(event));

	trace_seq_printf(s, "%s: ", trace_event_name(event));



	return trace_handle_return(s);

}