Merge branch 'dev' of github.com:fwsGonzo/IncludeOS into dev

Author: fwsGonzo

CMakeLists.txt

@@ -110,6 +110,21 @@ endif(silent)
 # Append optimization level
 set(CAPABS "${CAPABS} ${OPTIMIZE}")
 
+# object format needs to be set BEFORE enabling ASM
+# see: https://cmake.org/Bug/bug_relationship_graph.php?bug_id=13166
+if ("${ARCH}" STREQUAL "i686")
+  set(CMAKE_ASM_NASM_OBJECT_FORMAT "elf")
+  set(OBJCOPY_TARGET "elf32-i386")
+  set(CAPABS "${CAPABS} -m32")
+else()
+  set(CMAKE_ASM_NASM_OBJECT_FORMAT "elf64")
+  set(OBJCOPY_TARGET "elf64-x86-64")
+  set(CAPABS "${CAPABS} -m64")
+endif()
+
+enable_language(ASM_NASM)
+
+# initialize C and C++ compiler flags
 if (CMAKE_COMPILER_IS_GNUCC)
   # gcc/g++ settings
   set(CMAKE_CXX_FLAGS " -MMD ${CAPABS} ${WARNS} -Wno-frame-address -nostdlib -fno-omit-frame-pointer -c -D_LIBCPP_HAS_NO_THREADS=1 -DOS_VERSION=\\\"${OS_VERSION}\\\"")
@@ -187,6 +202,17 @@ if(libmana)
   add_subdirectory(lib/mana)
 endif(libmana)
 
+option(libuplink "Build and install uplink" ON)
+if(libuplink)
+  set(libliveupdate ON) # dependent
+  add_subdirectory(lib/uplink)
+endif(libuplink)
+
+option(libliveupdate "Build and install LiveUpdate" ON)
+if(libliveupdate)
+  add_subdirectory(lib/LiveUpdate)
+endif(libliveupdate)
+
 #
 # Installation
 #

api/net/dhcp/options.hpp

