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

auto-sync

This commit is contained in:
rusEfi 2014-09-14 14:10:57 -05:00
parent 50fa993995
commit 44cc21bcfd
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
firmware/controllers/system/SingleTimerExecutor.cpp
View File

@ -28,7 +28,7 @@ static Executor instance;
extern schfunc_t globalTimerCallback; extern schfunc_t globalTimerCallback;
static void executorCallback(void *arg) { static void executorCallback(void *arg) {
instance.execute(getTimeNowUs()); instance.onTimerCallback(getTimeNowUs());
} }
Executor::Executor() { Executor::Executor() {
@ -68,7 +68,7 @@ void Executor::schedule(const char *prefix, scheduling_s *scheduling, uint64_t n
schedule2(prefix, scheduling, nowUs + delayUs, callback, param); schedule2(prefix, scheduling, nowUs + delayUs, callback, param);
} }
void Executor::execute(uint64_t nowUs) { void Executor::onTimerCallback(uint64_t nowUs) {
lock(); lock();
doExecute(nowUs); doExecute(nowUs);
unlock(); unlock();

2
firmware/controllers/system/SingleTimerExecutor.h
View File

@ -16,7 +16,7 @@ public:
Executor(); Executor();
void schedule(const char *prefix, scheduling_s *scheduling, uint64_t nowUs, int delayUs, schfunc_t callback, void *param); void schedule(const char *prefix, scheduling_s *scheduling, uint64_t nowUs, int delayUs, schfunc_t callback, void *param);
void schedule2(const char *prefix, scheduling_s *scheduling, uint64_t timeUs, schfunc_t callback, void *param); void schedule2(const char *prefix, scheduling_s *scheduling, uint64_t timeUs, schfunc_t callback, void *param);
void execute(uint64_t nowUs); void onTimerCallback(uint64_t nowUs);
private: private:
EventQueue queue; EventQueue queue;
bool reentrantLock; bool reentrantLock;

2
unit_tests/main.cpp
View File

@ -130,7 +130,7 @@ int main(void) {
testFLStack(); testFLStack();
// resizeMap(); // resizeMap();
printf("Success 20130830\r\n"); printf("Success 20130914\r\n");
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }

6
unit_tests/test_signal_executor.cpp
View File

@ -29,6 +29,12 @@ void scheduleTask(const char *msg, scheduling_s *scheduling, int delayUs, schfun
schedulingQueue.insertTask(scheduling, getTimeNowUs() + delayUs, callback, param); schedulingQueue.insertTask(scheduling, getTimeNowUs() + delayUs, callback, param);
} }
void scheduleTask2(const char *prefix, scheduling_s *scheduling, uint64_t time, schfunc_t callback, void *param) {
firmwareError("not implemented");
//schedulingQueue.insertTask(scheduling, getTimeNowUs() + delayUs, callback, param);
}
void initSignalExecutorImpl(void) { void initSignalExecutorImpl(void) {
} }