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

Author: fwsGonzo

.gitmodules

@@ -8,3 +8,6 @@
 [submodule "test/lest"]
 	path = test/lest
 	url = https://github.com/martinmoene/lest.git
+[submodule "mod/fiber"]
+	path = mod/fiber
+	url = https://github.com/boostorg/fiber.git

api/kernel/context.hpp

@@ -0,0 +1,34 @@
+// 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
+#ifndef KERNEL_CONTEXT_HPP
+#define KERNEL_CONTEXT_HPP
+
+#include <delegate>
+
+struct Context
+{
+  typedef delegate<void()> context_func;
+
+  // create and switch to a new stack with size @stack_size and call func
+  static void create(unsigned stack_size, context_func);
+  // switch to a pre-allocated location and call func
+  static void jump(void* location, context_func);
+};
+
+#endif

api/kernel/os.hpp

@@ -84,6 +84,13 @@ class OS {
    */
   static void halt();
 
+  /**
+   *  Returns true when the OS will still be running, and not shutting down.
+   */
+  static bool is_running() {
+    return power_;
+  }
+
   /**
    *  Add handler for standard output.
    */

api/net/tcp/connection.hpp

@@ -19,14 +19,13 @@
 #ifndef NET_TCP_CONNECTION_HPP
 #define NET_TCP_CONNECTION_HPP
 
-#include <hw/pit.hpp>
-
 #include "common.hpp"
 #include "read_request.hpp"
 #include "rttm.hpp"
 #include "socket.hpp"
 #include "tcp_errors.hpp"
 #include "write_queue.hpp"
+#include <delegate>
 
 namespace net {
   class TCP;
@@ -229,6 +228,9 @@ class Connection : public std::enable_shared_from_this<Connection> {
   bool is_closing() const
   { return state_->is_closing(); }
 
+  bool is_closed() const
+  { return state_->is_closed(); };
+
   /*
     Helper function for state checks.
   */
@@ -307,6 +309,9 @@ class Connection : public std::enable_shared_from_this<Connection> {
     virtual bool is_closing() const
     { return false; }
 
+    virtual bool is_closed() const
+    { return false; }
+
   protected:
     /*
       Helper functions

api/net/tcp/connection_states.hpp

@@ -53,9 +53,13 @@ class Connection::Closed : public State {
 
     => SynSent
   */
-  virtual Result handle(Connection&, Packet_ptr in) override;
+  Result handle(Connection&, Packet_ptr in) override;
 
-  inline virtual std::string to_string() const override {
+  bool is_closed() const override {
+    return true;
+  }
+
+  std::string to_string() const override {
     return "CLOSED";
   };
 private:
@@ -378,11 +382,14 @@ class Connection::TimeWait : public State {
    */
   virtual Result handle(Connection&, Packet_ptr in) override;
 
-  inline virtual std::string to_string() const override {
+  std::string to_string() const override {
     return "TIME-WAIT";
   };
 
-  inline virtual bool is_closing() const override {
+  bool is_closing() const override {
+    return true;
+  }
+  bool is_closed() const override {
     return true;
   }
 

api/net/tcp/read_request.hpp

@@ -20,6 +20,7 @@
 #define NET_TCP_READ_REQUEST_HPP
 
 #include "read_buffer.hpp"
+#include <delegate>
 
 namespace net {
 namespace tcp {

mod/fiber

@@ -40,9 +40,6 @@ INC_NEWLIB=$(INSTALL)/newlib/include
 CC  = $(shell command -v clang-3.8 || command -v clang-3.6)
 CPP = $(shell command -v clang++-3.8 || command -v clang++-3.6 || command -v clang++)
 # Set defaults if not defined
-ifndef LD_INC
-	LD_INC = ld
-endif
 ifndef AR_INC
 	AR_INC = ar
 endif
@@ -54,12 +51,11 @@ endif
 CCOPTS  = -target i686-elf
 CPPOPTS = -target i686-elf
 
-INCLUDES  = -I../api/sys -I$(INSTALL)/libcxx/include -I$(INC_NEWLIB) -Iinclude -I../api -I../mod/GSL
+INCLUDES  = -I../api/sys -I$(INSTALL)/libcxx/include -I$(INC_NEWLIB) -Iinclude -I../api -I../mod/GSL -I../mod/fiber/include
 CINCLUDES = -I../api/sys -I$(INC_NEWLIB) -Iinclude -I../api
 
 CCOPTS  += $(CAPABS) $(WARNS) -c -m32 -march=i686 $(CINCLUDES)
 CPPOPTS += $(CAPABS) $(WARNS) -c -m32 -std=c++14 $(INCLUDES) -D_LIBCPP_HAS_NO_THREADS=1 -DOS_VERSION="\"$(shell git describe --dirty)\""
-LDOPTS = -nostdlib -melf_i386 -N --eh-frame-hdr --script=linker.ld
 
 # Objects
 ###################################################
@@ -70,7 +66,7 @@ OS_OBJECTS = kernel/start.o kernel/kernel_start.o kernel/syscalls.o \
 		kernel/interrupts.o kernel/os.o kernel/os_stdout.o kernel/cpuid.o \
 		kernel/memmap.o kernel/irq_manager.o kernel/pci_manager.o \
 		kernel/elf.o kernel/terminal.o kernel/terminal_disk.o \
-		kernel/vga.o kernel/debug_new.o \
+		kernel/vga.o kernel/debug_new.o kernel/context.o kernel/context_asm.o \
 		kernel/profile.o kernel/profile_intr.o \
 		kernel/timers.o kernel/rtc.o util/memstream.o util/async.o util/statman.o \
 		crt/c_abi.o crt/string.o crt/quick_exit.o crt/cxx_abi.o crt/mman.o \
@@ -88,7 +84,10 @@ OS_OBJECTS = kernel/start.o kernel/kernel_start.o kernel/syscalls.o \
 		net/buffer_store.o net/inet4.o \
 		fs/disk.o fs/filesystem.o fs/mbr.o fs/path.o \
 		fs/ext4.o fs/fat.o fs/fat_async.o fs/fat_sync.o fs/memdisk.o
-		# virtio/console.o
+		#../mod/fiber/src/barrier.o ../mod/fiber/src/context.o ../mod/fiber/src/condition_variable.o \
+		#../mod/fiber/src/fiber.o ../mod/fiber/src/future.o ../mod/fiber/src/properties.o ../mod/fiber/src/mutex.o \
+		# ../mod/fiber/src/recursive_mutex.o ../mod/fiber/src/recursive_timed_mutex.o \
+		#../mod/fiber/src/recursive_mutex.o ../mod/fiber/src/scheduler.o ../mod/fiber/src/timed_mutex.o
 
 DRIVERS = drivers/virtioblk.o drivers/virtionet.o
 DRIVERS_DEPS = $(DRIVERS:.o=.d)
@@ -103,7 +102,7 @@ CRTN_OBJ = crt/crtn.o
 ###################################################
 OS_DEPS = $(OS_OBJECTS:.o=.d)
 
-.PHONY: memdisk all debug stripped minimal clean
+.PHONY: all stripped minimal debug silent clean
 
 # Complete OS build
 ###################################################
@@ -115,10 +114,12 @@ all: CAPABS += -O2
 all: includeos
 	@echo "\n>>> Built OS-library. Install to '"$(INSTALL)"' using 'make install'"
 
-stripped: CAPABS += -Os
-stripped: LDOPTS += -s
+stripped: CAPABS += -O2
 stripped: includeos
 
+minimal: CAPABS += -Os
+minimal: includeos
+
 # Build like "all" but with debugging output (i.e. the 'debug'-macro) enabled
 debug-info: CAPABS += -UNO_DEBUG
 debug-info: CAPABS += -DGSL_THROW_ON_CONTRACT_VIOLATION
@@ -141,31 +142,8 @@ debug-all: includeos test
 silent: CPPOPTS += -DNO_INFO=1
 silent: includeos
 
-minimal: CPPOPTS += -ffunction-sections -fdata-sections
-minimal: LDOPTS += --gc-sections
-minimal: stripped
-
 includeos: bootloader multiboot libc++abi.a os.a drivers platforms
 
-# Test service
-###################################################
-LIBS_OBJ = os.a $(LIBCXX) os.a $(LIBC_OBJ) $(LIBM_OBJ) $(LIBGCC)
-
-
-CRTBEGIN_OBJ = $(CRTI_OBJ) $(INSTALL)/crt/crtbegin.o
-CRTEND_OBJ   = $(INSTALL)/crt/crtend.o $(CRTN_OBJ)
-
-TEST_OBJ = debug/test_service.o util/service_name.o
-
-test_service: CPPOPTS += -DSERVICE_NAME="\"Test Service\""
-test_service: $(TEST_OBJ) $(CRTI_OBJ) $(CRTN_OBJ)
-	@echo "\n>> Linking test service"
-	@echo "\n>> LDOPTS = $(LDOPTS)"
-	touch smalldisk
-	$(LD_INC) -v $(LDOPTS) $(CRTBEGIN_OBJ) $(TEST_OBJ) $(LIBS_OBJ) $(CRTEND_OBJ) -o debug/$@
-
-test: test_service
-
 # OS libraries
 ###################################################
 # OS
@@ -249,10 +227,7 @@ etags:
 
 # Cleanup
 ###################################################
-clean_tests:
-	$(RM) debug/*.o debug/*.d debug/*.img debug/test_service debug/test_ipv6 debug/test_tcp
-
-clean: clean_tests
+clean:
 	$(RM) $(OS_OBJECTS) $(CXXABI_OBJ) $(OS_DEPS) $(DRIVERS) $(DRIVERS_DEPS) $(PLATFORMS) $(PLATFORMS_DEPS)
 	$(RM) os.a libc++abi.a
 	$(RM) bootloader apic_boot apic_boot.o boot/multiboot.o