ftrace: timestamp syncing, prepare

rename and uninline now() to ftrace_now(). Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

ftrace: timestamp syncing, prepare
rename and uninline now() to ftrace_now(). Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Ingo Molnar · Thomas Gleixner
1 parent 4bf39a9411
Showing 7 changed files with 16 additions and 14 deletions Side-by-side Diff
kernel/trace/ftrace.c
kernel/trace/trace.c
kernel/trace/trace.h
kernel/trace/trace_functions.c
kernel/trace/trace_irqsoff.c
kernel/trace/trace_sched_switch.c
kernel/trace/trace_sched_wakeup.c
@@ -531,7 +531,7 @@
 	save_ftrace_enabled = ftrace_enabled;
 	ftrace_enabled = 0;
  
-	start = now(raw_smp_processor_id());
+	start = ftrace_now(raw_smp_processor_id());
 	ftrace_update_cnt = 0;
  
 	/* No locks needed, the machine is stopped! */
@@ -550,7 +550,7 @@
  
 	}
  
-	stop = now(raw_smp_processor_id());
+	stop = ftrace_now(raw_smp_processor_id());
 	ftrace_update_time = stop - start;
 	ftrace_update_tot_cnt += ftrace_update_cnt;
  
@@ -42,6 +42,11 @@
 	return nsec;
 }
  
+notrace cycle_t ftrace_now(int cpu)
+{
+	return cpu_clock(cpu);
+}
+
 static atomic_t			tracer_counter;
 static struct trace_array	global_trace;
  
@@ -607,7 +612,7 @@
 	entry->idx		= atomic_inc_return(&tracer_counter);
 	entry->preempt_count	= pc & 0xff;
 	entry->pid		= tsk->pid;
-	entry->t		= now(raw_smp_processor_id());
+	entry->t		= ftrace_now(raw_smp_processor_id());
 	entry->flags = (irqs_disabled_flags(flags) ? TRACE_FLAG_IRQS_OFF : 0) |
 		((pc & HARDIRQ_MASK) ? TRACE_FLAG_HARDIRQ : 0) |
 		((pc & SOFTIRQ_MASK) ? TRACE_FLAG_SOFTIRQ : 0) |
@@ -171,10 +171,7 @@
 void update_max_tr_single(struct trace_array *tr,
 			  struct task_struct *tsk, int cpu);
  
-static inline notrace cycle_t now(int cpu)
-{
-	return cpu_clock(cpu);
-}
+extern notrace cycle_t ftrace_now(int cpu);
  
 #ifdef CONFIG_SCHED_TRACER
 extern void notrace
@@ -20,7 +20,7 @@
 {
 	int cpu;
  
-	tr->time_start = now(tr->cpu);
+	tr->time_start = ftrace_now(tr->cpu);
  
 	for_each_online_cpu(cpu)
 		tracing_reset(tr->data[cpu]);
@@ -136,7 +136,7 @@
 	 * as long as possible:
 	 */
 	T0 = data->preempt_timestamp;
-	T1 = now(cpu);
+	T1 = ftrace_now(cpu);
 	delta = T1-T0;
  
 	local_save_flags(flags);
@@ -186,7 +186,7 @@
  
 out:
 	data->critical_sequence = max_sequence;
-	data->preempt_timestamp = now(cpu);
+	data->preempt_timestamp = ftrace_now(cpu);
 	tracing_reset(data);
 	ftrace(tr, data, CALLER_ADDR0, parent_ip, flags);
 }
@@ -215,7 +215,7 @@
 	atomic_inc(&data->disabled);
  
 	data->critical_sequence = max_sequence;
-	data->preempt_timestamp = now(cpu);
+	data->preempt_timestamp = ftrace_now(cpu);
 	data->critical_start = parent_ip ? : ip;
 	tracing_reset(data);
  
@@ -61,7 +61,7 @@
 {
 	int cpu;
  
-	tr->time_start = now(tr->cpu);
+	tr->time_start = ftrace_now(tr->cpu);
  
 	for_each_online_cpu(cpu)
 		tracing_reset(tr->data[cpu]);
@@ -92,7 +92,7 @@
 	 * as long as possible:
 	 */
 	T0 = data->preempt_timestamp;
-	T1 = now(cpu);
+	T1 = ftrace_now(cpu);
 	delta = T1-T0;
  
 	if (!report_latency(delta))
@@ -191,7 +191,7 @@
  
 	local_save_flags(flags);
  
-	tr->data[wakeup_cpu]->preempt_timestamp = now(cpu);
+	tr->data[wakeup_cpu]->preempt_timestamp = ftrace_now(cpu);
 	ftrace(tr, tr->data[wakeup_cpu], CALLER_ADDR1, CALLER_ADDR2, flags);
  
 out_locked:
...	...	@@ -531,7 +531,7 @@
531	531	save_ftrace_enabled = ftrace_enabled;
532	532	ftrace_enabled = 0;
533	533
534		- start = now(raw_smp_processor_id());
	534	+ start = ftrace_now(raw_smp_processor_id());
535	535	ftrace_update_cnt = 0;
536	536
537	537	/* No locks needed, the machine is stopped! */
...	...	@@ -550,7 +550,7 @@
550	550
551	551	}
552	552
553		- stop = now(raw_smp_processor_id());
	553	+ stop = ftrace_now(raw_smp_processor_id());
