ring-buffer: replace constants with time macros in ring-buffer-benchmark

The use of numeric constants is discouraged. It is cleaner and more descriptive to use macros for constant time conversions. This patch also removes an extra new line. [ Impact: more descriptive time conversions ] Reported-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

ring-buffer: replace constants with time macros in ring-buffer-benchmark
The use of numeric constants is discouraged. It is cleaner and more descriptive to use macros for constant time conversions. This patch also removes an extra new line. [ Impact: more descriptive time conversions ] Reported-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Steven Rostedt · Steven Rostedt
1 parent 79c5d3ce61
Showing 1 changed file with 7 additions and 5 deletions Side-by-side Diff
kernel/trace/ring_buffer_benchmark.c
@@ -253,7 +253,7 @@
 	}
  
 	time = end_tv.tv_sec - start_tv.tv_sec;
-	time *= 1000000;
+	time *= USEC_PER_SEC;
 	time += (long long)((long)end_tv.tv_usec - (long)start_tv.tv_usec);
  
 	entries = ring_buffer_entries(buffer);
@@ -273,7 +273,8 @@
 	pr_info("Missed:   %ld\n", missed);
 	pr_info("Hit:      %ld\n", hit);
  
-	do_div(time, 1000);
+	/* Convert time from usecs to millisecs */
+	do_div(time, USEC_PER_MSEC);
 	if (time)
 		hit /= (long)time;
 	else
  
  
@@ -282,18 +283,19 @@
 	pr_info("Entries per millisec: %ld\n", hit);
  
 	if (hit) {
-		avg = 1000000 / hit;
+		/* Calculate the average time in nanosecs */
+		avg = NSEC_PER_MSEC / hit;
 		pr_info("%ld ns per entry\n", avg);
 	}
  
-
 	if (missed) {
 		if (time)
 			missed /= (long)time;
  
 		pr_info("Total iterations per millisec: %ld\n", hit + missed);
  
-		avg = 1000000 / (hit + missed);
+		/* Caculate the average time in nanosecs */
+		avg = NSEC_PER_MSEC / (hit + missed);
 		pr_info("%ld ns per entry\n", avg);
 	}
 }
...	...	@@ -253,7 +253,7 @@
253	253	}
254	254
255	255	time = end_tv.tv_sec - start_tv.tv_sec;
256		- time *= 1000000;
	256	+ time *= USEC_PER_SEC;
257	257	time += (long long)((long)end_tv.tv_usec - (long)start_tv.tv_usec);
258	258
259	259	entries = ring_buffer_entries(buffer);
...	...	@@ -273,7 +273,8 @@
273	273	pr_info("Missed: %ld\n", missed);
274	274	pr_info("Hit: %ld\n", hit);
275	275
276		- do_div(time, 1000);
	276	+ /* Convert time from usecs to millisecs */
	277	+ do_div(time, USEC_PER_MSEC);
277	278	if (time)
278	279	hit /= (long)time;
279	280	else
280	281
281	282
...	...	@@ -282,18 +283,19 @@
282	283	pr_info("Entries per millisec: %ld\n", hit);
283	284
284	285	if (hit) {
285		- avg = 1000000 / hit;
	286	+ /* Calculate the average time in nanosecs */
	287	+ avg = NSEC_PER_MSEC / hit;
286	288	pr_info("%ld ns per entry\n", avg);
287	289	}
288	290
289		-
290	291	if (missed) {
291	292	if (time)
292	293	missed /= (long)time;
293	294
294	295	pr_info("Total iterations per millisec: %ld\n", hit + missed);
295	296
296		- avg = 1000000 / (hit + missed);
	297	+ /* Caculate the average time in nanosecs */
	298	+ avg = NSEC_PER_MSEC / (hit + missed);
297	299	pr_info("%ld ns per entry\n", avg);
298	300	}
299	301	}