Merge pull request #1372 from hioa-cs/dev

Merge dev

Author: alfreb

api/kernel/rng.hpp

@@ -7,9 +7,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.
@@ -40,5 +40,10 @@ inline uint32_t rng_extract_uint32()
   return x;
   }
 
+struct RNG
+{
+  static void init();
+};
+
 
 #endif

api/net/ip4/arp.hpp

@@ -22,7 +22,6 @@
 #include <rtc>
 #include <unordered_map>
 #include <util/timer.hpp>
-#include <delegate>
 #include "ip4.hpp"
 
 using namespace std::chrono_literals;
@@ -92,23 +91,7 @@ namespace net {
     { cache_.clear(); };
 
     /** Flush expired cache entries. RFC-2.3.2.1 */
-    void flush_expired () {
-      INFO("ARP", "Flushing expired entries");
-      std::vector<IP4::addr> expired;
-      for (auto ent : cache_) {
-        if (ent.second.expired()) {
-          expired.push_back(ent.first);
-        }
-      }
-
-      for (auto ip : expired) {
-        cache_.erase(ip);
-      }
-
-      if (not cache_.empty()) {
-        flush_timer_.start(flush_interval_);
-      }
-    }
+    void flush_expired ();
 
     void set_cache_flush_interval(std::chrono::minutes m) {
       flush_interval_ = m;

api/net/ws/websocket.hpp

@@ -23,9 +23,15 @@
 
 #include <net/http/server.hpp>
 #include <net/http/client.hpp>
+#include <stdexcept>
 
 namespace net {
 
+struct WS_error : public std::runtime_error {
+  using base = std::runtime_error;
+  using base::base;
+};
+
 class WebSocket {
 public:
   class Message {
@@ -76,7 +82,7 @@ class WebSocket {
         data_.insert(data_.end(), data, data+len);
       }
       else {
-        throw std::string{"Panncake"};
+        throw WS_error{"Exceeding Message size"};
       }
     }
 

api/smp

@@ -114,11 +114,13 @@ public:
   // execute @func on another CPU core
   // call @done back on main CPU when task returns
   // use signal() to broadcast work should begin
-  static void add_task(task_func func, done_func done);
-  static void add_task(task_func func);
+  static void add_task(task_func func, done_func done, int cpu = 0);
+  static void add_task(task_func func, int cpu = 0);
+  // execute a function on the main cpu
+  static void add_bsp_task(done_func func);
 
   // call this to signal that tasks are queued up
-  static void signal();
+  static void signal(int cpu = -1);
 
   // trigger interrupt on specified CPU
   static void unicast(int cpu, uint8_t intr);

api/util/crc64.hpp

@@ -46,7 +46,7 @@ struct crc64 {
   }
 
 
-  static constexpr inline uint64_t checksum(uint64_t crc_accumulator, const char* data, size_t data_len) noexcept {
+  static constexpr uint64_t checksum(uint64_t crc_accumulator, const char* data, size_t data_len) noexcept {
     auto crc64_table = get_table();
 
     crc_accumulator = ~crc_accumulator;
@@ -84,10 +84,10 @@ struct crc64 {
 
   using CRC64_table_t = std::array<std::array<uint64_t, 256>, 8>;
 
-  static constexpr inline const CRC64_table_t get_table() noexcept {
+  static constexpr const CRC64_table_t get_table() noexcept {
     auto crc64_itable = get_init_table();
 
-    CRC64_table_t crc64_table;
+    CRC64_table_t crc64_table {{}};
     crc64_table[0] = crc64_itable;
 
     for (uint64_t i = 0; i < 256; ++i) {
@@ -102,18 +102,14 @@ struct crc64 {
     return crc64_table;
   }
 
-  static constexpr inline const std::array<uint64_t, 256> get_init_table() noexcept {
-    std::array<uint64_t, 256> data;
+  static constexpr const std::array<uint64_t, 256> get_init_table() noexcept {
+    std::array<uint64_t, 256> data {{}};
 
     for (uint64_t i {0}; i < 256; ++i) {
       uint64_t crc {i};
 
       for (uint64_t j {0}; j < 8; ++j) {
-        if (crc & 1) {
-          crc = (crc >> 1) ^ POLY;
-        } else {
-          crc >>= 1;
-        }
+        crc = (crc & 1) ? ((crc >> 1) ^ POLY) : (crc >> 1);
       }
 
       data[i] = crc;

cmake/botan.cmake

@@ -4,14 +4,14 @@
 include(ExternalProject)
 
 if(${ARCH} STREQUAL "x86_64")
-  set(BOTAN_HASH 7432fa529d86070317f594dddb07944f)
+  set(BOTAN_HASH fb698d0f5c9497b7029c9573888c22c8)
 elseif(${ARCH} STREQUAL "i686")
-  set(BOTAN_HASH 5ef7f26047f8fe17219f62755938621d)
+  set(BOTAN_HASH c22686843461d58a5ac15da7fab18e21)
 endif()
 
 ExternalProject_Add(botan
         PREFIX botan
-        URL https://github.com/includeos/botan/releases/download/inc-2.0/botan-includeos-${ARCH}.tar.gz
+        URL https://github.com/fwsgonzo/botan/releases/download/v0.11/botan-includeos-${ARCH}.tar.gz
         URL_HASH MD5=${BOTAN_HASH}
         CONFIGURE_COMMAND ""
         BUILD_COMMAND ""

cmake/post.service.cmake

@@ -248,6 +248,10 @@ add_library(libgcc STATIC IMPORTED)
 set_target_properties(libgcc PROPERTIES LINKER_LANGUAGE C)
 set_target_properties(libgcc PROPERTIES IMPORTED_LOCATION ${INSTALL_LOC}/${ARCH}/lib/libgcc.a)
 
+# Depending on the output of this command will make it always run. Like magic.
+add_custom_command(OUTPUT fake_news
+      COMMAND cmake -E touch_nocreate alternative_facts)
+
 # add memdisk
 function(add_memdisk DISK)
   get_filename_component(DISK_RELPATH "${DISK}"
@@ -256,7 +260,7 @@ function(add_memdisk DISK)
     OUTPUT  memdisk.o
     COMMAND python ${INSTALL_LOC}/memdisk/memdisk.py --file ${INSTALL_LOC}/memdisk/memdisk.asm ${DISK_RELPATH}
     COMMAND nasm -f ${CMAKE_ASM_NASM_OBJECT_FORMAT} ${INSTALL_LOC}/memdisk/memdisk.asm -o memdisk.o
-    DEPENDS ${DISK_RELPATH}
+    DEPENDS ${DISK_RELPATH} fake_news
   )
   add_library(memdisk STATIC memdisk.o)
   set_target_properties(memdisk PROPERTIES LINKER_LANGUAGE CXX)
@@ -269,8 +273,9 @@ function(diskbuilder FOLD)
   add_custom_command(
       OUTPUT  memdisk.fat
       COMMAND ${INSTALL_LOC}/bin/diskbuilder -o memdisk.fat ${REL_PATH}
-    )
-  add_custom_target(diskbuilder ALL DEPENDS memdisk.fat)
+      DEPENDS fake_news
+      )
+    add_custom_target(diskbuilder ALL DEPENDS memdisk.fat)
   add_dependencies(service diskbuilder)
   add_memdisk("${CMAKE_BINARY_DIR}/memdisk.fat")
 endfunction()

etc/install_dependencies_linux.sh

@@ -135,7 +135,7 @@ case $SYSTEM in
         ;;
     "Linux")
         case $RELEASE in
-            "debian"|"ubuntu"|"linuxmint")
+            "debian"|"ubuntu"|"linuxmint"|"parrot")
                 DEPENDENCIES="$DEPENDENCIES"
                 sudo apt-get -qq update || exit 1
                 sudo apt-get -qqy install $DEPENDENCIES > /dev/null || exit 1

install.sh

@@ -71,7 +71,7 @@ check_os_support() {
             ;;
         "Linux")
             case $RELEASE in
-                "debian"|"ubuntu"|"linuxmint")
+                "debian"|"ubuntu"|"linuxmint"|"parrot")
                     return 0;
                     ;;
                 "fedora")

src/arch/x86_64/arch_start.asm

@@ -22,7 +22,7 @@ extern __multiboot_addr
 
 %define PAGE_SIZE          0x1000
 %define P4_TAB             0x1000
-%define P3_TAB             0x2000 ;; - 0x5000
+%define P3_TAB             0x2000 ;; - 0x5fff
 %define P2_TAB           0x100000
 %define STACK_LOCATION   0xA00000