Implemented odp_cpu_cycles() be renaming odp_time_cycles()
implementation. Time implementation uses odp_cpu_cycles
temporarely.

Signed-off-by: Petri Savolainen <petri.savolai...@nokia.com>
---
 platform/linux-generic/arch/linux/odp_cpu_cycles.c  | 4 ++--
 platform/linux-generic/arch/mips64/odp_cpu_cycles.c | 4 ++--
 platform/linux-generic/arch/x86/odp_cpu_cycles.c    | 4 ++--
 platform/linux-generic/odp_time.c                   | 6 ++++++
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/platform/linux-generic/arch/linux/odp_cpu_cycles.c 
b/platform/linux-generic/arch/linux/odp_cpu_cycles.c
index 256ad7c..c312f3d 100644
--- a/platform/linux-generic/arch/linux/odp_cpu_cycles.c
+++ b/platform/linux-generic/arch/linux/odp_cpu_cycles.c
@@ -9,14 +9,14 @@
 #include <stdlib.h>
 #include <time.h>
 
-#include <odp/time.h>
+#include <odp/cpu.h>
 #include <odp/hints.h>
 #include <odp/system_info.h>
 #include <odp_debug_internal.h>
 
 #define GIGA 1000000000
 
-uint64_t odp_time_cycles(void)
+uint64_t odp_cpu_cycles(void)
 {
        struct timespec time;
        uint64_t sec, ns, hz, cycles;
diff --git a/platform/linux-generic/arch/mips64/odp_cpu_cycles.c 
b/platform/linux-generic/arch/mips64/odp_cpu_cycles.c
index 4fb790b..acd7058 100644
--- a/platform/linux-generic/arch/mips64/odp_cpu_cycles.c
+++ b/platform/linux-generic/arch/mips64/odp_cpu_cycles.c
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/time.h>
+#include <odp/cpu.h>
 #include <odp/hints.h>
 #include <odp/system_info.h>
 
-uint64_t odp_time_cycles(void)
+uint64_t odp_cpu_cycles(void)
 {
        #define CVMX_TMP_STR(x) CVMX_TMP_STR2(x)
        #define CVMX_TMP_STR2(x) #x
diff --git a/platform/linux-generic/arch/x86/odp_cpu_cycles.c 
b/platform/linux-generic/arch/x86/odp_cpu_cycles.c
index a111561..20ad44a 100644
--- a/platform/linux-generic/arch/x86/odp_cpu_cycles.c
+++ b/platform/linux-generic/arch/x86/odp_cpu_cycles.c
@@ -3,9 +3,9 @@
  *
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include <odp/time.h>
+#include <odp/cpu.h>
 
-uint64_t odp_time_cycles(void)
+uint64_t odp_cpu_cycles(void)
 {
        union {
                uint64_t tsc_64;
diff --git a/platform/linux-generic/odp_time.c 
b/platform/linux-generic/odp_time.c
index a08833d..6e69e53 100644
--- a/platform/linux-generic/odp_time.c
+++ b/platform/linux-generic/odp_time.c
@@ -9,9 +9,15 @@
 #include <odp/time.h>
 #include <odp/hints.h>
 #include <odp/system_info.h>
+#include <odp/cpu.h>
 
 #define GIGA 1000000000
 
+uint64_t odp_time_cycles(void)
+{
+       return odp_cpu_cycles();
+}
+
 uint64_t odp_time_diff_cycles(uint64_t t1, uint64_t t2)
 {
        if (odp_likely(t2 > t1))
-- 
2.5.1

_______________________________________________
lng-odp mailing list
lng-odp@lists.linaro.org
https://lists.linaro.org/mailman/listinfo/lng-odp

Reply via email to