554	554	ftrace_update_time = stop - start;
555	555	ftrace_update_tot_cnt += ftrace_update_cnt;
556	556
...	...	@@ -42,6 +42,11 @@
42	42	return nsec;
43	43	}
44	44
	45	+notrace cycle_t ftrace_now(int cpu)
	46	+{
	47	+ return cpu_clock(cpu);
	48	+}
	49	+
45	50	static atomic_t tracer_counter;
46	51	static struct trace_array global_trace;
47	52
...	...	@@ -607,7 +612,7 @@
607	612	entry->idx = atomic_inc_return(&tracer_counter);
608	613	entry->preempt_count = pc & 0xff;
609	614	entry->pid = tsk->pid;
610		- entry->t = now(raw_smp_processor_id());
	615	+ entry->t = ftrace_now(raw_smp_processor_id());
611	616	entry->flags = (irqs_disabled_flags(flags) ? TRACE_FLAG_IRQS_OFF : 0) \|
612	617	((pc & HARDIRQ_MASK) ? TRACE_FLAG_HARDIRQ : 0) \|
613	618	((pc & SOFTIRQ_MASK) ? TRACE_FLAG_SOFTIRQ : 0) \|
...	...	@@ -171,10 +171,7 @@
171	171	void update_max_tr_single(struct trace_array *tr,
172	172	struct task_struct *tsk, int cpu);
173	173
174		-static inline notrace cycle_t now(int cpu)
175		-{
176		- return cpu_clock(cpu);
177		-}
	174	+extern notrace cycle_t ftrace_now(int cpu);
178	175
179	176	#ifdef CONFIG_SCHED_TRACER
180	177	extern void notrace
...	...	@@ -20,7 +20,7 @@
20	20	{
21	21	int cpu;
22	22
23		- tr->time_start = now(tr->cpu);
	23	+ tr->time_start = ftrace_now(tr->cpu);
24	24
25	25	for_each_online_cpu(cpu)
26	26	tracing_reset(tr->data[cpu]);
...	...	@@ -136,7 +136,7 @@
136	136	* as long as possible:
137	137	*/
138	138	T0 = data->preempt_timestamp;
139		- T1 = now(cpu);
	139	+ T1 = ftrace_now(cpu);
140	140	delta = T1-T0;
141	141
142	142	local_save_flags(flags);
...	...	@@ -186,7 +186,7 @@
186	186
187	187	out:
188	188	data->critical_sequence = max_sequence;
189		- data->preempt_timestamp = now(cpu);
	189	+ data->preempt_timestamp = ftrace_now(cpu);
190	190	tracing_reset(data);
191	191	ftrace(tr, data, CALLER_ADDR0, parent_ip, flags);
192	192	}
...	...	@@ -215,7 +215,7 @@
215	215	atomic_inc(&data->disabled);
216	216
217	217	data->critical_sequence = max_sequence;
218		- data->preempt_timestamp = now(cpu);
	218	+ data->preempt_timestamp = ftrace_now(cpu);
219	219	data->critical_start = parent_ip ? : ip;
220	220	tracing_reset(data);
221	221
...	...	@@ -61,7 +61,7 @@
61	61	{
62	62	int cpu;
63	63
64		- tr->time_start = now(tr->cpu);
	64	+ tr->time_start = ftrace_now(tr->cpu);
65	65
66	66	for_each_online_cpu(cpu)
67	67	tracing_reset(tr->data[cpu]);
...	...	@@ -92,7 +92,7 @@
92	92	* as long as possible:
93	93	*/
94	94	T0 = data->preempt_timestamp;
95		- T1 = now(cpu);
	95	+ T1 = ftrace_now(cpu);
96	96	delta = T1-T0;
97	97
98	98	if (!report_latency(delta))
...	...	@@ -191,7 +191,7 @@
191	191
192	192	local_save_flags(flags);
193	193
194		- tr->data[wakeup_cpu]->preempt_timestamp = now(cpu);
	194	+ tr->data[wakeup_cpu]->preempt_timestamp = ftrace_now(cpu);
195	195	ftrace(tr, tr->data[wakeup_cpu], CALLER_ADDR1, CALLER_ADDR2, flags);
196	196
197	197	out_locked: