Merge pull request #1451 from hioa-cs/dev

Merge Dev

Author: alfreb

api/arch.hpp

@@ -33,6 +33,7 @@ extern void __arch_disable_legacy_irq(uint8_t);
 extern void __arch_install_irq(uint8_t, void(*)());
 extern void __arch_subscribe_irq(uint8_t);
 extern void __arch_unsubscribe_irq(uint8_t);
+extern void __arch_preempt_forever(void(*)());
 
 inline void __arch_hw_barrier() noexcept;
 inline void __sw_barrier() noexcept;

api/kernel/os.hpp

@@ -74,6 +74,13 @@ class OS {
   /** Uptime in whole seconds. */
   static RTC::timestamp_t uptime();
 
+  /** Time spent sleeping (halt) in cycles */
+  static uint64_t cycles_asleep() noexcept;
+
+  /** Time spent sleeping (halt) in micros */
+  static uint64_t micros_asleep() noexcept;
+
+
   static MHz cpu_freq() noexcept
   { return cpu_mhz_; }
 
@@ -178,11 +185,8 @@ class OS {
     return memory_end_;
   }
 
-  /** time spent sleeping (halt) in cycles */
-  static uint64_t get_cycles_halt() noexcept;
-
-  /** total time spent in cycles */
-  static uint64_t get_cycles_total() noexcept;
+  /** Returns the automatic location set aside for storing system and program state **/
+  static void* liveupdate_storage_area() noexcept;
 
   /**
    * A map of memory ranges. The key is the starting address in numeric form.
@@ -255,6 +259,7 @@ class OS {
 
   // XXX: Only used by solo5
   static RTC::timestamp_t booted_at_;
+  static uintptr_t liveupdate_loc_;
   static std::string version_str_;
   static std::string arch_str_;
   static Plugin_vec plugins_;

api/kernel/timers.hpp

@@ -45,6 +45,13 @@ class Timers
 
   /// returns the number of current, active timers
   static size_t active();
+  /// returns the number of existing timers
+  static size_t existing();
+  /// returns the number of free timers
+  static size_t free();
+
+  /// NOTE: All above operations operate on the current CPU
+  /// NOTE: There is a separate timer system on each active CPU
 
   /// initialization
   typedef delegate<void(duration_t)> start_func_t;

api/net/ip4/addr.hpp

@@ -216,6 +216,30 @@ struct Addr {
   constexpr bool operator<(const uint32_t raw_addr) const noexcept
   { return ntohl(whole) < ntohl(raw_addr); }
 
+  /**
+   * Operator to check for less-than-or-equal relationship
+   *
+   * @param other
+   *  The IPv4 address object to check for less-than-or-equal relationship
+   *
+   * @return true if this object is less-than-or-equal to other, false otherwise
+   */
+  constexpr bool operator<=(const Addr other) const noexcept
+  { return (*this < other or *this == other); }
+
+  /**
+   * Operator to check for less-than-or-equal relationship
+   *
+   * @param raw_addr
+   *  The 32-bit value to check for less-than-or-equal relationship
+   *
+   * @return true if this object is less-than-or-equal to raw_addr, false otherwise
+   *
+   * @note The 32-bit value must be in network byte order
+   */
+  constexpr bool operator<=(const uint32_t raw_addr) const noexcept
+  { return (*this < raw_addr or *this == raw_addr); }
+
   /**
    * Operator to check for greater-than relationship
    *
@@ -225,7 +249,7 @@ struct Addr {
    * @return true if this object is greater-than other, false otherwise
    */
   constexpr bool operator>(const Addr other) const noexcept
-  { return not (*this < other); }
+  { return not (*this <= other); }
 
   /**
    * Operator to check for greater-than relationship
@@ -238,7 +262,31 @@ struct Addr {
    * @note The 32-bit value must be in network byte order
    */
   constexpr bool operator>(const uint32_t raw_addr) const noexcept
-  { return not (*this < raw_addr); }
+  { return not (*this <= raw_addr); }
+
+  /**
+   * Operator to check for greater-than-or-equal relationship
+   *
+   * @param other
+   *  The IPv4 address object to check for greater-than-or-equal relationship
+   *
+   * @return true if this object is greater-than-or-equal to other, false otherwise
+   */
+  constexpr bool operator>=(const Addr other) const noexcept
+  { return (*this > other or *this == other); }
+
+  /**
+   * Operator to check for greater-than-or-equal relationship
+   *
+   * @param raw_addr
+   *  The 32-bit value to check for greater-than-or-equal relationship
+   *
+   * @return true if this object is greater-than-or-equal to raw_addr, false otherwise
+   *
+   * @note The 32-bit value must be in network byte order
+   */
+  constexpr bool operator>=(const uint32_t raw_addr) const noexcept
+  { return (*this > raw_addr or *this == raw_addr); }
 
   /**
    * Operator to perform a bitwise-and operation on the given

api/profile

@@ -39,10 +39,10 @@ struct StackSampler
   static void begin();
 
   // total number of waking samples taken
-  static uint64_t samples_total();
+  static uint64_t samples_total() noexcept;
 
   // total number of samples taken while asleep
-  static uint64_t samples_asleep();
+  static uint64_t samples_asleep() noexcept;
 
   // retrieve N top results/hotspots
   static std::vector<Sample> results(int N);
@@ -57,6 +57,7 @@ struct StackSampler
   enum mode_t {
     MODE_CURRENT,
     MODE_CALLER,
+    MODE_DUMMY
   };
 
   // set sampling mode

cmake/post.service.cmake

@@ -223,8 +223,13 @@ if (${ELF} STREQUAL "i686")
   set(ELF "i386")
 endif()
 
+set(PRE_BSS_SIZE  "--defsym PRE_BSS_AREA=0x0")
+if ("${PLATFORM}" STREQUAL "x86_solo5")
+  # pre-BSS memory hole for uKVM global variables
+  set(PRE_BSS_SIZE  "--defsym PRE_BSS_AREA=0x200000")
+endif()
 
-set(LDFLAGS "-nostdlib -melf_${ELF} -N --eh-frame-hdr ${STRIP_LV} --script=${INSTALL_LOC}/${ARCH}/linker.ld ${INSTALL_LOC}/${ARCH}/lib/crtbegin.o")
+set(LDFLAGS "-nostdlib -melf_${ELF} -N --eh-frame-hdr ${STRIP_LV} --script=${INSTALL_LOC}/${ARCH}/linker.ld ${PRE_BSS_SIZE} ${INSTALL_LOC}/${ARCH}/lib/crtbegin.o")
 
 set_target_properties(service PROPERTIES LINK_FLAGS "${LDFLAGS}")
 

examples/LiveUpdate/CMakeLists.txt

@@ -0,0 +1,35 @@
+cmake_minimum_required(VERSION 2.8.9)
+
+# IncludeOS install location
+if (NOT DEFINED ENV{INCLUDEOS_PREFIX})
+  set(ENV{INCLUDEOS_PREFIX} /usr/local)
+endif()
+include($ENV{INCLUDEOS_PREFIX}/includeos/pre.service.cmake)
+project(service)
+
+# Human-readable name of your service
+set(SERVICE_NAME "LiveUpdate example")
+
+# Name of your service binary
+set(BINARY       "liveupdate")
+
+# Source files to be linked with OS library parts to form bootable image
+set(SOURCES
+  service.cpp  response.cpp
+  )
+
+# DRIVERS / PLUGINS:
+set(DRIVERS
+    virtionet
+  )
+
+set(PLUGINS
+    autoconf
+  )
+
+set(LIBRARIES
+    libliveupdate.a
+  )
+
+# include service build script
+include($ENV{INCLUDEOS_PREFIX}/includeos/post.service.cmake)

examples/LiveUpdate/README.md

@@ -0,0 +1,9 @@
+### LiveUpdate Demo Service
+
+```
+boot .
+Ctrl+Shift+T
+./update.sh
+```
+
+This service should start an instance of IncludeOS that brings up a minimal web service on port 80 with static content. When running test.sh the service should be updated with itself.

examples/LiveUpdate/config.json

@@ -0,0 +1,11 @@
+{
+  "net" : [
+    {
+      "iface": 0,
+      "config": "dhcp-with-fallback",
+      "address": "10.0.0.42",
+      "netmask": "255.255.255.0",
+      "gateway": "10.0.0.1"
+    }
+  ]
+}

examples/LiveUpdate/liu.hpp

@@ -0,0 +1,47 @@
+// This file is a part of the IncludeOS unikernel - www.includeos.org
+//
+// Copyright 2015 Oslo and Akershus University College of Applied Sciences
+// and Alfred Bratterud
+//
+// 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.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+#include <liveupdate>
+#include "server.hpp"
+
+void setup_liveupdate_server(net::Inet<net::IP4>& inet,
+                             const uint16_t PORT,
+                             liu::LiveUpdate::storage_func func)
+{
+  static liu::LiveUpdate::storage_func save_function;
+  save_function = func;
+
+  // listen for live updates
+  server(inet, PORT,
+  [] (liu::buffer_t& buffer)
+  {
+    printf("* Live updating from %p (len=%u)\n",
+            buffer.data(), (uint32_t) buffer.size());
+    try
+    {
+      // run live update process
+      liu::LiveUpdate::exec(buffer, "test", save_function);
+    }
+    catch (std::exception& err)
+    {
+      liu::LiveUpdate::restore_environment();
+      printf("Live update failed:\n%s\n", err.what());
+      throw;
+    }
+  });
+}