aboutsummaryrefslogtreecommitdiff
path: root/platform
diff options
context:
space:
mode:
authorMatias Elo <matias.elo@nokia.com>2022-05-02 11:08:26 +0300
committerMatias Elo <matias.elo@nokia.com>2022-05-25 10:58:00 +0300
commit0e972e5ef7c6cd2c580055274437e21fd43ebd55 (patch)
tree383a4185f5cf0fa0e82bbac062d6772133415943 /platform
parent81a43db0be14d1a5706562c1da592ed9618d0e8d (diff)
Port 9e464f4ce "linux-gen: time: inline odp_time_diff_ns() function"
Port original commit from linux-generic. Signed-off-by: Matias Elo <matias.elo@nokia.com> Reviewed-by: Tuomas Taipale <tuomas.taipale@nokia.com>
Diffstat (limited to 'platform')
-rw-r--r--platform/linux-dpdk/include/odp/api/plat/time_inlines.h12
-rw-r--r--platform/linux-dpdk/odp_time.c11
2 files changed, 12 insertions, 11 deletions
diff --git a/platform/linux-dpdk/include/odp/api/plat/time_inlines.h b/platform/linux-dpdk/include/odp/api/plat/time_inlines.h
index c007c5ce9..0ab2b37c0 100644
--- a/platform/linux-dpdk/include/odp/api/plat/time_inlines.h
+++ b/platform/linux-dpdk/include/odp/api/plat/time_inlines.h
@@ -1,5 +1,5 @@
/* Copyright (c) 2018, Linaro Limited
- * Copyright (c) 2020-2021, Nokia
+ * Copyright (c) 2020-2022, Nokia
* All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
@@ -123,6 +123,7 @@ static inline uint64_t _odp_time_convert_to_ns(odp_time_t time)
#define odp_time_cmp __odp_time_cmp
#define odp_time_diff __odp_time_diff
+ #define odp_time_diff_ns __odp_time_diff_ns
#define odp_time_sum __odp_time_sum
#else
@@ -194,6 +195,15 @@ _ODP_INLINE odp_time_t odp_time_diff(odp_time_t t2, odp_time_t t1)
return time;
}
+_ODP_INLINE uint64_t odp_time_diff_ns(odp_time_t t2, odp_time_t t1)
+{
+ odp_time_t time;
+
+ time.u64 = t2.u64 - t1.u64;
+
+ return odp_time_to_ns(time);
+}
+
_ODP_INLINE odp_time_t odp_time_sum(odp_time_t t1, odp_time_t t2)
{
odp_time_t time;
diff --git a/platform/linux-dpdk/odp_time.c b/platform/linux-dpdk/odp_time.c
index a53240564..e7cd5d1bb 100644
--- a/platform/linux-dpdk/odp_time.c
+++ b/platform/linux-dpdk/odp_time.c
@@ -1,5 +1,5 @@
/* Copyright (c) 2013-2018, Linaro Limited
- * Copyright (c) 2021, Nokia
+ * Copyright (c) 2021-2022, Nokia
* All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
@@ -174,15 +174,6 @@ static inline void time_wait_until(odp_time_t time)
} while (odp_time_cmp(time, cur) > 0);
}
-uint64_t odp_time_diff_ns(odp_time_t t2, odp_time_t t1)
-{
- odp_time_t time;
-
- time.u64 = t2.u64 - t1.u64;
-
- return odp_time_to_ns(time);
-}
-
odp_time_t odp_time_local_from_ns(uint64_t ns)
{
return time_from_ns(ns);