@@ -215,7 +215,7 @@ struct domain_name_servers : public type<DOMAIN_NAME_SERVERS>, public addr_optio
  */
 struct domain_name : public type<DOMAIN_NAME>, public base
 {
-  constexpr domain_name(const std::string& dname) noexcept
+  domain_name(const std::string& dname) noexcept
     : base{type::CODE, static_cast<uint8_t>(dname.size())}
   {
     std::memcpy(&val[0], dname.data(), dname.size());
@@ -296,7 +296,7 @@ struct server_identifier : public type<DHCP_SERVER_IDENTIFIER>, public addr_opti
  */
 struct param_req_list : public type<DHCP_PARAMETER_REQUEST_LIST>, public base
 {
-  constexpr param_req_list(const std::vector<Code>& codes) noexcept
+  param_req_list(const std::vector<Code>& codes) noexcept
     : base{DHCP_PARAMETER_REQUEST_LIST, static_cast<uint8_t>(codes.size())}
   {
     Expects(codes.size() < 50); // or something
@@ -309,7 +309,7 @@ struct param_req_list : public type<DHCP_PARAMETER_REQUEST_LIST>, public base
  */
 struct message : public type<DHCP_MESSAGE>, public base
 {
-  constexpr message(const std::string& msg) noexcept
+  message(const std::string& msg) noexcept
     : base{CODE, static_cast<uint8_t>(msg.size())}
   {
     Expects(not msg.empty() and msg.size() <= 128); // or something

api/net/inet.hpp

@@ -138,9 +138,9 @@ namespace net {
         return pckt;
       }
 
-      Filter_chain(const char* chain_name, std::initializer_list<Packetfilter> filters) :
-        chain{filters},
-        name{chain_name} {}
+      Filter_chain(const char* chain_name, std::initializer_list<Packetfilter> filters)
+        : chain(filters), name{chain_name}
+      {}
     };
 
     /**

api/net/tcp/connection.inc

@@ -10,7 +10,7 @@ inline Connection& Connection::on_connect(ConnectCallback cb) {
 
 inline Connection& Connection::on_read(size_t recv_bufsz, ReadCallback cb)
 {
-  read_request = std::make_unique<ReadRequest>(recv_bufsz, this->cb.RCV.NXT, cb);
+  read_request = std::make_unique<ReadRequest>(recv_bufsz, seq_t(this->cb.RCV.NXT), cb);
   return *this;
 }
 

api/net/tcp/tcp.hpp

@@ -26,7 +26,7 @@
 #include "packet.hpp"
 
 #include <map>  // connections, listeners
-#include <queue>  // writeq
+#include <deque>  // writeq
 #include <net/inet.hpp>
 #include <net/socket.hpp>
 #include <net/port_util.hpp>
@@ -710,7 +710,7 @@ namespace net {
      *
      * @param[in]  <unnamed>  A ptr to a Connection
      */
-    void queue_offer(tcp::Connection_ptr);
+    void queue_offer(tcp::Connection&);
 
     /**
      * @brief      Force the TCP to process the it's queue with the current amount of available packets.

api/util/statman.hpp

@@ -100,7 +100,7 @@ class Stat {
   Stat& operator=(const Stat& other) = delete;
   Stat& operator=(Stat&& other) = delete;
 
-} __attribute__((packed)); //< class Stat
+}; //< class Stat
 
 
 class Statman {

cmake/post.service.cmake

@@ -15,21 +15,23 @@ set(CMAKE_CXX_COMPILER_TARGET ${TRIPLE})
 set(CMAKE_C_COMPILER_TARGET ${TRIPLE})
 message(STATUS "Target triple ${TRIPLE}")
 
+# defines $CAPABS depending on installation
+include(${CMAKE_CURRENT_LIST_DIR}/settings.cmake)
+
 # Arch-specific defines & options
 if ("${ARCH}" STREQUAL "x86_64")
   set(ARCH_INTERNAL "ARCH_X64")
   set(CMAKE_ASM_NASM_OBJECT_FORMAT "elf64")
   set(OBJCOPY_TARGET "elf64-x86-64")
+  set(CAPABS "${CAPABS} -m64")
 else()
   set(ARCH_INTERNAL "ARCH_X86")
   set(CMAKE_ASM_NASM_OBJECT_FORMAT "elf")
   set(OBJCOPY_TARGET "elf32-i386")
+  set(CAPABS "${CAPABS} -m32")
 endif()
 enable_language(ASM_NASM)
 
-# defines $CAPABS depending on installation
-include(${CMAKE_CURRENT_LIST_DIR}/settings.cmake)
-
 # Various global defines
 # * OS_TERMINATE_ON_CONTRACT_VIOLATION provides classic assert-like output from Expects / Ensures
 # * _GNU_SOURCE enables POSIX-extensions in newlib, such as strnlen. ("everything newlib has", ref. cdefs.h)
@@ -46,8 +48,8 @@ if (debug)
 endif()
 
 if (CMAKE_COMPILER_IS_GNUCC)
-  set(CMAKE_CXX_FLAGS "-m32 -MMD ${CAPABS} ${WARNS} -nostdlib -fno-omit-frame-pointer -c -std=c++14 -D_LIBCPP_HAS_NO_THREADS=1")
-  set(CMAKE_C_FLAGS "-m32 -MMD ${CAPABS} ${WARNS} -nostdlib -fno-omit-frame-pointer -c")
+  set(CMAKE_CXX_FLAGS "-MMD ${CAPABS} ${WARNS} -nostdlib -fno-omit-frame-pointer -c -std=c++14 -D_LIBCPP_HAS_NO_THREADS=1")
+  set(CMAKE_C_FLAGS "-MMD ${CAPABS} ${WARNS} -nostdlib -fno-omit-frame-pointer -c")
 else()
   # these kinda work with llvm
   set(CMAKE_CXX_FLAGS "-MMD ${CAPABS} ${OPTIMIZE} ${WARNS} -nostdlib -nostdlibinc -fno-omit-frame-pointer -c -std=c++14 -D_LIBCPP_HAS_NO_THREADS=1")

lib/LiveUpdate/CMakeLists.txt

@@ -0,0 +1,27 @@
+cmake_minimum_required(VERSION 2.8.9)
+
+add_definitions(-DARCH_${ARCH})
+add_definitions(-DARCH="${ARCH}")
+
+include_directories(${INCLUDEOS_ROOT}/api/posix)
+include_directories(${LIBCXX_INCLUDE_DIR})
+include_directories(${NEWLIB_INCLUDE_DIR})
+include_directories(${INCLUDEOS_ROOT}/src/include)
+include_directories(${INCLUDEOS_ROOT}/api)
+include_directories(${INCLUDEOS_ROOT}/mod/GSL/)
+
+add_custom_command(
+  OUTPUT hotswap64.bin
+	COMMAND ${CMAKE_ASM_NASM_COMPILER} -f bin -o hotswap64.bin ${CMAKE_CURRENT_SOURCE_DIR}/hotswap64.asm
+	DEPENDS hotswap64.asm
+)
+add_custom_target(hotswap64 DEPENDS hotswap64.bin)
+
+# LiveUpdate static library
+add_library(liveupdate STATIC
+    storage.cpp update.cpp resume.cpp rollback.cpp hotswap.cpp
+    serialize_tcp.cpp hotswap64_blob.asm
+  )
+add_dependencies(liveupdate hotswap64)
+install(TARGETS liveupdate DESTINATION includeos/${ARCH}/lib)
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/liveupdate.hpp DESTINATION includeos/include RENAME liveupdate)

lib/LiveUpdate/README.md

@@ -0,0 +1 @@
+# LiveUpdate

lib/LiveUpdate/hotswap.cpp

@@ -0,0 +1,22 @@
+/**
+ * Master thesis
+ * by Alf-Andre Walla 2016-2017
+ *
+**/
+asm(".org 0x8000");
+#define SOFT_RESET_MAGIC   0xFEE1DEAD
+
+extern "C" __attribute__((noreturn))
+void hotswap(const char* base, int len, char* dest, void* start, void* reset_data)
+{
+  // replace old kernel with new
+  for (int i = 0; i < len; i++)
+    dest[i] = base[i];
+  // jump to _start
+  asm volatile("jmp *%2" : : "a" (SOFT_RESET_MAGIC), "b" (reset_data), "c" (start));
+  asm volatile(
+  ".global __hotswap_length;\n"
+  "__hotswap_length:" );
+  // we can never get here!
+  __builtin_unreachable();
+}