ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

am a7d47092: am a75b3de2: Merge "Mark time conversion functions as constexpr"

Browse source 
* commit 'a7d470920f7d92b58e6072c6e5555204655d0467':
  Mark time conversion functions as constexpr
This commit is contained in:
Michael Wright 2015-04-21 23:03:26 +00:00 • committed by Android Git Automerger
commit 97147ef2cd
1 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
include/utils/Timers.h
View file

@ -24,6 +24,8 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/time.h> #include <sys/time.h>
#include <utils/Compat.h>
// ------------------------------------------------------------------ // ------------------------------------------------------------------
// C API // C API
@ -33,46 +35,46 @@ extern "C" {
typedef int64_t nsecs_t; // nano-seconds typedef int64_t nsecs_t; // nano-seconds
static inline nsecs_t seconds_to_nanoseconds(nsecs_t secs) static CONSTEXPR inline nsecs_t seconds_to_nanoseconds(nsecs_t secs)
{ {
return secs*1000000000; return secs*1000000000;
} }
static inline nsecs_t milliseconds_to_nanoseconds(nsecs_t secs) static CONSTEXPR inline nsecs_t milliseconds_to_nanoseconds(nsecs_t secs)
{ {
return secs*1000000; return secs*1000000;
} }
static inline nsecs_t microseconds_to_nanoseconds(nsecs_t secs) static CONSTEXPR inline nsecs_t microseconds_to_nanoseconds(nsecs_t secs)
{ {
return secs*1000; return secs*1000;
} }
static inline nsecs_t nanoseconds_to_seconds(nsecs_t secs) static CONSTEXPR inline nsecs_t nanoseconds_to_seconds(nsecs_t secs)
{ {
return secs/1000000000; return secs/1000000000;
} }
static inline nsecs_t nanoseconds_to_milliseconds(nsecs_t secs) static CONSTEXPR inline nsecs_t nanoseconds_to_milliseconds(nsecs_t secs)
{ {
return secs/1000000; return secs/1000000;
} }
static inline nsecs_t nanoseconds_to_microseconds(nsecs_t secs) static CONSTEXPR inline nsecs_t nanoseconds_to_microseconds(nsecs_t secs)
{ {
return secs/1000; return secs/1000;
} }
static inline nsecs_t s2ns(nsecs_t v) {return seconds_to_nanoseconds(v);} static CONSTEXPR inline nsecs_t s2ns(nsecs_t v) {return seconds_to_nanoseconds(v);}
static inline nsecs_t ms2ns(nsecs_t v) {return milliseconds_to_nanoseconds(v);} static CONSTEXPR inline nsecs_t ms2ns(nsecs_t v) {return milliseconds_to_nanoseconds(v);}
static inline nsecs_t us2ns(nsecs_t v) {return microseconds_to_nanoseconds(v);} static CONSTEXPR inline nsecs_t us2ns(nsecs_t v) {return microseconds_to_nanoseconds(v);}
static inline nsecs_t ns2s(nsecs_t v) {return nanoseconds_to_seconds(v);} static CONSTEXPR inline nsecs_t ns2s(nsecs_t v) {return nanoseconds_to_seconds(v);}
static inline nsecs_t ns2ms(nsecs_t v) {return nanoseconds_to_milliseconds(v);} static CONSTEXPR inline nsecs_t ns2ms(nsecs_t v) {return nanoseconds_to_milliseconds(v);}
static inline nsecs_t ns2us(nsecs_t v) {return nanoseconds_to_microseconds(v);} static CONSTEXPR inline nsecs_t ns2us(nsecs_t v) {return nanoseconds_to_microseconds(v);}
static inline nsecs_t seconds(nsecs_t v) { return s2ns(v); } static CONSTEXPR inline nsecs_t seconds(nsecs_t v) { return s2ns(v); }
static inline nsecs_t milliseconds(nsecs_t v) { return ms2ns(v); } static CONSTEXPR inline nsecs_t milliseconds(nsecs_t v) { return ms2ns(v); }
static inline nsecs_t microseconds(nsecs_t v) { return us2ns(v); } static CONSTEXPR inline nsecs_t microseconds(nsecs_t v) { return us2ns(v); }
enum { enum {
SYSTEM_TIME_REALTIME = 0, // system-wide realtime clock SYSTEM_TIME_REALTIME = 0, // system-wide realtime clock