Merge pull request #1411 from fwsGonzo/dev

os: Add post_start, common for all platforms

Author: fwsGonzo

api/kernel/os.hpp

@@ -180,7 +180,7 @@ class OS {
   static uintptr_t heap_max() noexcept;
 
   /** The end of usable memory **/
-  static inline uintptr_t memory_end(){
+  static uintptr_t memory_end() noexcept {
     return memory_end_;
   }
 
@@ -199,6 +199,9 @@ class OS {
     return memmap;
   }
 
+  /** Get "kernel modules", provided by multiboot */
+  static Span_mods modules();
+
   /**
    * Register a custom initialization function. The provided delegate is
    * guaranteed to be called after global constructors and device initialization
@@ -219,17 +222,15 @@ class OS {
   /** The main event loop. Check interrupts, timers etc., and do callbacks. */
   static void event_loop();
 
-  /** Start the OS.  @todo Should be `init()` - and not accessible from ABI */
+  /** Initialize platform, devices etc. */
   static void start(uint32_t boot_magic, uint32_t boot_addr);
 
   static void start(char *cmdline, uintptr_t mem_size);
 
-  /** Get "kernel modules", provided by multiboot */
-  static Span_mods modules();
-
+  /** Initialize common subsystems, call Service::start */
+  static void post_start();
 
 private:
-
   /** Process multiboot info. Called by 'start' if multibooted **/
   static void multiboot(uint32_t boot_addr);
 

src/kernel/kernel_start.cpp

@@ -75,9 +75,12 @@ void kernel_start(uintptr_t magic, uintptr_t addr)
   // Call global ctors
   __libc_init_array();
 
-  // Initialize OS including devices
+  // Initialize early OS, platform and devices
   OS::start(magic, addr);
 
+  // Initialize common subsystems and call Service::start
+  OS::post_start();
+
   // verify certain read-only sections in memory
   kernel_sanity_checks();
 

src/kernel/os.cpp

@@ -97,6 +97,44 @@ void OS::shutdown()
   power_ = false;
 }
 
+void OS::post_start()
+{
+  MYINFO("Initializing RNG");
+  PROFILE("RNG init");
+  RNG::init();
+
+  // Seed rand with 32 bits from RNG
+  srand(rng_extract_uint32());
+
+  // Custom initialization functions
+  MYINFO("Initializing plugins");
+  // the boot sequence is over when we get to plugins/Service::start
+  OS::boot_sequence_passed_ = true;
+
+  PROFILE("Plugins init");
+  for (auto plugin : plugins_) {
+    INFO2("* Initializing %s", plugin.name_);
+    try{
+      plugin.func_();
+    } catch(std::exception& e){
+      MYINFO("Exception thrown when initializing plugin: %s", e.what());
+    } catch(...){
+      MYINFO("Unknown exception when initializing plugin");
+    }
+  }
+
+  PROFILE("Service::start");
+  // begin service start
+  FILLINE('=');
+  printf(" IncludeOS %s (%s / %i-bit)\n",
+         version().c_str(), arch().c_str(),
+         static_cast<int>(sizeof(uintptr_t)) * 8);
+  printf(" +--> Running [ %s ]\n", Service::name().c_str());
+  FILLINE('~');
+
+  Service::start();
+}
+
 void OS::add_stdout(OS::print_func func)
 {
   os_print_handlers.add(func);

src/platform/x86_pc/os.cpp

@@ -41,7 +41,6 @@
 #endif
 
 extern "C" void* get_cpu_esp();
-extern "C" void  kernel_sanity_checks();
 extern uintptr_t heap_begin;
 extern uintptr_t heap_end;
 extern uintptr_t _start;
@@ -180,43 +179,6 @@ void OS::start(uint32_t boot_magic, uint32_t boot_addr)
   PROFILE("RTC init");
   // Realtime/monotonic clock
   RTC::init();
-
-  MYINFO("Initializing RNG");
-  PROFILE("RNG init");
-  RNG::init();
-
-  // Seed rand with 32 bits from RNG
-  srand(rng_extract_uint32());
-
-  // Custom initialization functions
-  MYINFO("Initializing plugins");
-  // the boot sequence is over when we get to plugins/Service::start
-  OS::boot_sequence_passed_ = true;
-
-  PROFILE("Plugins init");
-  for (auto plugin : plugins_) {
-    INFO2("* Initializing %s", plugin.name_);
-    try{
-      plugin.func_();
-    } catch(std::exception& e){
-      MYINFO("Exception thrown when initializing plugin: %s", e.what());
-    } catch(...){
-      MYINFO("Unknown exception when initializing plugin");
-    }
-  }
-
-  PROFILE("Service::start");
-  // begin service start
-  FILLINE('=');
-  printf(" IncludeOS %s (%s / %i-bit)\n",
-         version().c_str(), arch().c_str(),
-         static_cast<int>(sizeof(uintptr_t)) * 8);
-  printf(" +--> Running [ %s ]\n", Service::name().c_str());
-  FILLINE('~');
-
-  Service::start();
-  // NOTE: this is a feature for service writers, don't move!
-  kernel_sanity_checks();
 }
 
 void OS::event_loop()

src/platform/x86_solo5/os.cpp

@@ -20,7 +20,6 @@ static uint64_t* os_cycles_hlt   = nullptr;
 static uint64_t* os_cycles_total = nullptr;
 
 extern "C" void* get_cpu_esp();
-extern "C" void  kernel_sanity_checks();
 extern uintptr_t heap_begin;
 extern uintptr_t heap_end;
 extern uintptr_t _start;
@@ -144,30 +143,6 @@ void OS::start(char* _cmdline, uintptr_t mem_size)
   MYINFO("Booted at monotonic_ns=%lld walltime_ns=%lld",
          solo5_clock_monotonic(), solo5_clock_wall());
 
-  MYINFO("Initializing RNG");
-  PROFILE("RNG init");
-  RNG::init();
-
-  // Seed rand with 32 bits from RNG
-  srand(rng_extract_uint32());
-
-  // Custom initialization functions
-  MYINFO("Initializing plugins");
-  // the boot sequence is over when we get to plugins/Service::start
-  OS::boot_sequence_passed_ = true;
-
-  PROFILE("Plugins init");
-  for (auto plugin : plugins_) {
-    INFO2("* Initializing %s", plugin.name_);
-    try{
-      plugin.func_();
-    } catch(std::exception& e){
-      MYINFO("Exception thrown when initializing plugin: %s", e.what());
-    } catch(...){
-      MYINFO("Unknown exception when initializing plugin");
-    }
-  }
-
   Solo5_manager::init();
 
   // We don't need a start or stop function in solo5.
@@ -182,26 +157,10 @@ void OS::start(char* _cmdline, uintptr_t mem_size)
   Timers::oneshot(std::chrono::hours(1000000), [] (auto) {});
 
   Timers::ready();
-
-  PROFILE("Service::start");
-  // begin service start
-  FILLINE('=');
-  printf(" IncludeOS %s (%s / %i-bit)\n",
-         version().c_str(), arch().c_str(),
-         static_cast<int>(sizeof(uintptr_t)) * 8);
-  printf(" +--> Running [ %s ]\n", Service::name().c_str());
-  FILLINE('~');
-
-  Service::start();
-  // NOTE: this is a feature for service writers, don't move!
-  kernel_sanity_checks();
 }
 
 void OS::event_loop()
 {
-  //uint8_t *data = (uint8_t *) malloc(1520);
-  //assert(data);
-
   while (power_) {
     int rc;
 
@@ -217,10 +176,6 @@ void OS::event_loop()
     rc = solo5_poll(solo5_clock_monotonic() + 500000ULL); // now + 0.5 ms
     Timers::timers_handler();
     if (rc) {
-
-      //int len = 1520;
-      //memset(data, 0, 1520);
-
       for(auto& nic : hw::Devices::devices<hw::Nic>()) {
         nic->poll();
         break;