kernel: Fix OS::block issue with new deferred timer creation

Author: fwsGonzo

src/kernel/events.cpp

@@ -108,8 +108,8 @@ void Events::process_events()
 #ifdef DEBUG_SMP
       SMP::global_lock();
       if (intr != 0)
-      printf("[%p] Calling handler for intr=%u irq=%u cpu %d\n",
-             get_cpu_esp(), IRQ_BASE + intr, intr, SMP::cpu_id());
+      printf("[cpu%d] Calling handler for intr=%u irq=%u\n",
+             SMP::cpu_id(), IRQ_BASE + intr, intr);
       SMP::global_unlock();
 #endif
       callbacks[intr]();

src/platform/x86_pc/block.cpp

@@ -38,8 +38,8 @@ extern "C" uint32_t os_get_highest_blocking_level() {
  * A quick and dirty implementation of blocking calls, which simply halts,
  * then calls  the event loop, then returns.
  **/
-void OS::block(){
-
+void OS::block()
+{
   // Initialize stats
   if (not blocking_level) {
     blocking_level = &Statman::get()
@@ -60,10 +60,13 @@ void OS::block(){
   if (*blocking_level > *highest_blocking_level)
     *highest_blocking_level = *blocking_level;
 
+  // Process immediate events
+  Events::get().process_events();
+
   // Await next interrupt
   OS::halt();
 
-  // Process callbacks
+  // Process events (again?)
   Events::get().process_events();
 
   // Decrement level

test/kernel/integration/block/service.cpp

@@ -17,26 +17,25 @@
 
 #include <os>
 #include <timers>
+using namespace std::chrono;
 
 extern "C" uint32_t os_get_blocking_level();
 extern "C" uint32_t os_get_highest_blocking_level();
 
-void sleep(int i){
-  static Timers::id_t timer{};
-
-  if (not timer)
-    timer = Timers::oneshot(std::chrono::seconds(i), [](auto){
-        INFO("Timer", "Ticked");
-        timer = 0;
-        Expects(os_get_blocking_level() == 1);
-      });
-
-  while (timer) {
+static void msleep(int micros)
+{
+  bool ticked = false;
+  Timers::oneshot(microseconds(micros),
+  [&ticked] (int) {
+    INFO("Timer", "Ticked");
+    ticked = true;
+    Expects(os_get_blocking_level() == 1);
+  });
+
+  while (ticked == false) {
     OS::block();
     Expects(os_get_blocking_level() == 0);
   }
-
-  INFO("Test", " Done");
 }
 
 void Service::start()
@@ -50,7 +49,7 @@ void Service::ready()
 
   int n = 10;
   for (int i = 0; i < n; i++) {
-    sleep(1);
+    msleep(1000000);
     sleeps++;
     printf("Sleep %i/%i \n", sleeps, n);
     if (sleeps == 10)