andreika-git
/
rusefi
mirror of https://github.com/andreika-git/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

only:removing scheduleByTimestamp, making API simpler

This commit is contained in:
Andrey 2024-07-15 10:19:35 -04:00
parent db0b61cd6c
commit 59bf19ede3
8 changed files with 1 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -96,7 +96,6 @@ struct ExecutorInterface {
/**
* see also scheduleByAngle
*/
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 cancel(scheduling_s* scheduling) = 0;
};

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

@ -45,20 +45,6 @@ SingleTimerExecutor::SingleTimerExecutor()
{
}
/**
* @brief Schedule an event at specific delay after now
*
* Invokes event callback after the specified amount of time.
* callback would be executed either on ISR thread or current thread if we would need to execute right away
*
* @param [in, out] scheduling Data structure to keep this event in the collection.
* @param [in] delayUs the number of microseconds before the output signal immediate output if delay is zero.
* @param [in] dwell the number of ticks of output duration.
*/
void SingleTimerExecutor::scheduleByTimestamp(const char *msg, scheduling_s *scheduling, efitimeus_t timeUs, action_s action) {
scheduleByTimestampNt(msg, scheduling, US2NT(timeUs), action);
}
void SingleTimerExecutor::scheduleByTimestampNt(const char *msg, scheduling_s* scheduling, efitick_t nt, action_s action) {
ScopePerf perf(PE::SingleTimerExecutorScheduleByTimestamp);

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

@ -13,7 +13,6 @@
class SingleTimerExecutor final : public ExecutorInterface {
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 cancel(scheduling_s* scheduling) override;

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

@ -38,12 +38,8 @@ struct CallbackContext
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) {
scheduleByTimestamp(msg, scheduling, NT2US(timeNt), action);
doScheduleForLater(scheduling, NT2US(timeNt) - getTimeNowUs(), action);
}
static void timerCallback(CallbackContext* ctx) {

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

@ -11,7 +11,6 @@
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 cancel(scheduling_s* s) override;
};

1
unit_tests/mocks.h
View File

@ -80,7 +80,6 @@ public:
MockExecutor();
virtual ~MockExecutor();
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, cancel, (scheduling_s*), (override));
};

17
unit_tests/test-framework/test_executor.cpp
View File

@ -35,23 +35,6 @@ scheduling_s* TestExecutor::getForUnitTest(int index) {
return schedulingQueue.getElementAtIndexForUnitText(index);
}
void TestExecutor::scheduleByTimestamp(const char *msg, scheduling_s *scheduling, efitimeus_t timeUs, action_s action) {
if (timeUs < 0) {
throw std::runtime_error("Negative timeUs not expected.");
}
if (debugSignalExecutor) {
printf("scheduleByTime %d\r\n", timeUs);
}
if (m_mockExecutor) {
m_mockExecutor->scheduleByTimestamp(msg, scheduling, timeUs, action);
return;
}
schedulingQueue.insertTask(scheduling, US2NT(timeUs), action);
}
void TestExecutor::scheduleByTimestampNt(const char *msg, scheduling_s* scheduling, efitick_t timeNt, action_s action) {
if (m_mockExecutor) {
m_mockExecutor->scheduleByTimestampNt(msg, scheduling, timeNt, action);

1
unit_tests/test-framework/test_executor.h
View File

@ -15,7 +15,6 @@ class TestExecutor : public ExecutorInterface {
public:
~TestExecutor();
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 cancel(scheduling_s* scheduling) override;