Proposed changes from review

esp8266 · d-a-v · May 23, 2019 · May 2, 2019 · May 3, 2019 · May 3, 2019
commit d9c227056e67fea00c6dff178c4791b7858ea324
diff --git a/cores/esp8266/Schedule.cpp b/cores/esp8266/Schedule.cpp
@@ -9,11 +9,11 @@ typedef std::function<bool(void)> mFuncT;
 
 struct scheduled_fn_t
 {
-    scheduled_fn_t* mNext;
+    scheduled_fn_t* mNext = nullptr;
     mFuncT mFunc;
     esp8266::polledTimeout::periodicFastUs callNow;
 
-    scheduled_fn_t(): callNow(esp8266::polledTimeout::periodicFastUs::alwaysExpired) { }
+    scheduled_fn_t() : callNow(esp8266::polledTimeout::periodicFastUs::alwaysExpired) { }
 };
 
 static scheduled_fn_t* sFirst = nullptr;
@@ -32,26 +32,26 @@ static scheduled_fn_t* get_fn_unsafe()
     {
         result = sUnused;
         sUnused = sUnused->mNext;
+        result->mNext = nullptr;
     }
     // if no unused items, and count not too high, allocate a new one
     else if (sCount < SCHEDULED_FN_MAX_COUNT)
     {
         result = new scheduled_fn_t;
         ++sCount;
     }
-    result->mNext = nullptr;
     return result;
 }
 
 static void recycle_fn_unsafe(scheduled_fn_t* fn)
 {
-    fn->mFunc = mFuncT();
+    fn->mFunc = nullptr; // special overload in c++ std lib
     fn->mNext = sUnused;
     sUnused = fn;
 }
 
-IRAM_ATTR // called from ISR
-bool schedule_function_us(const mFuncT& fn, uint32_t repeat_us)
+IRAM_ATTR // (not only) called from ISR
+bool schedule_function_us(std::function<bool(void)>&& fn, uint32_t repeat_us)
 {
     assert(repeat_us < decltype(scheduled_fn_t::callNow)::neverExpires); //~26800000us (26.8s)
 
@@ -74,10 +74,20 @@ bool schedule_function_us(const mFuncT& fn, uint32_t repeat_us)
     return true;
 }
 
+bool ICACHE_RAM_ATTR schedule_function_us(const std::function<bool(void)>& fn, uint32_t repeat_us)
+{
+    return schedule_function_us(std::function<bool(void)>(fn), repeat_us);
+}
+
 IRAM_ATTR // called from ISR
-bool schedule_function(const std::function<void(void)>& fn)
+bool schedule_function(std::function<void(void)>&& fn)
+{
+    return schedule_function_us([fn]() { fn(); return false; }, 0);
+}
+
+bool ICACHE_RAM_ATTR schedule_function(const std::function<void(void)>& fn)
 {
-    return schedule_function_us([fn](){ fn(); return false; }, 0);
+    return schedule_function(std::function<void(void)>(fn));
 }
 
 void run_scheduled_functions()

diff --git a/cores/esp8266/Schedule.h b/cores/esp8266/Schedule.h
@@ -17,11 +17,13 @@
 // Note: there is no mechanism for cancelling scheduled functions.
 // Keep that in mind when binding functions to objects which may have short lifetime.
 // Returns false if the number of scheduled functions exceeds SCHEDULED_FN_MAX_COUNT.
+//bool schedule_function(std::function<void(void)>&& fn);
 bool schedule_function(const std::function<void(void)>& fn);
 
 // Run given function periodically about every <repeat_us> microseconds until it returns false.
 // Note that it may be more than <repeat_us> microseconds between calls if `yield` is not called
 // frequently, and therefore should not be used for timing critical operations.
+//bool schedule_function_us(std::function<bool(void)>&& fn, uint32_t repeat_us);
 bool schedule_function_us(const std::function<bool(void)>& fn, uint32_t repeat_us);
 
 // Run all scheduled functions.