espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-08-05 18:37:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

[simulation] update alarm to avoid cast from uint to int (#7017)

Browse Source 
This commit updates and simplifies the `alarm` platform implementation
under simulation by adding new functions to determine whether a timer
is expired and calculate the remaining time. The new code does not
use casting a `uint32_t` value to an `int32_t` (since its behavior is
toolchain/compiler dependent and it is not defined by the C++
standard).
This commit is contained in:
Abtin Keshavarzian
2021-09-20 13:21:36 -07:00
committed by GitHub
parent 00da94e20d
commit 5c22f6c521
1 changed files with 45 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/platforms/simulation/alarm.c
+45 -47
View File
@@ -59,7 +59,7 @@ timer_t sMicroTimer;
#define US_PER_MS 1000
#define US_PER_S 1000000
#define DEFAULT_TIMEOUT 10 // seconds
#define DEFAULT_TIMEOUT_IN_SEC 10 // seconds
#ifdef CLOCK_MONOTONIC_RAW
#define OT_SIMULATION_CLOCK_ID CLOCK_MONOTONIC_RAW
@@ -86,6 +86,23 @@ static void microTimerHandler(int aSignal, siginfo_t *aSignalInfo, void *aUserCo
}
#endif
static bool isExpired(uint32_t aTime, uint32_t aNow)
{
// Determine whether or not `aTime` is before or same as `aNow`.
uint32_t diff = aNow - aTime;
return (diff & (1U << 31)) == 0;
}
static uint32_t calculateDuration(uint32_t aTime, uint32_t aNow)
{
// Return the time duration from `aNow` to `aTime` if `aTimer` is
// after `aNow`, otherwise return zero.
return isExpired(aTime, aNow) ? 0 : aTime - aNow;
}
void platformAlarmInit(uint32_t aSpeedUpFactor)
{
sSpeedUpFactor = aSpeedUpFactor;
@@ -218,38 +235,34 @@ void otPlatAlarmMicroStop(otInstance *aInstance)
void platformAlarmUpdateTimeout(struct timeval *aTimeout)
{
int32_t usRemaining = DEFAULT_TIMEOUT * US_PER_S;
int32_t msRemaining = DEFAULT_TIMEOUT * MS_PER_S;
uint64_t remaining = DEFAULT_TIMEOUT_IN_SEC * US_PER_S; // in usec.
if (aTimeout == NULL)
assert(aTimeout != NULL);
if (sIsMsRunning)
{
return;
uint32_t msRemaining = calculateDuration(sMsAlarm, otPlatAlarmMilliGetNow());
remaining = ((uint64_t)msRemaining) * US_PER_MS;
}
if (sIsUsRunning)
{
usRemaining = (int32_t)(sUsAlarm - otPlatAlarmMicroGetNow());
uint32_t usRemaining = calculateDuration(sUsAlarm, otPlatAlarmMicroGetNow());
if (usRemaining < remaining)
{
remaining = usRemaining;
}
}
if (sIsMsRunning)
{
msRemaining = (int32_t)(sMsAlarm - otPlatAlarmMilliGetNow());
}
if (usRemaining <= 0 || msRemaining <= 0)
if (remaining == 0)
{
aTimeout->tv_sec = 0;
aTimeout->tv_usec = 0;
}
else
{
int64_t remaining = ((int64_t)msRemaining) * US_PER_MS;
if (usRemaining < remaining)
{
remaining = usRemaining;
}
remaining /= sSpeedUpFactor;
if (remaining == 0)
@@ -264,45 +277,30 @@ void platformAlarmUpdateTimeout(struct timeval *aTimeout)
void platformAlarmProcess(otInstance *aInstance)
{
int32_t remaining;
if (sIsMsRunning)
if (sIsMsRunning && isExpired(sMsAlarm, otPlatAlarmMilliGetNow()))
{
remaining = (int32_t)(sMsAlarm - otPlatAlarmMilliGetNow());
if (remaining <= 0)
{
sIsMsRunning = false;
sIsMsRunning = false;
#if OPENTHREAD_CONFIG_DIAG_ENABLE
if (otPlatDiagModeGet())
{
otPlatDiagAlarmFired(aInstance);
}
else
if (otPlatDiagModeGet())
{
otPlatDiagAlarmFired(aInstance);
}
else
#endif
{
otPlatAlarmMilliFired(aInstance);
}
{
otPlatAlarmMilliFired(aInstance);
}
}
#if OPENTHREAD_CONFIG_PLATFORM_USEC_TIMER_ENABLE
if (sIsUsRunning)
if (sIsUsRunning && isExpired(sUsAlarm, otPlatAlarmMicroGetNow()))
{
remaining = (int32_t)(sUsAlarm - otPlatAlarmMicroGetNow());
sIsUsRunning = false;
if (remaining <= 0)
{
sIsUsRunning = false;
otPlatAlarmMicroFired(aInstance);
}
otPlatAlarmMicroFired(aInstance);
}
#endif // OPENTHREAD_CONFIG_PLATFORM_USEC_TIMER_ENABLE
#endif
}
uint64_t otPlatTimeGet(void)