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

pack scheduling_s (#2642) 

* pack scheduling_s

* ramz
This commit is contained in:
Matthew Kennedy 2021-05-07 05:22:35 -07:00 committed by GitHub
parent 231d6bd3df
commit b12d392343
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/controllers/engine_controller.cpp
View File

@ -702,7 +702,7 @@ void initEngineContoller(DECLARE_ENGINE_PARAMETER_SUFFIX) {
* UNUSED_SIZE constants. * UNUSED_SIZE constants.
*/ */
#ifndef RAM_UNUSED_SIZE #ifndef RAM_UNUSED_SIZE
#define RAM_UNUSED_SIZE 3000 #define RAM_UNUSED_SIZE 4000
#endif #endif
#ifndef CCM_UNUSED_SIZE #ifndef CCM_UNUSED_SIZE
#define CCM_UNUSED_SIZE 2000 #define CCM_UNUSED_SIZE 2000

13
firmware/controllers/system/timer/event_queue.cpp
View File

@ -37,7 +37,7 @@ bool EventQueue::insertTask(scheduling_s *scheduling, efitime_t timeX, action_s
// please note that simulator does not use this code at all - simulator uses signal_executor_sleep // please note that simulator does not use this code at all - simulator uses signal_executor_sleep
if (scheduling->isScheduled) { if (scheduling->action) {
#if EFI_UNIT_TEST #if EFI_UNIT_TEST
if (verboseMode) { if (verboseMode) {
printf("Already scheduled was %d\r\n", (int)scheduling->momentX); printf("Already scheduled was %d\r\n", (int)scheduling->momentX);
@ -49,7 +49,6 @@ bool EventQueue::insertTask(scheduling_s *scheduling, efitime_t timeX, action_s
scheduling->momentX = timeX; scheduling->momentX = timeX;
scheduling->action = action; scheduling->action = action;
scheduling->isScheduled = true;
if (head == NULL || timeX < head->momentX) { if (head == NULL || timeX < head->momentX) {
// here we insert into head of the linked list // here we insert into head of the linked list
@ -157,16 +156,19 @@ bool EventQueue::executeOne(efitime_t now) {
// step the head forward, unlink this element, clear scheduled flag // step the head forward, unlink this element, clear scheduled flag
head = current->nextScheduling_s; head = current->nextScheduling_s;
current->nextScheduling_s = nullptr; current->nextScheduling_s = nullptr;
current->isScheduled = false;
// Grab the action but clear it in the event so we can reschedule from the action's execution
auto action = current->action;
current->action = {};
#if EFI_UNIT_TEST #if EFI_UNIT_TEST
printf("QUEUE: execute current=%d param=%d\r\n", (long)current, (long)current->action.getArgument()); printf("QUEUE: execute current=%d param=%d\r\n", (long)current, (long)action.getArgument());
#endif #endif
// Execute the current element // Execute the current element
{ {
ScopePerf perf2(PE::EventQueueExecuteCallback); ScopePerf perf2(PE::EventQueueExecuteCallback);
current->action.execute(); action.execute();
} }
#if EFI_UNIT_TEST #if EFI_UNIT_TEST
@ -221,7 +223,6 @@ void EventQueue::clear(void) {
// Reset this element // Reset this element
x->momentX = 0; x->momentX = 0;
x->isScheduled = false;
x->nextScheduling_s = nullptr; x->nextScheduling_s = nullptr;
x->action = {}; x->action = {};
} }

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

@ -12,6 +12,7 @@ typedef void (*schfunc_t)(void *);
class action_s { class action_s {
public: public:
// Default constructor constructs null action (ie, implicit bool conversion returns false)
action_s() = default; action_s() = default;
// Allow implicit conversion from schfunc_t to action_s // Allow implicit conversion from schfunc_t to action_s
@ -27,6 +28,10 @@ public:
schfunc_t getCallback() const; schfunc_t getCallback() const;
void * getArgument() const; void * getArgument() const;
operator bool() const {
return callback != nullptr;
}
private: private:
schfunc_t callback = nullptr; schfunc_t callback = nullptr;
void *param = nullptr; void *param = nullptr;
@ -35,6 +40,7 @@ private:
/** /**
* This structure holds information about an event scheduled in the future: when to execute what callback with what parameters * This structure holds information about an event scheduled in the future: when to execute what callback with what parameters
*/ */
#pragma pack(push, 4)
struct scheduling_s { struct scheduling_s {
#if EFI_SIGNAL_EXECUTOR_SLEEP #if EFI_SIGNAL_EXECUTOR_SLEEP
virtual_timer_t timer; virtual_timer_t timer;
@ -44,7 +50,6 @@ struct scheduling_s {
* timestamp represented as 64-bit value of ticks since MCU start * timestamp represented as 64-bit value of ticks since MCU start
*/ */
volatile efitime_t momentX = 0; volatile efitime_t momentX = 0;
bool isScheduled = false;
/** /**
* Scheduler implementation uses a sorted linked list of these scheduling records. * Scheduler implementation uses a sorted linked list of these scheduling records.
@ -53,6 +58,7 @@ struct scheduling_s {
action_s action; action_s action;
}; };
#pragma pack(pop)
struct ExecutorInterface { struct ExecutorInterface {
/** /**