FOME-Tech
/
fome-fw
mirror of https://github.com/FOME-Tech/fome-fw.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove scheduleForLater

This commit is contained in:
Matthew Kennedy 2024-07-11 16:27:30 -07:00
parent adb5773c5f
commit 1731b30337
8 changed files with 4 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
firmware/controllers/system/timer/scheduler.h
View File

@ -85,7 +85,6 @@ struct ExecutorInterface {
*/
virtual void scheduleByTimestamp(const char *msg, scheduling_s *scheduling, efitimeus_t timeUs, action_s action) = 0;
virtual void scheduleByTimestampNt(const char *msg, scheduling_s *scheduling, efitick_t timeNt, action_s action) = 0;
virtual void scheduleForLater(const char *msg, scheduling_s *scheduling, int delayUs, action_s action) = 0;
virtual void cancel(scheduling_s* scheduling) = 0;
};

4
firmware/controllers/system/timer/single_timer_executor.cpp
View File

@ -45,10 +45,6 @@ SingleTimerExecutor::SingleTimerExecutor()
{
}
void SingleTimerExecutor::scheduleForLater(const char *msg, scheduling_s *scheduling, int delayUs, action_s action) {
scheduleByTimestamp(msg, scheduling, getTimeNowUs() + delayUs, action);
}
/**
* @brief Schedule an event at specific delay after now
*

1
firmware/controllers/system/timer/single_timer_executor.h
View File

@ -15,7 +15,6 @@ public:
SingleTimerExecutor();
void scheduleByTimestamp(const char *msg, scheduling_s *scheduling, efitimeus_t timeUs, action_s action) override;
void scheduleByTimestampNt(const char *msg, scheduling_s *scheduling, efitick_t timeNt, action_s action) override;
void scheduleForLater(const char *msg, scheduling_s *scheduling, int delayUs, action_s action) override;
void cancel(scheduling_s* scheduling) override;
void onTimerCallback();

10
simulator/simulator/system/signal_executor_sleep.cpp
View File

@ -35,8 +35,10 @@ struct CallbackContext
bool shouldFree = false;
};
void SleepExecutor::scheduleByTimestamp(const char *msg, scheduling_s *scheduling, efitimeus_t timeUs, action_s action) {
scheduleForLater(msg, scheduling, timeUs - getTimeNowUs(), action);
static void doScheduleForLater(scheduling_s *scheduling, int delayUs, action_s action);
void SleepExecutor::scheduleByTimestamp(const char* /*msg*/, scheduling_s *scheduling, efitimeus_t timeUs, action_s action) {
doScheduleForLater(scheduling, timeUs - getTimeNowUs(), action);
}
void SleepExecutor::scheduleByTimestampNt(const char *msg, scheduling_s* scheduling, efitick_t timeNt, action_s action) {
@ -90,10 +92,6 @@ static void doScheduleForLater(scheduling_s *scheduling, int delayUs, action_s a
chVTSetI(&scheduling->timer, delaySt, (vtfunc_t)timerCallback, ctx);
}
void SleepExecutor::scheduleForLater(const char *msg, scheduling_s *scheduling, int delayUs, action_s action) {
doScheduleForLater(scheduling, delayUs, action);
}
void SleepExecutor::cancel(scheduling_s* s) {
chibios_rt::CriticalSectionLocker csl;

1
simulator/simulator/system/signal_executor_sleep.h
View File

@ -13,6 +13,5 @@ class SleepExecutor : public ExecutorInterface {
public:
void scheduleByTimestamp(const char *msg, scheduling_s *scheduling, efitimeus_t timeUs, action_s action) override;
void scheduleByTimestampNt(const char *msg, scheduling_s *scheduling, efitick_t timeNt, action_s action) override;
void scheduleForLater(const char *msg, scheduling_s *scheduling, int delayUs, action_s action) override;
void cancel(scheduling_s* s) override;
};

13
unit_tests/global_execution_queue.cpp
View File

@ -15,19 +15,6 @@ TestExecutor::~TestExecutor() {
clear();
}
void TestExecutor::scheduleForLater(const char *msg, scheduling_s *scheduling, int delayUs, action_s action) {
if (debugSignalExecutor) {
printf("scheduleTask %d\r\n", delayUs);
}
if (m_mockExecutor) {
m_mockExecutor->scheduleForLater(msg, scheduling, delayUs, action);
return;
}
scheduleByTimestamp(msg, scheduling, getTimeNowUs() + delayUs, action);
}
int TestExecutor::executeAll(efitick_t now) {
return schedulingQueue.executeAll(now);
}

1
unit_tests/global_execution_queue.h
View File

@ -16,7 +16,6 @@ public:
void scheduleByTimestamp(const char *msg, scheduling_s *scheduling, efitimeus_t timeUs, action_s action) override;
void scheduleByTimestampNt(const char *msg, scheduling_s *scheduling, efitick_t timeNt, action_s action) override;
void scheduleForLater(const char *msg, scheduling_s *scheduling, int delayUs, action_s action) override;
void cancel(scheduling_s* scheduling) override;
void clear();

1
unit_tests/mocks.h
View File

@ -81,7 +81,6 @@ public:
MOCK_METHOD(void, scheduleByTimestamp, (const char *msg, scheduling_s *scheduling, efitimeus_t timeUs, action_s action), (override));
MOCK_METHOD(void, scheduleByTimestampNt, (const char *msg, scheduling_s *scheduling, efitick_t timeNt, action_s action), (override));
MOCK_METHOD(void, scheduleForLater, (const char *msg, scheduling_s *scheduling, int delayUs, action_s action), (override));
MOCK_METHOD(void, cancel, (scheduling_s*), (override));
};