Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix bool timer implementation in WIN32 #1850

Merged
merged 1 commit into from
Mar 5, 2021
Merged

Fix bool timer implementation in WIN32 #1850

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion targets/win32/nanoCLR/nanoCLR.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@
<ClCompile Include="..\..\..\src\PAL\AsyncProcCall\AsyncContinuations.cpp" />
<ClCompile Include="..\..\..\src\PAL\Double\nanoPAL_NativeDouble.cpp" />
<ClCompile Include="CLRStartup.cpp" />
<ClCompile Include="Events.cpp" />
<ClCompile Include="targetPAL_Events.cpp" />
<ClCompile Include="FileStore_Win32.cpp" />
<ClCompile Include="Generated\CLR_RT_InteropAssembliesTable.cpp" />
<ClCompile Include="Memory.cpp" />
Expand Down
8 changes: 4 additions & 4 deletions targets/win32/nanoCLR/nanoCLR.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,6 @@
<ClCompile Include="Various.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Events.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="WatchDog.cpp">
<Filter>Source Files</Filter>
</ClCompile>
Expand Down Expand Up @@ -131,8 +128,11 @@
<ClCompile Include="targetRandom.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="targetPAL_Events.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<Text Include="README.txt" />
</ItemGroup>
</Project>
</Project>
47 changes: 23 additions & 24 deletions targets/win32/nanoCLR/Events.cpp → targets/win32/nanoCLR/targetPAL_Events.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,46 +3,45 @@
// Portions Copyright (c) Microsoft Corporation. All rights reserved.
// See LICENSE file in the project root for full license information.
//

#include "stdafx.h"
#include <Win32TimerQueue.h>

HAL_COMPLETION g_Events_BoolTimerCompletion;
static std::unique_ptr<Microsoft::Win32::Timer> boolEventsTimer;
static bool *saveTimerCompleteFlag = 0;

static void local_Events_SetBoolTimer_Callback(void *arg)
void local_Events_SetBoolTimer_Callback()
{
NATIVE_PROFILE_PAL_EVENTS();
bool *TimerCompleteFlag = (bool *)arg;

*TimerCompleteFlag = TRUE;
*saveTimerCompleteFlag = true;
}

void Events_SetBoolTimer(bool *timerCompleteFlag, uint32_t millisecondsFromNow)
bool Events_Initialize_Platform()
{
NATIVE_PROFILE_PAL_EVENTS();
// we assume only 1 can be active, abort previous just in case
g_Events_BoolTimerCompletion.Abort();
boolEventsTimer = NULL;

if (timerCompleteFlag)
{
g_Events_BoolTimerCompletion.InitializeForISR(local_Events_SetBoolTimer_Callback, timerCompleteFlag);
g_Events_BoolTimerCompletion.EnqueueDelta(millisecondsFromNow * 1000);
}
return true;
}

void HAL_COMPLETION::EnqueueDelta64(UINT64 uSecFromNow)
void Events_SetBoolTimer(bool *timerCompleteFlag, uint32_t millisecondsFromNow)
{
NATIVE_PROFILE_PAL_ASYNC_PROC_CALL();
NATIVE_PROFILE_PAL_EVENTS();

// grab time first to be closest to now as possible from when this function was called
uint64_t now = HAL_Time_CurrentSysTicks();
uint64_t eventTimeTicks = CPU_MicrosecondsToTicks(uSecFromNow);
// we assume only 1 can be active, abort previous just in case
if (boolEventsTimer != NULL)
{
boolEventsTimer.release();
}

EnqueueTicks(now * CPU_TicksPerSecond() + eventTimeTicks);
}
if (timerCompleteFlag)
{
// As only one timer running at a time we will just save it
saveTimerCompleteFlag = timerCompleteFlag;

void HAL_COMPLETION::EnqueueDelta(UINT32 uSecFromNow)
{
NATIVE_PROFILE_PAL_ASYNC_PROC_CALL();
EnqueueDelta64((UINT64)uSecFromNow);
boolEventsTimer =
std::make_unique<Microsoft::Win32::Timer>(millisecondsFromNow, local_Events_SetBoolTimer_Callback);
}
}

// mutex, condition variable and flags for CLR's global events state
Expand Down
79 changes: 5 additions & 74 deletions targets/win32/nanoCLR/targetPAL_Time.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,82 +19,13 @@ void Time_SetCompare(UINT64 CompareValue)
// convert to milliseconds for OS timer
auto compareMs = CompareValue / (CPU_TicksPerSecond() * (uint64_t)1000);
ASSERT(compareMs < UINT32_MAX);

if (compareMs == 0)
{
TimerCallback();
}
else
{
pCompletionsTimer = std::make_unique<Microsoft::Win32::Timer>((UINT32)compareMs, TimerCallback);
}
}

//
//
//// timer for next event
// static virtual_timer_t nextEventTimer;
// void* nextEventCallbackDummyArg = NULL;
//
// static void NextEventTimer_Callback( void* arg )
//{
// (void)arg;
//
// // this call also schedules the next one, if there is one
// HAL_COMPLETION::DequeueAndExec();
//}
//
// HRESULT Time_Initialize()
//{
// // need to setup the timer at boot, but stopped
// chVTSet(&nextEventTimer, TIME_INFINITE, NextEventTimer_Callback, nextEventCallbackDummyArg);
//
// return S_OK;
//}
//
// HRESULT Time_Uninitialize()
//{
// chVTReset(&nextEventTimer);
//
// // nothing to do here has time management is handled by ChibiOS
// return S_OK;
//}
//
// void Time_SetCompare ( uint64_t compareValueTicks )
//{
// if(compareValueTicks == 0)
// {
// // compare value is 0 so dequeue and schedule immediately
// // can't call chVTSet with 'immediate delay value', so use value 1 to get it executed ASAP
// chVTSet(&nextEventTimer, 1, NextEventTimer_Callback, nextEventCallbackDummyArg);
// }
// else if(compareValueTicks == HAL_COMPLETION_IDLE_VALUE)
// {
// // wait for infinity, don't need to do anything here
// }
// else
// {
// if (HAL_Time_CurrentSysTicks() >= compareValueTicks)
// {
// // already missed the event, dequeue and execute immediately
// // can't call chVTSet with 'immediate delay value', so use value 1 to get it executed ASAP
// chVTSet(&nextEventTimer, 1, NextEventTimer_Callback, nextEventCallbackDummyArg);
// }
// else
// {
// // compareValueTicks is the time (in sys ticks) that is being requested to fire an
// HAL_COMPLETION::DequeueAndExec()
// // need to subtract the current system time to set when the timer will fire
// // compareValueTicks is in CMSIS ticks (which equals to ms), so we use TIME_MS2I only to round
// compareValueTicks -= HAL_Time_CurrentSysTicks();
// uint64_t delay = TIME_MS2I(compareValueTicks);
//
// // make sure that chVTSet does not get called with zero delay
// if (delay == 0)
// {
// // compare value is 0 so dequeue and execute immediately
// // no need to call the timer
// HAL_COMPLETION::DequeueAndExec();
// return;
// }
//
// // no need to stop the timer if it's running because the API does it anyway
// chVTSet(&nextEventTimer, delay, NextEventTimer_Callback, nextEventCallbackDummyArg);
// }
// }
//}