Merge pull request #1402 from fwsGonzo/dev

Default stdout now saner

Author: fwsGonzo

api/kernel/os.hpp

@@ -131,18 +131,24 @@ class OS {
   /**
    *  Write data to standard out callbacks
    */
-  static size_t print(const char* ptr, const size_t len);
+  static void print(const char* ptr, const size_t len);
 
   /**
    *  Add handler for standard output.
    */
   static void add_stdout(print_func func);
   /**
-   *  Add "default" serial port output
+   *  Add stdout handler that simply calls OS::default_stdout
   **/
-  static void add_stdout_default_serial();
+  static void add_default_stdout() {
+    add_stdout(OS::default_stdout);
+  }
 
-  static void add_stdout_solo5();
+  /**
+   *  The default output method preferred by each platform
+   *  Directly writes the string to its output mechanism
+   **/
+  static void default_stdout(const char*, size_t);
 
   /** Memory page helpers */
   static constexpr uint32_t page_size() noexcept {

src/drivers/silent.cpp

@@ -25,6 +25,6 @@ void default_stdout_handlers()
   [] (const char* str, size_t len)
   {
     if (OS::is_booted() || OS::is_panicking())
-      kprintf("%.*s", len, str);
+        OS::default_stdout(str, len);
   });
 }

src/drivers/solo5net.cpp

@@ -43,7 +43,6 @@ Solo5Net::Solo5Net()
   mac_addr = MAC::Addr(solo5_net_mac_str());
 }
 
-#include <cstdlib>
 void Solo5Net::transmit(net::Packet_ptr pckt)
 {
   net::Packet_ptr tail = std::move(pckt);
@@ -53,12 +52,8 @@ void Solo5Net::transmit(net::Packet_ptr pckt)
     // next in line
     auto next = tail->detach_tail();
     // write data to network
-    // explicitly release the data to prevent destructor being called
-    net::Packet* pckt = tail.release();
-    uint8_t *buf = pckt->buf();
-
-    solo5_net_write_sync(buf, pckt->size());
-
+    solo5_net_write_sync(tail->buf(), tail->size());
+    // set tail to next, releasing tail
     tail = std::move(next);
     // Stat increase packets transmitted
     packets_tx_++;
@@ -99,8 +94,10 @@ net::Packet_ptr Solo5Net::recv_packet()
 void Solo5Net::poll()
 {
   auto pckt_ptr = recv_packet();
-  if (pckt_ptr != nullptr)
+
+  if (LIKELY(pckt_ptr != nullptr)) {
     Link::receive(std::move(pckt_ptr));
+  }
 }
 
 void Solo5Net::deactivate()

src/include/kprint

@@ -33,6 +33,7 @@ extern "C" {
 #endif
 
 extern void __serial_print1(const char* cstr);
+extern void __serial_print(const char* str, size_t len);
 
 /**
  * The earliest possible print function (requires no heap, global ctors etc.)

src/kernel/os.cpp

@@ -65,7 +65,6 @@ std::string OS::cmdline{Service::binary_name()};
 // stdout redirection
 using Print_vec = fixedvector<OS::print_func, 8>;
 static Print_vec os_print_handlers(Fixedvector_Init::UNINIT);
-extern void default_stdout_handlers();
 
 // Plugins
 OS::Plugin_vec OS::plugins_(Fixedvector_Init::UNINIT);
@@ -102,23 +101,15 @@ void OS::add_stdout(OS::print_func func)
 {
   os_print_handlers.add(func);
 }
-void OS::add_stdout_default_serial()
-{
-  add_stdout(
-  [] (const char* str, const size_t len) {
-    kprintf("%.*s", static_cast<int>(len), str);
-  });
-}
 __attribute__ ((weak))
 void default_stdout_handlers()
 {
-  OS::add_stdout_default_serial();
+  OS::add_default_stdout();
 }
-size_t OS::print(const char* str, const size_t len)
+void OS::print(const char* str, const size_t len)
 {
   for (auto& func : os_print_handlers)
       func(str, len);
-  return len;
 }
 
 void OS::legacy_boot() {

src/platform/x86_nano/platform.cpp

@@ -16,11 +16,6 @@ void __arch_poweroff()
   __builtin_unreachable();
 }
 
-void default_stdout_handlers()
-{
-  OS::add_stdout_default_serial();
-}
-
 void __platform_init(){
   // FIXME: set up minimal CPU exception handlers
   // TODO: set up minimal CPU exception handlers

src/platform/x86_pc/os.cpp

@@ -20,7 +20,6 @@
 
 #include <cstdio>
 #include <boot/multiboot.h>
-#include <hw/cmos.hpp>
 #include <kernel/os.hpp>
 #include <kernel/irq_manager.hpp>
 #include <kernel/rtc.hpp>
@@ -96,6 +95,10 @@ void OS::halt() {
       *os_cycles_hlt += cycles_since_boot() - *os_cycles_total;
 }
 
+void OS::default_stdout(const char* str, const size_t len)
+{
+  __serial_print(str, len);
+}
 
 void OS::start(uint32_t boot_magic, uint32_t boot_addr)
 {
@@ -226,5 +229,3 @@ void OS::event_loop()
   extern void __arch_poweroff();
   __arch_poweroff();
 }
-
-

src/platform/x86_pc/serial1.cpp

@@ -22,3 +22,11 @@ void __serial_print1(const char* cstr)
     hw::outb(port, *cstr++);
   }
 }
+extern "C"
+void __serial_print(const char* str, size_t len)
+{
+  for (size_t i = 0; i < len; i++) {
+    while (not (hw::inb(port + 5) & 0x20));
+    hw::outb(port, str[i]);
+  }
+}

src/platform/x86_solo5/kernel_start.cpp

@@ -9,18 +9,12 @@ extern "C" {
 #include <solo5.h>
 }
 
-extern  void solo5_stdout_handlers();
-extern  void __platform_init();
+extern void __platform_init();
+extern void default_stdout_handlers();
 
 char cmdline[256];
 uintptr_t mem_size;
 
-__attribute__ ((weak))
-void solo5_stdout_handlers()
-{
-  OS::add_stdout_solo5();
-}
-
 extern "C" {
   void __init_sanity_checks();
   void kernel_sanity_checks();
@@ -38,7 +32,7 @@ extern "C" {
   void (*current_eoi_mechanism)();
   void (*current_intr_handler)();
   void (*cpu_sampling_irq_handler)();
- 
+
 
   void kernel_start()
   {
@@ -68,7 +62,7 @@ extern "C" {
     _init_syscalls();
 
     //Initialize stdout handlers
-    solo5_stdout_handlers();
+    default_stdout_handlers();
 
     // Call global ctors
     __libc_init_array();

src/platform/x86_solo5/os.cpp

@@ -70,12 +70,9 @@ int64_t OS::micros_since_boot() noexcept {
   return uptime() / 1000;
 }
 
-void OS::add_stdout_solo5()
+void OS::default_stdout(const char* str, const size_t len)
 {
-  add_stdout(
-  [] (const char* str, const size_t len) {
-    solo5_console_write(str, len);
-  });
+  solo5_console_write(str, len);
 }
 
 void OS::start(char* _cmdline, uintptr_t mem_size)