Revert compute_scheduled_recurrent_grain

Author: dok-net

cores/esp8266/Schedule.cpp

@@ -17,7 +17,6 @@
 */
 
 #include <assert.h>
-#include <numeric>
 
 #include "Schedule.h"
 #include "PolledTimeout.h"
@@ -35,7 +34,6 @@ static scheduled_fn_t* sFirst = nullptr;
 static scheduled_fn_t* sLast = nullptr;
 static scheduled_fn_t* sUnused = nullptr;
 static int sCount = 0;
-static uint32_t recurrent_max_grain_mS = 0;
 
 typedef std::function<bool(void)> mRecFuncT;
 struct recurrent_fn_t
@@ -132,39 +130,9 @@ bool schedule_recurrent_function_us(const std::function<bool(void)>& fn,
     }
     rLast = item;
 
-    // grain needs to be recomputed
-    recurrent_max_grain_mS = 0;
-
     return true;
 }
 
-uint32_t compute_scheduled_recurrent_grain ()
-{
-    if (recurrent_max_grain_mS == 0)
-    {
-        if (rFirst)
-        {
-            uint32_t recurrent_max_grain_uS = rFirst->callNow.getTimeout();
-            for (auto it = rFirst->mNext; it; it = it->mNext)
-                recurrent_max_grain_uS = std::gcd(recurrent_max_grain_uS, it->callNow.getTimeout());
-            if (recurrent_max_grain_uS)
-                // round to the upper millis
-                recurrent_max_grain_mS = recurrent_max_grain_uS <= 1000? 1: (recurrent_max_grain_uS + 999) / 1000;
-        }
-
-#ifdef DEBUG_ESP_CORE
-        static uint32_t last_grain = 0;
-        if (recurrent_max_grain_mS != last_grain)
-        {
-            ::printf(":rsf %u->%u\n", last_grain, recurrent_max_grain_mS);
-            last_grain = recurrent_max_grain_mS;
-        }
-#endif
-    }
-
-    return recurrent_max_grain_mS;
-}
-
 void run_scheduled_functions()
 {
     // prevent scheduling of new functions during this run
@@ -258,9 +226,6 @@ void run_scheduled_recurrent_functions()
             }
 
             delete(to_ditch);
-
-            // grain needs to be recomputed
-            recurrent_max_grain_mS = 0;
         }
         else
         {

cores/esp8266/Schedule.h

@@ -39,11 +39,6 @@
 // scheduled function happen more often: every yield() (vs every loop()),
 // and time resolution is microsecond (vs millisecond). Details are below.
 
-// compute_scheduled_recurrent_grain() is used by delay() to give a chance to
-// all recurrent functions to run per their timing requirement.
-
-uint32_t compute_scheduled_recurrent_grain ();
-
 // scheduled functions called once:
 //
 // * internal queue is FIFO.

cores/esp8266/core_esp8266_main.cpp

@@ -22,9 +22,6 @@
 
 //This may be used to change user task stack size:
 //#define CONT_STACKSIZE 4096
-
-#include <numeric>
-
 #include <Arduino.h>
 #include "Schedule.h"
 extern "C" {
@@ -170,16 +167,8 @@ bool esp_try_delay(const uint32_t start_ms, const uint32_t timeout_ms, const uin
     if (expired >= timeout_ms) {
         return true; // expired
     }
-
-    // compute greatest chunked delay with respect to scheduled recurrent functions
-    uint32_t grain_ms = std::gcd(intvl_ms, compute_scheduled_recurrent_grain());
-
-    // recurrent scheduled functions will be called from esp_delay()->esp_suspend()
-    esp_delay(grain_ms > 0 ?
-        std::min((timeout_ms - expired), grain_ms):
-        (timeout_ms - expired));
-
-    return false; // expiration must be checked again
+    esp_delay(std::min((timeout_ms - expired), intvl_ms));
+    return false;
 }
 
 extern "C" void __yield() {