Merge pull request #1434 from fwsGonzo/dev

Kernel timer and backtrace improvements

Author: fwsGonzo

lib/uplink/starbase/CMakeLists.txt

@@ -41,6 +41,7 @@ set(SOURCES
 set(DRIVERS
   virtionet
   vmxnet3
+  vga_output
   )
 
 set(PLUGINS

lib/uplink/starbase/service.cpp

@@ -27,14 +27,7 @@
 
 void Service::start(const std::string&)
 {
-  MYINFO("booted");
-
-  // Print some useful netstats every 30 secs
-  Timers::periodic(5s, 30s, [] (uint32_t) {
-      auto& inet = net::Inet4::stack();
-      MYINFO("TCP STATUS:\n%s\n", inet.tcp().status().c_str());
-    });
-
+  MYINFO("Running CPUID...");
   auto detected_features = CPUID::detect_features_str();
 
   MYINFO("Detected %lu CPU features:", detected_features.size());

src/kernel/elf.cpp

@@ -285,7 +285,17 @@ void print_backtrace()
                     PRINT_TRACE(8, ra);
                     if (frp(9, ra)) {
                       PRINT_TRACE(9, ra);
-  }}}}}}}}}}
+                      if (frp(10, ra)) {
+                        PRINT_TRACE(10, ra);
+                        if (frp(11, ra)) {
+                          PRINT_TRACE(11, ra);
+                          if (frp(12, ra)) {
+                            PRINT_TRACE(12, ra);
+                            if (frp(13, ra)) {
+                              PRINT_TRACE(13, ra);
+                              if (frp(14, ra)) {
+                                PRINT_TRACE(14, ra);
+  }}}}}}}}}}}}}}}
 }
 
 void Elf::print_info()

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/kernel/timers.cpp

@@ -1,6 +1,7 @@
 #include <kernel/timers.hpp>
 
 #include <kernel/os.hpp>
+#include <kernel/events.hpp>
 #include <service>
 #include <smp>
 #include <statman>
@@ -58,6 +59,7 @@ struct alignas(SMP_ALIGN) timer_system
 {
   bool     is_running  = false;
   uint32_t dead_timers = 0;
+  int      interrupt = 0;
   Timers::start_func_t arch_start_func;
   Timers::stop_func_t  arch_stop_func;
   std::vector<SystemTimer>  timers;
@@ -79,6 +81,8 @@ static inline timer_system& get() {
 void Timers::init(const start_func_t& start, const stop_func_t& stop)
 {
   auto& system = get();
+  // event for processing timers
+  system.interrupt = Events::get().subscribe(&Timers::timers_handler);
   // architecture specific start and stop functions
   system.arch_start_func = start;
   system.arch_stop_func  = stop;
@@ -88,6 +92,7 @@ void Timers::init(const start_func_t& start, const stop_func_t& stop)
   system.oneshot_stopped = (int64_t*) &Statman::get().create(Stat::UINT64, CPU + ".timers.oneshot_stopped").get_uint64();
   system.periodic_started = &Statman::get().create(Stat::UINT32, CPU + ".timers.periodic_started").get_uint32();
   system.periodic_stopped = &Statman::get().create(Stat::UINT32, CPU + ".timers.periodic_stopped").get_uint32();
+
 }
 
 bool Timers::is_ready()
@@ -283,11 +288,12 @@ static void sched_timer(duration_t when, Timers::id_t id)
 
   // if the hardware timer is not running, try starting it
   if (UNLIKELY(system.is_running == false)) {
-    Timers::timers_handler();
+    Events::get().trigger_event(system.interrupt);
     return;
   }
   // if the scheduled timer is the new front, restart timer
   auto it = system.scheduled.begin();
-  if (it->second == id)
-      Timers::timers_handler();
+  if (it->second == id) {
+    Events::get().trigger_event(system.interrupt);
+  }
 }

src/net/tcp/connection.cpp

@@ -269,10 +269,10 @@ void Connection::close() {
 
 void Connection::receive_disconnect() {
   Expects(read_request and read_request->buffer.buffer());
-  auto& buf = read_request->buffer;
 
   if(read_request->callback) {
     // TODO: consider adding back when SACK is complete
+    //auto& buf = read_request->buffer;
     //if (buf.size() > 0 && buf.missing() == 0)
     //    read_request->callback(buf.buffer(), buf.size());
   }

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)