Merge pull request #1459 from fwsGonzo/dev

New auto-configuration scheme

Author: fwsGonzo

examples/LiveUpdate/config.json

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

examples/STREAM/README.md

@@ -1,11 +1,8 @@
 ### STREAM: Sustainable Memory Bandwidth in High Performance Computers
 
+Using Qemu and the IncludeOS boot program:
 ```
-mkdir build
-cd build
-cmake ..
-make
-../run.sh stream_example
+boot .
 ```
 
 Output should show estimated memory bandwidth inside virtual machine.

examples/STREAM/vm.json

@@ -1,3 +1,3 @@
 {
-  "mem" : 1024
+  "mem" : 256
 }

examples/acorn/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/acorn/disk1/public/app/js/services/cpusage.js

@@ -3,10 +3,9 @@
 angular.module('acornWebApp')
   .factory('CPUsage', function() {
     // CPU usage chart
-    var date = new Date();
-    var total_data = ['total'];
+    var time_data = ['x', new Date()];
+    var idle_data = ['idle'];
     var active_data = ['active'];
-    var time_data = ['x', date];
 
     var cpu_usage_chart = {};
 
@@ -21,17 +20,19 @@ angular.module('acornWebApp')
           x: 'x',
           columns: [
             time_data,
-            total_data,
+            idle_data,
             active_data
           ],
           colors: {
-            total: '#3A8BF1',
+            idle: '#3A8BF1',
             active: '#F87E0C'
           },
           types: {
-            total: 'area-spline',
-            active: 'area-spline'
-            // 'line', 'spline', 'step', 'area', 'area-step' are also available to stack
+            idle: 'area',
+            active: 'area'
+          },
+          area : {
+            zerobased: true
           }
         },
         axis: {
@@ -50,12 +51,12 @@ angular.module('acornWebApp')
           },
           y: {
             label: {
-              text: 'cycles',
+              text: 'percent',
               position: 'outer-middle'
             },
             tick: {
               format: function (d) {
-                return d + " mill.";
+                return d + " %";
               }
             }
           }
@@ -68,35 +69,23 @@ angular.module('acornWebApp')
     };
 
     CPUsage.prototype.update = function(usage) {
-      // Showing interval in number of seconds
-      var interval = usage.interval / 1000000;
 
-      if(total_data.length > 20) {
+      if(idle_data.length > 20) {
         // Remove second element in each array (first element is name)
-        total_data.splice(1, 1);
-        active_data.splice(1, 1);
         time_data.splice(1, 1);
+        idle_data.splice(1, 1);
+        active_data.splice(1, 1);
       }
 
-      var total = usage.total;
-      var halt = usage.halt;
-      var active = total - halt;
-
-      // Showing cycles in millions
-      total /= 1000000;
-      active /= 1000000;
-
-      var d = new Date();
-
-      total_data.push(total.toFixed(3));
-      active_data.push(active.toFixed(3));
-      time_data.push(d);
+      time_data.push(new Date());
+      idle_data.push(usage.idle.toFixed(3));
+      active_data.push(usage.active.toFixed(3));
 
-      cpu_usage_chart.axis.labels({x: 'CPU data updated at an interval of ' + interval + ((interval > 1) ? ' seconds' : ' second')});
+      cpu_usage_chart.axis.labels({x: 'CPU usage over time'});
       cpu_usage_chart.load({
         columns: [
           time_data,
-          total_data,
+          idle_data,
           active_data
         ]
       });

examples/acorn/service.cpp

@@ -36,7 +36,7 @@ Disk_ptr disk;
 #include <isotime>
 #include <net/inet4>
 
-void Service::start()
+static void start_acorn(net::Inet<net::IP4>& inet)
 {
   /** SETUP LOGGER */
   const int LOGBUFFER_LEN = 1024*16;
@@ -45,7 +45,8 @@ void Service::start()
   logger_->flush();
   logger_->log("LUL\n");
 
-  OS::add_stdout([] (const char* data, size_t len) {
+  OS::add_stdout(
+  [] (const char* data, size_t len) {
     // append timestamp
     auto entry = "[" + isotime::now() + "]" + std::string{data, len};
     logger_->log(entry);
@@ -55,28 +56,10 @@ void Service::start()
 
   // init the first legit partition/filesystem
   disk->init_fs(
-  [] (fs::error_t err, auto& fs)
+  [&inet] (fs::error_t err, auto& fs)
   {
       if (err) panic("Could not mount filesystem...\n");
 
-      /** IP STACK SETUP **/
-      // Bring up IPv4 stack on network interface 0
-      auto& stack = net::Inet4::ifconfig(5.0,
-        [] (bool timeout) {
-          printf("DHCP resolution %s\n", timeout ? "failed" : "succeeded");
-          if (timeout)
-          {
-            /**
-             * Default Manual config. Can only be done after timeout to work
-             * with DHCP offers going to unicast IP (e.g. in GCE)
-             **/
-            net::Inet4::stack().network_config({ 10,0,0,42 },     // IP
-                                               { 255,255,255,0 }, // Netmask
-                                               { 10,0,0,1 },      // Gateway
-                                               { 8,8,8,8 });      // DNS
-          }
-        });
-
       // only works with synchronous disks (memdisk)
       list_static_content(disk);
 
@@ -125,8 +108,8 @@ void Service::start()
       dashboard_->add(dashboard::Status::instance());
       // Construct component
       dashboard_->construct<dashboard::Statman>(Statman::get());
-      dashboard_->construct<dashboard::TCP>(stack.tcp());
-      dashboard_->construct<dashboard::CPUsage>(500ms);
+      dashboard_->construct<dashboard::TCP>(inet.tcp());
+      dashboard_->construct<dashboard::CPUsage>();
       dashboard_->construct<dashboard::Logger>(*logger_, static_cast<size_t>(50));
 
       // Add Dashboard routes to "/api/dashboard"
@@ -154,7 +137,7 @@ void Service::start()
 
 
       /** SERVER SETUP **/
-      server_ = std::make_unique<Server>(stack.tcp());
+      server_ = std::make_unique<Server>(inet.tcp());
       // set routes and start listening
       server_->set_routes(router).listen(80);
 
@@ -178,3 +161,15 @@ void Service::start()
     }); // < disk
 
 }
+
+void Service::start()
+{
+  auto& inet = net::Super_stack::get<net::IP4>(0);
+  if (not inet.is_configured())
+  {
+    inet.on_config(start_acorn);
+  }
+  else {
+    start_acorn(inet);
+  }
+}

examples/demo_service/CMakeLists.txt

@@ -5,7 +5,6 @@ if (NOT DEFINED ENV{INCLUDEOS_PREFIX})
   set(ENV{INCLUDEOS_PREFIX} /usr/local)
 endif()
 include($ENV{INCLUDEOS_PREFIX}/includeos/pre.service.cmake)
-
 project (demo_service)
 
 # Human-readable name of your service
@@ -19,19 +18,9 @@ set(SOURCES
   service.cpp # ...add more here
   )
 
-#
-# Service CMake options
-# (uncomment to enable)
-#
-
-# MISC:
-
 # To add your own include paths:
 # set(LOCAL_INCLUDES ".")
 
-# Adding memdisk (expects my.disk to exist in current dir):
-# set(MEMDISK ${CMAKE_SOURCE_DIR}/my.disk)
-
 # DRIVERS / PLUGINS:
 
 if ("$ENV{PLATFORM}" STREQUAL "x86_solo5")
@@ -47,10 +36,9 @@ else()
 endif()
 
 set(PLUGINS
-    # syslogd    # Syslog over UDP
+    autoconf  # configuration from config.json
     # ...others
   )
 
-
 # include service build script
 include($ENV{INCLUDEOS_PREFIX}/includeos/post.service.cmake)

examples/demo_service/README.md

@@ -1,11 +1,10 @@
 ### IncludeOS Demo Service
 
+To start, using boot:
 ```
-mkdir build
-cd build
-cmake ..
-make
-../run.sh IncludeOS_example
+boot .
 ```
 
 This demo-service should start an instance of IncludeOS that brings up a minimal web service on port 80 with static content.
+
+The default static IP is 10.0.0.42, unless running on a network with DHCP.

examples/demo_service/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/demo_service/service.cpp

@@ -79,21 +79,12 @@ http::Response handle_request(const http::Request& req)
   return res;
 }
 
-void Service::start(const std::string&)
+void Service::start()
 {
-  // DHCP on interface 0
-  printf("*** Waiting up to 10 sec. for DHCP... ***\n");
-  auto& inet = net::Inet4::ifconfig(5.0, [](bool timeout) {
-    if (timeout) {
-      printf("*** Falling back to static network config ***\n");
-      // static IP in case DHCP fails
-      net::Inet4::stack().network_config(
-        { 10,0,0,42 },     // IP
-        { 255,255,255,0 }, // Netmask
-        { 10,0,0,1 },      // Gateway
-        { 10,0,0,1 });     // DNS
-    }
-  });
+  // Get the first IP stack
+  // It should have configuration from config.json
+  auto& inet = net::Super_stack::get<net::IP4>(0);
+
   // Print some useful netstats every 30 secs
   Timers::periodic(5s, 30s,
   [&inet] (uint32_t) {