s/cpu_get_real_ticks/cpu_get_host_ticks/
PATCH 1/1 s/cpu_get_real_ticks/cpu_get_host_ticks/
This should help clarify the purpose of the function that returns the host system's CPU cycle count.
Signed-off-by Christopher Covington <[email protected]>
--- bsd-user/main.c | 2 +- cpus.c | 6 +++--- hw/intc/xics.c | 2 +- hw/ppc/ppc.c | 4 ++-- include/qemu/timer.h | 20 ++++++++++---------- linux-user/main.c | 4 ++-- target-alpha/sys_helper.c | 2 +- 7 files changed, 20 insertions(+), 20 deletions(-)
bsd-user/main.c +1 -1
@@ -108,7 +108,7 @@ void cpu_list_unlock(void)uint64_t cpu_get_tsc (CPUX86State *env) { -return cpu_get_real_ticks (); +return cpu_get_host_ticks (); } static void write_dt(void *ptr, unsigned long addr, unsigned long limit,
cpus.c +3 -3
@@ -191,7 +191,7 @@ int64_t cpu_get_ticks(void) ticks = timers_state.cpu_ticks_offset;if (timers_state.cpu_ticks_enabled) { - ticks +=cpu_get_real_ticks (); + ticks +=cpu_get_host_ticks (); }if (timers_state.cpu_ticks_prev > ticks) {
@@ -239,7 +239,7 @@ void cpu_enable_ticks(void)/* Here, the really thing protected by seqlock is cpu_clock_offset. */ seqlock_write_lock (&timers_state.vm_clock_seqlock);if (!timers_state.cpu_ticks_enabled) { - timers_state.cpu_ticks_offset -=cpu_get_real_ticks (); + timers_state.cpu_ticks_offset -=cpu_get_host_ticks (); timers_state.cpu_clock_offset -=get_clock (); timers_state.cpu_ticks_enabled =1 ; }
@@ -255,7 +255,7 @@ void cpu_disable_ticks(void)/* Here, the really thing protected by seqlock is cpu_clock_offset. */ seqlock_write_lock (&timers_state.vm_clock_seqlock);if (timers_state.cpu_ticks_enabled) { - timers_state.cpu_ticks_offset +=cpu_get_real_ticks (); + timers_state.cpu_ticks_offset +=cpu_get_host_ticks (); timers_state.cpu_clock_offset =cpu_get_clock_locked (); timers_state.cpu_ticks_enabled =0 ; }
hw/intc/xics.c +1 -1
@@ -848,7 +848,7 @@ static target_ulong h_xirr_x(PowerPCCPU *cpu, sPAPRMachineState *spapr,uint32_t xirr =icp_accept (ss); args[0 ] = xirr; - args[1 ] =cpu_get_real_ticks (); + args[1 ] =cpu_get_host_ticks ();return H_SUCCESS ; }
hw/ppc/ppc.c +2 -2
@@ -834,7 +834,7 @@ static void cpu_ppc_set_tb_clk (void *opaque, uint32_t freq)static void timebase_pre_save (void *opaque) {PPCTimebase *tb = opaque; -uint64_t ticks =cpu_get_real_ticks (); +uint64_t ticks =cpu_get_host_ticks ();PowerPCCPU *first_ppc_cpu =POWERPC_CPU (first_cpu);if (!first_ppc_cpu->env.tb_env) {
@@ -878,7 +878,7 @@ static int timebase_post_load(void *opaque, int version_id) NANOSECONDS_PER_SECOND); guest_tb = tb_remote->guest_timebase +MIN (0 , migration_duration_tb); - tb_off_adj = guest_tb -cpu_get_real_ticks (); + tb_off_adj = guest_tb -cpu_get_host_ticks (); tb_off = first_ppc_cpu->env.tb_env->tb_offset; trace_ppc_tb_adjust(tb_off, tb_off_adj, tb_off_adj - tb_off,
include/qemu/timer.h +10 -10
@@ -857,7 +857,7 @@ int64_t cpu_icount_to_ns(int64_t icount);#if defined(_ARCH_PPC) -static inline int64_t cpu_get_real_ticks (void ) +static inline int64_t cpu_get_host_ticks (void ) {int64_t retval;#ifdef _ARCH_PPC64
@@ -883,7 +883,7 @@ static inline int64_t cpu_get_real_ticks(void)#elif defined(__i386__) -static inline int64_t cpu_get_real_ticks (void ) +static inline int64_t cpu_get_host_ticks (void ) {int64_t val; asmvolatile ("rdtsc" :"=A" (val));
@@ -892,7 +892,7 @@ static inline int64_t cpu_get_real_ticks(void)#elif defined(__x86_64__) -static inline int64_t cpu_get_real_ticks (void ) +static inline int64_t cpu_get_host_ticks (void ) {uint32_t low,high;int64_t val;
@@ -905,7 +905,7 @@ static inline int64_t cpu_get_real_ticks(void)#elif defined(__hppa__) -static inline int64_t cpu_get_real_ticks (void ) +static inline int64_t cpu_get_host_ticks (void ) {int val; asmvolatile ("mfctl %%cr16, %0" :"=r" (val));
@@ -914,7 +914,7 @@ static inline int64_t cpu_get_real_ticks(void)#elif defined(__ia64) -static inline int64_t cpu_get_real_ticks (void ) +static inline int64_t cpu_get_host_ticks (void ) {int64_t val; asmvolatile ("mov %0 = ar.itc" :"=r" (val) ::"memory" );
@@ -923,7 +923,7 @@ static inline int64_t cpu_get_real_ticks(void)#elif defined(__s390__) -static inline int64_t cpu_get_real_ticks (void ) +static inline int64_t cpu_get_host_ticks (void ) {int64_t val; asmvolatile ("stck 0(%1)" :"=m" (val) :"a" (&val) :"cc" );
@@ -932,7 +932,7 @@ static inline int64_t cpu_get_real_ticks(void)#elif defined(__sparc__) -static inline int64_t cpu_get_real_ticks (void ) +static inline int64_t cpu_get_host_ticks (void ) {#if defined(_LP64)uint64_t rval;
@@ -970,7 +970,7 @@ static inline int64_t cpu_get_real_ticks (void) : "=r" (value)); \ } -static inline int64_t cpu_get_real_ticks (void ) +static inline int64_t cpu_get_host_ticks (void ) {/* On kernels >= 2.6.25 rdhwr <reg>, $2 and $3 are emulated */ uint32_t count;
@@ -986,7 +986,7 @@ static inline int64_t cpu_get_real_ticks(void)#elif defined(__alpha__) -static inline int64_t cpu_get_real_ticks (void ) +static inline int64_t cpu_get_host_ticks (void ) {uint64_t cc;uint32_t cur, ofs;
@@ -1001,7 +1001,7 @@ static inline int64_t cpu_get_real_ticks(void)/* The host CPU doesn't have an easily accessible cycle counter. Just return a monotonically increasing value. This will be totally wrong, but hopefully better than nothing. */ -static inline int64_t cpu_get_real_ticks (void ) +static inline int64_t cpu_get_host_ticks (void ) {static int64_t ticks =0 ;return ticks++;
linux-user/main.c +2 -2
@@ -215,7 +215,7 @@ void cpu_list_unlock(void)uint64_t cpu_get_tsc (CPUX86State *env) { -return cpu_get_real_ticks (); +return cpu_get_host_ticks (); } static void write_dt(void *ptr, unsigned long addr, unsigned long limit,
@@ -1425,7 +1425,7 @@ void cpu_loop (CPUSPARCState *env)#ifdef TARGET_PPC static inline uint64_t cpu_ppc_get_tb (CPUPPCState *env) { -return cpu_get_real_ticks (); +return cpu_get_host_ticks (); }uint64_t cpu_ppc_load_tbl (CPUPPCState *env)
target-alpha/sys_helper.c +1 -1
@@ -34,7 +34,7 @@ uint64_t helper_load_pcc(CPUAlphaState *env)#else /* In user-mode, QEMU_CLOCK_VIRTUAL doesn't exist. Just pass through the host cpu clock ticks. Also, don't bother taking PCC_OFS into account. */ -return (uint32_t )cpu_get_real_ticks (); +return (uint32_t )cpu_get_host_ticks ();#endif }
Signature · 3 lines
Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Quoted 2 lines · Christopher Covington
This should help clarify the purpose of the function that returns the host system's CPU cycle count.
+1
Best regards,
Sergey
Quoted 4 lines · Christopher Covington
This should help clarify the purpose of the function that returns the host system's CPU cycle count.
Signed-off-by Christopher Covington <[email protected]>
Acked-by Paolo Bonzini <[email protected]>
Good idea!
Paolo
Quoted 219 lines
--- bsd-user/main.c | 2 +- cpus.c | 6 +++--- hw/intc/xics.c | 2 +- hw/ppc/ppc.c | 4 ++-- include/qemu/timer.h | 20 ++++++++++---------- linux-user/main.c | 4 ++-- target-alpha/sys_helper.c | 2 +- 7 files changed, 20 insertions(+), 20 deletions(-)bsd-user/main.c +1
-1@@ -108,7 +108,7 @@ void cpu_list_unlock(void)uint64_t cpu_get_tsc (CPUX86State *env) { -return cpu_get_real_ticks (); +return cpu_get_host_ticks (); } static void write_dt(void *ptr, unsigned long addr, unsigned long limit,cpus.c +3
-3@@ -191,7 +191,7 @@ int64_t cpu_get_ticks(void) ticks = timers_state.cpu_ticks_offset;if (timers_state.cpu_ticks_enabled) { - ticks +=cpu_get_real_ticks (); + ticks +=cpu_get_host_ticks (); }if (timers_state.cpu_ticks_prev > ticks) {@@ -239,7 +239,7 @@ void cpu_enable_ticks(void)/* Here, the really thing protected by seqlock is cpu_clock_offset. */ seqlock_write_lock (&timers_state.vm_clock_seqlock);if (!timers_state.cpu_ticks_enabled) { - timers_state.cpu_ticks_offset -=cpu_get_real_ticks (); + timers_state.cpu_ticks_offset -=cpu_get_host_ticks (); timers_state.cpu_clock_offset -=get_clock (); timers_state.cpu_ticks_enabled =1 ; }@@ -255,7 +255,7 @@ void cpu_disable_ticks(void)/* Here, the really thing protected by seqlock is cpu_clock_offset. */ seqlock_write_lock (&timers_state.vm_clock_seqlock);if (timers_state.cpu_ticks_enabled) { - timers_state.cpu_ticks_offset +=cpu_get_real_ticks (); + timers_state.cpu_ticks_offset +=cpu_get_host_ticks (); timers_state.cpu_clock_offset =cpu_get_clock_locked (); timers_state.cpu_ticks_enabled =0 ; }hw/intc/xics.c +1
-1@@ -848,7 +848,7 @@ static target_ulong h_xirr_x(PowerPCCPU *cpu, sPAPRMachineState *spapr,uint32_t xirr =icp_accept (ss); args[0 ] = xirr; - args[1 ] =cpu_get_real_ticks (); + args[1 ] =cpu_get_host_ticks ();return H_SUCCESS ; }hw/ppc/ppc.c +2
-2@@ -834,7 +834,7 @@ static void cpu_ppc_set_tb_clk (void *opaque, uint32_t freq)static void timebase_pre_save (void *opaque) {PPCTimebase *tb = opaque; -uint64_t ticks =cpu_get_real_ticks (); +uint64_t ticks =cpu_get_host_ticks ();PowerPCCPU *first_ppc_cpu =POWERPC_CPU (first_cpu);if (!first_ppc_cpu->env.tb_env) {@@ -878,7 +878,7 @@ static int timebase_post_load(void *opaque, int version_id) NANOSECONDS_PER_SECOND); guest_tb = tb_remote->guest_timebase +MIN (0 , migration_duration_tb); - tb_off_adj = guest_tb -cpu_get_real_ticks (); + tb_off_adj = guest_tb -cpu_get_host_ticks (); tb_off = first_ppc_cpu->env.tb_env->tb_offset; trace_ppc_tb_adjust(tb_off, tb_off_adj, tb_off_adj - tb_off,include/qemu/timer.h +10
-10@@ -857,7 +857,7 @@ int64_t cpu_icount_to_ns(int64_t icount);#if defined(_ARCH_PPC) -static inline int64_t cpu_get_real_ticks (void ) +static inline int64_t cpu_get_host_ticks (void ) {int64_t retval;#ifdef _ARCH_PPC64@@ -883,7 +883,7 @@ static inline int64_t cpu_get_real_ticks(void)#elif defined(__i386__) -static inline int64_t cpu_get_real_ticks (void ) +static inline int64_t cpu_get_host_ticks (void ) {int64_t val; asmvolatile ("rdtsc" :"=A" (val));@@ -892,7 +892,7 @@ static inline int64_t cpu_get_real_ticks(void)#elif defined(__x86_64__) -static inline int64_t cpu_get_real_ticks (void ) +static inline int64_t cpu_get_host_ticks (void ) {uint32_t low,high;int64_t val;@@ -905,7 +905,7 @@ static inline int64_t cpu_get_real_ticks(void)#elif defined(__hppa__) -static inline int64_t cpu_get_real_ticks (void ) +static inline int64_t cpu_get_host_ticks (void ) {int val; asmvolatile ("mfctl %%cr16, %0" :"=r" (val));@@ -914,7 +914,7 @@ static inline int64_t cpu_get_real_ticks(void)#elif defined(__ia64) -static inline int64_t cpu_get_real_ticks (void ) +static inline int64_t cpu_get_host_ticks (void ) {int64_t val; asmvolatile ("mov %0 = ar.itc" :"=r" (val) ::"memory" );@@ -923,7 +923,7 @@ static inline int64_t cpu_get_real_ticks(void)#elif defined(__s390__) -static inline int64_t cpu_get_real_ticks (void ) +static inline int64_t cpu_get_host_ticks (void ) {int64_t val; asmvolatile ("stck 0(%1)" :"=m" (val) :"a" (&val) :"cc" );@@ -932,7 +932,7 @@ static inline int64_t cpu_get_real_ticks(void)#elif defined(__sparc__) -static inline int64_t cpu_get_real_ticks (void ) +static inline int64_t cpu_get_host_ticks (void ) {#if defined(_LP64)uint64_t rval;@@ -970,7 +970,7 @@ static inline int64_t cpu_get_real_ticks (void) : "=r" (value)); \ } -static inline int64_t cpu_get_real_ticks (void ) +static inline int64_t cpu_get_host_ticks (void ) {/* On kernels >= 2.6.25 rdhwr <reg>, $2 and $3 are emulated */ uint32_t count;@@ -986,7 +986,7 @@ static inline int64_t cpu_get_real_ticks(void)#elif defined(__alpha__) -static inline int64_t cpu_get_real_ticks (void ) +static inline int64_t cpu_get_host_ticks (void ) {uint64_t cc;uint32_t cur, ofs;@@ -1001,7 +1001,7 @@ static inline int64_t cpu_get_real_ticks(void)/* The host CPU doesn't have an easily accessible cycle counter. Just return a monotonically increasing value. This will be totally wrong, but hopefully better than nothing. */ -static inline int64_t cpu_get_real_ticks (void ) +static inline int64_t cpu_get_host_ticks (void ) {static int64_t ticks =0 ;return ticks++;linux-user/main.c +2
-2@@ -215,7 +215,7 @@ void cpu_list_unlock(void)uint64_t cpu_get_tsc (CPUX86State *env) { -return cpu_get_real_ticks (); +return cpu_get_host_ticks (); } static void write_dt(void *ptr, unsigned long addr, unsigned long limit,@@ -1425,7 +1425,7 @@ void cpu_loop (CPUSPARCState *env)#ifdef TARGET_PPC static inline uint64_t cpu_ppc_get_tb (CPUPPCState *env) { -return cpu_get_real_ticks (); +return cpu_get_host_ticks (); }uint64_t cpu_ppc_load_tbl (CPUPPCState *env)target-alpha/sys_helper.c +1
-1@@ -34,7 +34,7 @@ uint64_t helper_load_pcc(CPUAlphaState *env)#else /* In user-mode, QEMU_CLOCK_VIRTUAL doesn't exist. Just pass through the host cpu clock ticks. Also, don't bother taking PCC_OFS into account. */ -return (uint32_t )cpu_get_real_ticks (); +return (uint32_t )cpu_get_host_ticks ();#endif }
Quoted 4 lines · Christopher Covington
This should help clarify the purpose of the function that returns the host system's CPU cycle count.
Signed-off-by Christopher Covington <[email protected]>
ppc portion
Acked-by David Gibson <[email protected]>
Quoted 218 lines
--- bsd-user/main.c | 2 +- cpus.c | 6 +++--- hw/intc/xics.c | 2 +- hw/ppc/ppc.c | 4 ++-- include/qemu/timer.h | 20 ++++++++++---------- linux-user/main.c | 4 ++-- target-alpha/sys_helper.c | 2 +- 7 files changed, 20 insertions(+), 20 deletions(-)bsd-user/main.c +1
-1@@ -108,7 +108,7 @@ void cpu_list_unlock(void)uint64_t cpu_get_tsc (CPUX86State *env) { -return cpu_get_real_ticks (); +return cpu_get_host_ticks (); } static void write_dt(void *ptr, unsigned long addr, unsigned long limit,cpus.c +3
-3@@ -191,7 +191,7 @@ int64_t cpu_get_ticks(void) ticks = timers_state.cpu_ticks_offset;if (timers_state.cpu_ticks_enabled) { - ticks +=cpu_get_real_ticks (); + ticks +=cpu_get_host_ticks (); }if (timers_state.cpu_ticks_prev > ticks) {@@ -239,7 +239,7 @@ void cpu_enable_ticks(void)/* Here, the really thing protected by seqlock is cpu_clock_offset. */ seqlock_write_lock (&timers_state.vm_clock_seqlock);if (!timers_state.cpu_ticks_enabled) { - timers_state.cpu_ticks_offset -=cpu_get_real_ticks (); + timers_state.cpu_ticks_offset -=cpu_get_host_ticks (); timers_state.cpu_clock_offset -=get_clock (); timers_state.cpu_ticks_enabled =1 ; }@@ -255,7 +255,7 @@ void cpu_disable_ticks(void)/* Here, the really thing protected by seqlock is cpu_clock_offset. */ seqlock_write_lock (&timers_state.vm_clock_seqlock);if (timers_state.cpu_ticks_enabled) { - timers_state.cpu_ticks_offset +=cpu_get_real_ticks (); + timers_state.cpu_ticks_offset +=cpu_get_host_ticks (); timers_state.cpu_clock_offset =cpu_get_clock_locked (); timers_state.cpu_ticks_enabled =0 ; }hw/intc/xics.c +1
-1@@ -848,7 +848,7 @@ static target_ulong h_xirr_x(PowerPCCPU *cpu, sPAPRMachineState *spapr,uint32_t xirr =icp_accept (ss); args[0 ] = xirr; - args[1 ] =cpu_get_real_ticks (); + args[1 ] =cpu_get_host_ticks ();return H_SUCCESS ; }hw/ppc/ppc.c +2
-2@@ -834,7 +834,7 @@ static void cpu_ppc_set_tb_clk (void *opaque, uint32_t freq)static void timebase_pre_save (void *opaque) {PPCTimebase *tb = opaque; -uint64_t ticks =cpu_get_real_ticks (); +uint64_t ticks =cpu_get_host_ticks ();PowerPCCPU *first_ppc_cpu =POWERPC_CPU (first_cpu);if (!first_ppc_cpu->env.tb_env) {@@ -878,7 +878,7 @@ static int timebase_post_load(void *opaque, int version_id) NANOSECONDS_PER_SECOND); guest_tb = tb_remote->guest_timebase +MIN (0 , migration_duration_tb); - tb_off_adj = guest_tb -cpu_get_real_ticks (); + tb_off_adj = guest_tb -cpu_get_host_ticks (); tb_off = first_ppc_cpu->env.tb_env->tb_offset; trace_ppc_tb_adjust(tb_off, tb_off_adj, tb_off_adj - tb_off,include/qemu/timer.h +10
-10@@ -857,7 +857,7 @@ int64_t cpu_icount_to_ns(int64_t icount);#if defined(_ARCH_PPC) -static inline int64_t cpu_get_real_ticks (void ) +static inline int64_t cpu_get_host_ticks (void ) {int64_t retval;#ifdef _ARCH_PPC64@@ -883,7 +883,7 @@ static inline int64_t cpu_get_real_ticks(void)#elif defined(__i386__) -static inline int64_t cpu_get_real_ticks (void ) +static inline int64_t cpu_get_host_ticks (void ) {int64_t val; asmvolatile ("rdtsc" :"=A" (val));@@ -892,7 +892,7 @@ static inline int64_t cpu_get_real_ticks(void)#elif defined(__x86_64__) -static inline int64_t cpu_get_real_ticks (void ) +static inline int64_t cpu_get_host_ticks (void ) {uint32_t low,high;int64_t val;@@ -905,7 +905,7 @@ static inline int64_t cpu_get_real_ticks(void)#elif defined(__hppa__) -static inline int64_t cpu_get_real_ticks (void ) +static inline int64_t cpu_get_host_ticks (void ) {int val; asmvolatile ("mfctl %%cr16, %0" :"=r" (val));@@ -914,7 +914,7 @@ static inline int64_t cpu_get_real_ticks(void)#elif defined(__ia64) -static inline int64_t cpu_get_real_ticks (void ) +static inline int64_t cpu_get_host_ticks (void ) {int64_t val; asmvolatile ("mov %0 = ar.itc" :"=r" (val) ::"memory" );@@ -923,7 +923,7 @@ static inline int64_t cpu_get_real_ticks(void)#elif defined(__s390__) -static inline int64_t cpu_get_real_ticks (void ) +static inline int64_t cpu_get_host_ticks (void ) {int64_t val; asmvolatile ("stck 0(%1)" :"=m" (val) :"a" (&val) :"cc" );@@ -932,7 +932,7 @@ static inline int64_t cpu_get_real_ticks(void)#elif defined(__sparc__) -static inline int64_t cpu_get_real_ticks (void ) +static inline int64_t cpu_get_host_ticks (void ) {#if defined(_LP64)uint64_t rval;@@ -970,7 +970,7 @@ static inline int64_t cpu_get_real_ticks (void) : "=r" (value)); \ } -static inline int64_t cpu_get_real_ticks (void ) +static inline int64_t cpu_get_host_ticks (void ) {/* On kernels >= 2.6.25 rdhwr <reg>, $2 and $3 are emulated */ uint32_t count;@@ -986,7 +986,7 @@ static inline int64_t cpu_get_real_ticks(void)#elif defined(__alpha__) -static inline int64_t cpu_get_real_ticks (void ) +static inline int64_t cpu_get_host_ticks (void ) {uint64_t cc;uint32_t cur, ofs;@@ -1001,7 +1001,7 @@ static inline int64_t cpu_get_real_ticks(void)/* The host CPU doesn't have an easily accessible cycle counter. Just return a monotonically increasing value. This will be totally wrong, but hopefully better than nothing. */ -static inline int64_t cpu_get_real_ticks (void ) +static inline int64_t cpu_get_host_ticks (void ) {static int64_t ticks =0 ;return ticks++;linux-user/main.c +2
-2@@ -215,7 +215,7 @@ void cpu_list_unlock(void)uint64_t cpu_get_tsc (CPUX86State *env) { -return cpu_get_real_ticks (); +return cpu_get_host_ticks (); } static void write_dt(void *ptr, unsigned long addr, unsigned long limit,@@ -1425,7 +1425,7 @@ void cpu_loop (CPUSPARCState *env)#ifdef TARGET_PPC static inline uint64_t cpu_ppc_get_tb (CPUPPCState *env) { -return cpu_get_real_ticks (); +return cpu_get_host_ticks (); }uint64_t cpu_ppc_load_tbl (CPUPPCState *env)target-alpha/sys_helper.c +1
-1@@ -34,7 +34,7 @@ uint64_t helper_load_pcc(CPUAlphaState *env)#else /* In user-mode, QEMU_CLOCK_VIRTUAL doesn't exist. Just pass through the host cpu clock ticks. Also, don't bother taking PCC_OFS into account. */ -return (uint32_t )cpu_get_real_ticks (); +return (uint32_t )cpu_get_host_ticks ();#endif }
Signature · 4 lines
David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson
Michael Tokarev
AppliedQuoted 2 lines · Christopher Covington
This should help clarify the purpose of the function that returns the host system's CPU cycle count.
Applied to -trivial, thank you!
/mjt