Merge branch 'dev' of https://github.com/hioa-cs/IncludeOS into test_improvements

Author: mnordsletten

.gitignore

@@ -3,9 +3,6 @@
 *.o
 *.out
 *.log
-\#*
-\*.*
-\.\#*
 *.iso
 *.qcow2
 *.vdi
@@ -25,8 +22,6 @@ src/compile_commands.json
 *.project
 *.workspace
 
-vmbuild/vmbuild
-
 *.img
 *.img.*
 

README.md

@@ -97,7 +97,7 @@ IncludeOS is being developed on GitHub. Create your own fork, send us a pull req
 
 ## C++ Guidelines
 
-We want to adhere as much as possible to the [ISO C++ Core Guidelines](https://github.com/isocpp/CppCoreGuidelines), maintained by the [Jedi Council](https://isocpp.org/). When (not if) you find code in IncludeOS which doesn't adhere, please let us know in the [issue tracker](https://github.com/hioa-cs/IncludeOS/issues) - or even better, fix it in your own fork and send us a [pull-request](https://github.com/hioa-cs/IncludeOS/pulls).
+We want to adhere as much as possible to the [ISO C++ Core Guidelines](https://github.com/isocpp/CppCoreGuidelines). When (not if) you find code in IncludeOS which doesn't adhere, please let us know in the [issue tracker](https://github.com/hioa-cs/IncludeOS/issues) - or even better, fix it in your own fork and send us a [pull-request](https://github.com/hioa-cs/IncludeOS/pulls).
 
 ## Read more on the wiki
 

api/hw/serial.hpp

@@ -6,9 +6,9 @@
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
-// 
+//
 //     http://www.apache.org/licenses/LICENSE-2.0
-// 
+//
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,37 +18,38 @@
 #ifndef HW_SERIAL_HPP
 #define HW_SERIAL_HPP
 
-//#define DEBUG 
+//#define DEBUG
 
 #include <os>
 #include <hw/ioport.hpp>
 #include <cstdio>
 
-namespace hw{
+namespace hw {
 
   class Serial {
-      
   public:
-    
+
     /** On Data handler. Return value indicates if the buffer should be flushed **/
     using on_data_handler = delegate<void(char c)>;
-    using on_string_handler = delegate<void(const std::string s)>;
+    using on_string_handler = delegate<void(const std::string& s)>;
 
-    using irq_delg = delegate<void()>;
-    
     template <uint16_t PORT>
     static Serial& port(){
       static Serial s{PORT};
       return s;
     }
-        
+
+    OS::print_func get_print_handler() {
+      return {this, &Serial::print_handler};
+    }
+
     void on_data(on_data_handler del);
     void on_readline(on_string_handler del, char delim = '\r');
-    
+
     void enable_interrupt();
     void disable_interrupt();
 
-    char read();    
+    char read();
     void write(char c);
     int received();
     int is_transmit_empty();
@@ -58,15 +59,16 @@ namespace hw{
     Serial( Serial&& ) = delete;
     Serial& operator=(Serial&) = delete;
     Serial operator=(Serial&&) = delete;
-    
-    void init();    
-    
+
+    void init();
+
   private:
-    
+    void print_handler(const char*, size_t);
+
     Serial(int port);
-    static constexpr uint16_t ports_[] {0x3F8, 0x2F8, 0x3E8, 0x2E8 };    
-    static constexpr uint8_t irqs_[] {4, 3, 15, 15 };    
-    
+    static constexpr uint16_t ports_[] {0x3F8, 0x2F8, 0x3E8, 0x2E8 };
+    static constexpr uint8_t irqs_[] {4, 3, 15, 15 };
+
     //static const char default_newline = '\r';
     char newline = '\r'; //default_newline;
 
@@ -75,13 +77,13 @@ namespace hw{
     uint8_t irq_{4};
     std::string buf{};
 
-    on_data_handler on_data_ = [](char c){ debug("Default on_data: %c \n", c); (void)c; };
-    on_string_handler on_readline_ = [](std::string s) { (void)s; };
-    
+    on_data_handler on_data_       = [](char c){ debug("Default on_data: %c \n", c); (void)c; };
+    on_string_handler on_readline_ = [](const std::string& s) { (void)s; };
+
     void irq_handler_ ();
     void readline_handler_(char c);
   };
-  
+
 }
 
 #endif

api/kernel/cpuid.hpp

@@ -20,13 +20,6 @@
 #define KERNEL_CPUID_HPP
 
 struct CPUID {
-  struct cpuid_t {
-    unsigned int EAX;
-    unsigned int EBX;
-    unsigned int ECX;
-    unsigned int EDX;
-  };
-  
   static bool isAmdCpu();
   static bool isIntelCpu();
   static bool hasRDRAND();

api/kernel/irq_manager.hpp

@@ -117,27 +117,19 @@ class IRQ_manager {
   /**
    * Get the IRQ manager instance
    */
-  static inline IRQ_manager& get(){
-    static IRQ_manager bsp{0};
+  static inline IRQ_manager& get() {
+    static IRQ_manager bsp;
     return bsp;
   }
 
   uint8_t get_next_msix_irq();
   void register_irq(uint8_t vector);
 
-  /** Get the total number of cycles spent in halt **/
-  uint64_t cycles_hlt(){
-    return cycles_hlt_;
-  }
-
-  /** Get the total number of cycles since boot **/
-  uint64_t cycles_total(){
-    return cycles_total_;
-  }
+  /** process all pending interrupts */
+  void process_interrupts();
 
 private:
-
-  IRQ_manager(uint8_t cpu);
+  IRQ_manager() = default;
   IRQ_manager(IRQ_manager&) = delete;
   IRQ_manager(IRQ_manager&&) = delete;
   IRQ_manager& operator=(IRQ_manager&&) = delete;
@@ -151,9 +143,6 @@ class IRQ_manager {
   MemBitmap  irq_pend;
   MemBitmap  irq_todo;
 
-  uint64_t& cycles_hlt_;
-  uint64_t& cycles_total_;
-
   static const char       default_attr {static_cast<char>(0x8e)};
   static const uint16_t   default_sel  {0x8};
 
@@ -176,9 +165,6 @@ class IRQ_manager {
 
   void bsp_init();
 
-  /** Notify all delegates waiting for interrupts */
-  void notify();
-
 }; //< IRQ_manager
 
 #endif //< KERNEL_IRQ_MANAGER_HPP

api/kernel/os.hpp

@@ -27,16 +27,14 @@
 #include <vector>
 #include <kernel/rtc.hpp>
 
-namespace hw{ class Serial; }
-
 /**
  *  The entrypoint for OS services
  *
  *  @note For device access, see Dev
  */
 class OS {
 public:
-  using rsprint_func = delegate<void(const char*, size_t)>;
+  using print_func  = delegate<void(const char*, size_t)>;
   using Custom_init = delegate<void()>;
 
   /* Get the version of the os */
@@ -71,24 +69,9 @@ class OS {
   static void shutdown();
 
   /**
-   *  Write a cstring to serial port. @todo Should be moved to Dev::serial(n).
-   *
-   *  @param ptr: The string to write to serial port
-   */
-  static size_t rsprint(const char* ptr);
-  static size_t rsprint(const char* ptr, const size_t len);
-
-  /**
-   *  Write a character to serial port.
-   *
-   *  @param c: The character to print to serial port
-   */
-  static void rswrite(const char c);
-
-  /**
-   *  Write to serial port with rswrite.
+   *  Write data to standard out callbacks
    */
-  static void default_rsprint(const char*, size_t);
+  static size_t print(const char* ptr, const size_t len);
 
   /** Start the OS.  @todo Should be `init()` - and not accessible from ABI */
   static void start(uint32_t boot_magic, uint32_t boot_addr);
@@ -102,21 +85,21 @@ class OS {
   static void halt();
 
   /**
-   *  Set handler for serial output.
+   *  Add handler for standard output.
    */
-  static void set_rsprint(rsprint_func func) {
-    rsprint_handler_ = func;
+  static void add_stdout(print_func func) {
+    print_handlers.push_back(func);
   }
 
   /** Memory page helpers */
-  static inline constexpr uint32_t page_size() {
+  static constexpr uint32_t page_size() {
     return 4096;
   }
-  static inline constexpr uint32_t page_nr_from_addr(uint32_t x){
-    return x >> page_shift_;
+  static constexpr uint32_t page_nr_from_addr(uint32_t x) {
+    return x >> PAGE_SHIFT;
   }
-  static inline constexpr uint32_t base_from_page_nr(uint32_t x){
-    return x << page_shift_;
+  static constexpr uint32_t base_from_page_nr(uint32_t x) {
+    return x << PAGE_SHIFT;
   }
 
   /** Currently used dynamic memory, in bytes */
@@ -132,7 +115,7 @@ class OS {
   static Memory_map& memory_map () noexcept {
     static  Memory_map memmap_ {};
     return memmap_;
-  };
+  }
 
   /**
    * Register a custom initialization function. The provided delegate is
@@ -149,7 +132,7 @@ class OS {
   /** Process multiboot info. Called by 'start' if multibooted **/
   static void multiboot(uint32_t boot_magic, uint32_t boot_addr);
 
-  static const int page_shift_ = 12;
+  static constexpr int PAGE_SHIFT = 12;
 
   /** Indicate if the OS is running. */
   static bool power_;
@@ -159,9 +142,7 @@ class OS {
 
   static MHz cpu_mhz_;
 
-  static rsprint_func rsprint_handler_;
-
-  static hw::Serial& com1;
+  static std::vector<print_func> print_handlers;
 
   static RTC::timestamp_t booted_at_;
   static std::string version_field;
@@ -190,7 +171,6 @@ class OS {
   ~OS() = delete;
   // Prohibit construction
   OS() = delete;
-  friend void begin_stack_sampling(uint16_t);
 
 }; //< OS
 

api/kernel/vga.hpp

@@ -6,9 +6,9 @@
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
-// 
+//
 //     http://www.apache.org/licenses/LICENSE-2.0
-// 
+//
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,6 +18,7 @@
 #ifndef KERNEL_VGA_HPP
 #define KERNEL_VGA_HPP
 
+#include <os>
 #include <stdint.h>
 
 class ConsoleVGA {
@@ -45,29 +46,33 @@ class ConsoleVGA {
 
   explicit ConsoleVGA() noexcept;
 
+  OS::print_func get_print_handler() {
+    return {this, &ConsoleVGA::write};
+  }
+
   constexpr static uint8_t make_color(const vga_color fg, const vga_color bg) noexcept
   { return fg | bg << 4; }
-  
+
   void write(const char* data, const size_t len) noexcept;
   void clear() noexcept;
-  
+
   static const size_t VGA_WIDTH  {80};
   static const size_t VGA_HEIGHT {25};
-  
+
   uint16_t get(uint8_t x, uint8_t y);
   void put(const char, uint8_t color, uint8_t x, uint8_t y) noexcept;
   void put(const char, uint8_t x, uint8_t y) noexcept;
   void set_cursor(uint8_t, uint8_t) noexcept;
   void newline() noexcept;
   inline void set_color(vga_color c)
   { color = c; };
-  
+
 private:
   void increment(int) noexcept;
   void write(char) noexcept;
   static const uint16_t DEFAULT_ENTRY;
   void putent(uint16_t, uint8_t, uint8_t) noexcept;
-  
+
   size_t    row;
   size_t    column;
   uint8_t   color;

api/net/ip4/arp.hpp

@@ -97,10 +97,10 @@ namespace net {
       // @TODO: Add HÅREK-mapping here
       switch (nm) {
       case HH_MAP:
-        arp_resolver_ = Arp_resolver::from<Arp, &Arp::hh_map>(*this);
+        arp_resolver_ = {this, &Arp::hh_map};
         break;
       default:
-        arp_resolver_ = Arp_resolver::from<Arp, &Arp::arp_resolve>(*this);
+        arp_resolver_ = {this, &Arp::arp_resolve};
       }
     }
 
@@ -145,7 +145,7 @@ namespace net {
     void arp_resolve(Packet_ptr);
     void hh_map(Packet_ptr);
 
-    Arp_resolver arp_resolver_ = Arp_resolver::from<Arp, &Arp::arp_resolve>(*this);
+    Arp_resolver arp_resolver_ = {this, &Arp::arp_resolve};
 
     PacketQueue waiting_packets_;