sched/clock: Make local_clock()/cpu_clock() inline (2c923e94) · Commits · 戴 / test

include/linux/sched.h

+30 −2

Original line number	Diff line number	Diff line
		@@ -2303,8 +2303,6 @@ extern unsigned long long notrace sched_clock(void);
		/*
		* See the comment in kernel/sched/clock.c
		*/
		extern u64 cpu_clock(int cpu);
		extern u64 local_clock(void);
		extern u64 running_clock(void);
		extern u64 sched_clock_cpu(int cpu);

		@@ -2323,6 +2321,16 @@ static inline void sched_clock_idle_sleep_event(void)
		static inline void sched_clock_idle_wakeup_event(u64 delta_ns)
		{
		}

		static inline u64 cpu_clock(int cpu)
		{
		return sched_clock();
		}

		static inline u64 local_clock(void)
		{
		return sched_clock();
		}
		#else
		/*
		* Architectures can set this to 1 if they have specified
		@@ -2337,6 +2345,26 @@ extern void clear_sched_clock_stable(void);
		extern void sched_clock_tick(void);
		extern void sched_clock_idle_sleep_event(void);
		extern void sched_clock_idle_wakeup_event(u64 delta_ns);

		/*
		* As outlined in clock.c, provides a fast, high resolution, nanosecond
		* time source that is monotonic per cpu argument and has bounded drift
		* between cpus.
		*
		* ######################### BIG FAT WARNING ##########################
		* # when comparing cpu_clock(i) to cpu_clock(j) for i != j, time can #
		* # go backwards !! #
		* ####################################################################
		*/
		static inline u64 cpu_clock(int cpu)
		{
		return sched_clock_cpu(cpu);
		}

		static inline u64 local_clock(void)
		{
		return sched_clock_cpu(raw_smp_processor_id());
		}
		#endif

		#ifdef CONFIG_IRQ_TIME_ACCOUNTING

+1 −41

Original line number	Diff line number	Diff line
		@@ -318,6 +318,7 @@ u64 sched_clock_cpu(int cpu)

		return clock;
		}
		EXPORT_SYMBOL_GPL(sched_clock_cpu);

		void sched_clock_tick(void)
		{
		@@ -363,33 +364,6 @@ void sched_clock_idle_wakeup_event(u64 delta_ns)
		}
		EXPORT_SYMBOL_GPL(sched_clock_idle_wakeup_event);

		/*
		* As outlined at the top, provides a fast, high resolution, nanosecond
		* time source that is monotonic per cpu argument and has bounded drift
		* between cpus.
		*
		* ######################### BIG FAT WARNING ##########################
		* # when comparing cpu_clock(i) to cpu_clock(j) for i != j, time can #
		* # go backwards !! #
		* ####################################################################
		*/
		u64 cpu_clock(int cpu)
		{
		return sched_clock_cpu(cpu);
		}

		/*
		* Similar to cpu_clock() for the current cpu. Time will only be observed
		* to be monotonic if care is taken to only compare timestampt taken on the
		* same CPU.
		*
		* See cpu_clock().
		*/
		u64 local_clock(void)
		{
		return sched_clock_cpu(raw_smp_processor_id());
		}

		#else /* CONFIG_HAVE_UNSTABLE_SCHED_CLOCK */

		void sched_clock_init(void)
		@@ -404,22 +378,8 @@ u64 sched_clock_cpu(int cpu)

		return sched_clock();
		}

		u64 cpu_clock(int cpu)
		{
		return sched_clock();
		}

		u64 local_clock(void)
		{
		return sched_clock();
		}

		#endif /* CONFIG_HAVE_UNSTABLE_SCHED_CLOCK */

		EXPORT_SYMBOL_GPL(cpu_clock);
		EXPORT_SYMBOL_GPL(local_clock);

		/*
		* Running clock - returns the time that has elapsed while a guest has been
		* running.