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

Commit bd48c63e authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

tools: Introduce tools/include/linux/time64.h for *SEC_PER_*SEC macros 

And remove it from tools/perf/{perf,util}.h, making code that needs
these macros to include linux/time64.h instead, to match how this is
used in the kernel sources.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-e69fc1pvkgt57yvxqt6eunyg@git.kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent ce90c12d

tools/include/linux/time64.h

0 → 100644
+12 −0
Original line number Diff line number Diff line 
#ifndef _TOOLS_LINUX_TIME64_H

#define _TOOLS_LINUX_TIME64_H



#define MSEC_PER_SEC	1000L

#define USEC_PER_MSEC	1000L

#define NSEC_PER_USEC	1000L

#define NSEC_PER_MSEC	1000000L

#define USEC_PER_SEC	1000000L

#define NSEC_PER_SEC	1000000000L

#define FSEC_PER_SEC	1000000000000000LL



#endif /* _LINUX_TIME64_H */

tools/perf/MANIFEST

+1 −0
Original line number Diff line number Diff line
@@ -77,4 +77,5 @@ tools/include/linux/stringify.h 
tools/include/linux/types.h

tools/include/linux/err.h

tools/include/linux/bitmap.h

tools/include/linux/time64.h

tools/arch/*/include/uapi/asm/perf_regs.h

tools/perf/builtin-kvm.c

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <sys/timerfd.h>

#endif



#include <linux/time64.h>

#include <termios.h>

#include <semaphore.h>

#include <pthread.h>

tools/perf/builtin-script.c

+4 −3
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include "util/thread-stack.h"

#include <linux/bitmap.h>

#include <linux/stringify.h>

#include <linux/time64.h>

#include "asm/bug.h"

#include "util/mem-events.h"
@@ -464,9 +465,9 @@ static void print_sample_start(struct perf_sample *sample, 


	if (PRINT_FIELD(TIME)) {

		nsecs = sample->time;

		secs = nsecs / NSECS_PER_SEC;

		nsecs -= secs * NSECS_PER_SEC;

		usecs = nsecs / NSECS_PER_USEC;

		secs = nsecs / NSEC_PER_SEC;

		nsecs -= secs * NSEC_PER_SEC;

		usecs = nsecs / NSEC_PER_USEC;

		if (nanosecs)

			printf("%5lu.%09llu: ", secs, nsecs);

		else

tools/perf/builtin-stat.c

+4 −3
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ 
#include "util/group.h"

#include "asm/bug.h"



#include <linux/time64.h>

#include <api/fs/fs.h>

#include <stdlib.h>

#include <sys/prctl.h>
@@ -354,7 +355,7 @@ static void process_interval(void) 
	diff_timespec(&rs, &ts, &ref_time);



	if (STAT_RECORD) {

		if (WRITE_STAT_ROUND_EVENT(rs.tv_sec * NSECS_PER_SEC + rs.tv_nsec, INTERVAL))

		if (WRITE_STAT_ROUND_EVENT(rs.tv_sec * NSEC_PER_SEC + rs.tv_nsec, INTERVAL))

			pr_err("failed to write stat round event\n");

	}
@@ -2175,8 +2176,8 @@ static int process_stat_round_event(struct perf_tool *tool __maybe_unused, 
		update_stats(&walltime_nsecs_stats, stat_round->time);



	if (stat_config.interval && stat_round->time) {

		tsh.tv_sec  = stat_round->time / NSECS_PER_SEC;

		tsh.tv_nsec = stat_round->time % NSECS_PER_SEC;

		tsh.tv_sec  = stat_round->time / NSEC_PER_SEC;

		tsh.tv_nsec = stat_round->time % NSEC_PER_SEC;

		ts = &tsh;

	}