espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-10-02 05:47:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

[time] unify macros for time unit conversion (#10636)

Browse Source 
This commit unifies macros used for time unit conversion so that we
don't need to define it on different components.
This commit is contained in:
Yakun Xu
2024-08-26 20:26:31 -07:00
committed by GitHub
parent 5e34ab2eab
commit 3c6b8a3dd2
11 changed files with 48 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/platforms/simulation/alarm.c
+10 -14
View File
@@ -51,14 +51,10 @@ timer_t sMicroTimer;
#include <openthread/platform/alarm-micro.h>
#include <openthread/platform/alarm-milli.h>
#include <openthread/platform/diag.h>
#include <openthread/platform/time.h>
#include "lib/platform/exit_code.h"
#define MS_PER_S 1000
#define NS_PER_US 1000
#define US_PER_MS 1000
#define US_PER_S 1000000
#define DEFAULT_TIMEOUT_IN_SEC 10 // seconds
#ifdef CLOCK_MONOTONIC_RAW
@@ -146,7 +142,7 @@ uint64_t platformGetNow(void)
VerifyOrDie(err == 0, OT_EXIT_ERROR_ERRNO);
return (uint64_t)now.tv_sec * sSpeedUpFactor * US_PER_S + (uint64_t)now.tv_nsec * sSpeedUpFactor / NS_PER_US;
return (uint64_t)now.tv_sec * sSpeedUpFactor * OT_US_PER_S + (uint64_t)now.tv_nsec * sSpeedUpFactor / OT_NS_PER_US;
}
#else
uint64_t platformGetNow(void)
@@ -158,11 +154,11 @@ uint64_t platformGetNow(void)
assert(err == 0);
return (uint64_t)tv.tv_sec * sSpeedUpFactor * US_PER_S + (uint64_t)tv.tv_usec * sSpeedUpFactor;
return (uint64_t)tv.tv_sec * sSpeedUpFactor * OT_US_PER_S + (uint64_t)tv.tv_usec * sSpeedUpFactor;
}
#endif // defined(CLOCK_MONOTONIC_RAW) || defined(CLOCK_MONOTONIC)
uint32_t otPlatAlarmMilliGetNow(void) { return (uint32_t)(platformGetNow() / US_PER_MS); }
uint32_t otPlatAlarmMilliGetNow(void) { return (uint32_t)(platformGetNow() / OT_US_PER_MS); }
void otPlatAlarmMilliStartAt(otInstance *aInstance, uint32_t aT0, uint32_t aDt)
{
@@ -193,8 +189,8 @@ void otPlatAlarmMicroStartAt(otInstance *aInstance, uint32_t aT0, uint32_t aDt)
struct itimerspec its;
uint32_t diff = sUsAlarm - otPlatAlarmMicroGetNow();
its.it_value.tv_sec = diff / US_PER_S;
its.it_value.tv_nsec = (diff % US_PER_S) * NS_PER_US;
its.it_value.tv_sec = diff / OT_US_PER_S;
its.it_value.tv_nsec = (diff % OT_US_PER_S) * OT_NS_PER_US;
its.it_interval.tv_sec = 0;
its.it_interval.tv_nsec = 0;
@@ -229,7 +225,7 @@ void otPlatAlarmMicroStop(otInstance *aInstance)
void platformAlarmUpdateTimeout(struct timeval *aTimeout)
{
uint64_t remaining = DEFAULT_TIMEOUT_IN_SEC * US_PER_S; // in usec.
uint64_t remaining = DEFAULT_TIMEOUT_IN_SEC * OT_US_PER_S; // in usec.
assert(aTimeout != NULL);
@@ -237,7 +233,7 @@ void platformAlarmUpdateTimeout(struct timeval *aTimeout)
{
uint32_t msRemaining = calculateDuration(sMsAlarm, otPlatAlarmMilliGetNow());
remaining = ((uint64_t)msRemaining) * US_PER_MS;
remaining = ((uint64_t)msRemaining) * OT_US_PER_MS;
}
if (sIsUsRunning)
@@ -264,8 +260,8 @@ void platformAlarmUpdateTimeout(struct timeval *aTimeout)
remaining = 1;
}
aTimeout->tv_sec = (time_t)(remaining / US_PER_S);
aTimeout->tv_usec = remaining % US_PER_S;
aTimeout->tv_sec = (time_t)(remaining / OT_US_PER_S);
aTimeout->tv_usec = remaining % OT_US_PER_S;
}
}
examples/platforms/simulation/radio.c
+2 -5
View File
@@ -47,9 +47,6 @@
#include "utils/mac_frame.h"
#include "utils/soft_source_match_table.h"
#define MS_PER_S 1000
#define US_PER_MS 1000
enum
{
IEEE802154_ACK_LENGTH = 5,
@@ -814,8 +811,8 @@ void platformRadioUpdateFdSet(fd_set *aReadFdSet, fd_set *aWriteFdSet, struct ti
{
uint32_t remaining = sEnergyScanEndTime - now;
tv.tv_sec = remaining / MS_PER_S;
tv.tv_usec = (remaining % MS_PER_S) * US_PER_MS;
tv.tv_sec = remaining / OT_MS_PER_S;
tv.tv_usec = (remaining % OT_MS_PER_S) * OT_US_PER_MS;
}
if (timercmp(&tv, aTimeout, <))
examples/platforms/simulation/virtual_time/alarm-sim.c
+3 -4
View File
@@ -37,8 +37,7 @@
#include <openthread/platform/alarm-micro.h>
#include <openthread/platform/alarm-milli.h>
#include <openthread/platform/diag.h>
#define US_PER_MS 1000
#include <openthread/platform/time.h>
extern uint64_t sNow; // microseconds
@@ -59,7 +58,7 @@ uint64_t platformAlarmGetNow(void) { return sNow; }
void platformAlarmAdvanceNow(uint64_t aDelta) { sNow += aDelta; }
uint32_t otPlatAlarmMilliGetNow(void) { return (uint32_t)(sNow / US_PER_MS); }
uint32_t otPlatAlarmMilliGetNow(void) { return (uint32_t)(sNow / OT_US_PER_MS); }
void otPlatAlarmMilliStartAt(otInstance *aInstance, uint32_t aT0, uint32_t aDt)
{
@@ -108,7 +107,7 @@ uint64_t platformAlarmGetNext(void)
else
{
remaining = (uint64_t)milli;
remaining *= US_PER_MS;
remaining *= OT_US_PER_MS;
}
}