Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a75b3de2 authored by Michael Wright's avatar Michael Wright Committed by Gerrit Code Review
Browse files

Merge "Mark time conversion functions as constexpr"

parents 088c4f3b 65e93c3b

include/utils/Timers.h

+17 −15
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ 
#include <sys/types.h>

#include <sys/time.h>



#include <utils/Compat.h>



// ------------------------------------------------------------------

// C API
@@ -33,46 +35,46 @@ extern "C" { 


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;

}



static inline nsecs_t milliseconds_to_nanoseconds(nsecs_t secs)

static CONSTEXPR inline nsecs_t milliseconds_to_nanoseconds(nsecs_t secs)

{

    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;

}



static inline nsecs_t nanoseconds_to_seconds(nsecs_t secs)

static CONSTEXPR inline nsecs_t nanoseconds_to_seconds(nsecs_t secs)

{

    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;

}



static inline nsecs_t nanoseconds_to_microseconds(nsecs_t secs)

static CONSTEXPR inline nsecs_t nanoseconds_to_microseconds(nsecs_t secs)

{

    return secs/1000;

}



static 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 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 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 s2ns(nsecs_t v)  {return seconds_to_nanoseconds(v);}

static CONSTEXPR inline nsecs_t ms2ns(nsecs_t v) {return milliseconds_to_nanoseconds(v);}

static CONSTEXPR inline nsecs_t us2ns(nsecs_t v) {return microseconds_to_nanoseconds(v);}

static CONSTEXPR inline nsecs_t ns2s(nsecs_t v)  {return nanoseconds_to_seconds(v);}

static CONSTEXPR inline nsecs_t ns2ms(nsecs_t v) {return nanoseconds_to_milliseconds(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 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 seconds(nsecs_t v)      { return s2ns(v); }

static CONSTEXPR inline nsecs_t milliseconds(nsecs_t v) { return ms2ns(v); }

static CONSTEXPR inline nsecs_t microseconds(nsecs_t v) { return us2ns(v); }



enum {

    SYSTEM_TIME_REALTIME = 0,  // system-wide realtime clock