Merge pull request #1427 from fwsGonzo/dev

fwsGonzo · web-flow · commit 807b42488614 · 2017-08-14T11:05:03.000-07:00
Various fixes
diff --git a/api/kernel/os.hpp b/api/kernel/os.hpp
@@ -137,12 +137,6 @@ class OS {
    *  Add handler for standard output.
    */
   static void add_stdout(print_func func);
-  /**
-   *  Add stdout handler that simply calls OS::default_stdout
-  **/
-  static void add_default_stdout() {
-    add_stdout(OS::default_stdout);
-  }
 
   /**
    *  The default output method preferred by each platform
diff --git a/api/kernel/syscalls.hpp b/api/kernel/syscalls.hpp
@@ -22,7 +22,6 @@
 #include <sys/types.h>
 
 extern "C" {
-  int  kill(pid_t pid, int sig);
   void panic(const char* why) __attribute__((noreturn));
   void default_exit() __attribute__((noreturn));
 
diff --git a/cmake/post.service.cmake b/cmake/post.service.cmake
@@ -73,6 +73,7 @@ if (EXISTS ${CMAKE_SOURCE_DIR}/config.json)
    add_library(config_json STATIC config_json.o)
    set_target_properties(config_json PROPERTIES LINKER_LANGUAGE CXX)
    target_link_libraries(service --whole-archive config_json --no-whole-archive)
+   set(PLUGINS ${PLUGINS} autoconf)
 endif()
 
 #
diff --git a/examples/acorn/CMakeLists.txt b/examples/acorn/CMakeLists.txt
@@ -15,9 +15,6 @@ set(SERVICE_NAME "Acorn Web Appliance")
 # Name of your service binary
 set(BINARY       "acorn")
 
-# Maximum memory can be hard-coded into the binary
-set(MAX_MEM 128)
-
 # Source files to be linked with OS library parts to form bootable image
 set(SOURCES
   service.cpp fs/acorn_fs.cpp
diff --git a/examples/demo_service/CMakeLists.txt b/examples/demo_service/CMakeLists.txt
@@ -36,14 +36,10 @@ set(SOURCES
 
 if ("$ENV{PLATFORM}" STREQUAL "x86_solo5")
   set(DRIVERS
-      silent_start  # Less output during boot
-      solo5net     # Virtio networking
-      # virtioblock # Virtio block device
-      # ... Others from src/drivers
+      solo5net
     )
 else()
   set(DRIVERS
-      silent_start  # Less output during boot
       virtionet     # Virtio networking
       # virtioblock # Virtio block device
       # ... Others from src/drivers
diff --git a/examples/tcp/CMakeLists.txt b/examples/tcp/CMakeLists.txt
@@ -34,7 +34,6 @@ set(SOURCES
 # DRIVERS / PLUGINS:
 
 set(DRIVERS
-  silent_start
   virtionet   # Virtio networking
   # ... Others from IncludeOS/src/drivers
   )
diff --git a/seed/service/CMakeLists.txt b/seed/service/CMakeLists.txt
@@ -1,46 +1,25 @@
 cmake_minimum_required(VERSION 2.8.9)
-
-# IncludeOS install location
 if (NOT DEFINED ENV{INCLUDEOS_PREFIX})
   set(ENV{INCLUDEOS_PREFIX} /usr/local)
 endif()
-
-# Use toolchain (if needed)
 include($ENV{INCLUDEOS_PREFIX}/includeos/pre.service.cmake)
-
-
-# Name of your project
-project (seed)
+project (service)
 
 # Human-readable name of your service
 set(SERVICE_NAME "IncludeOS seed")
 
 # Name of your service binary
 set(BINARY       "seed")
 
-# Maximum memory can be hard-coded into the binary
-set(MAX_MEM 128)
-
 # Source files to be linked with OS library parts to form bootable image
 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:
-
 set(DRIVERS
   # virtionet   # Virtio networking
   # virtioblock # Virtio block device
@@ -52,12 +31,14 @@ set(PLUGINS
   # ...others
   )
 
-# THIRD PARTY LIBRARIES:
-
+# STATIC LIBRARIES:
 set(LIBRARIES
   # path to full library
   )
 
 
 # include service build script
 include($ENV{INCLUDEOS_PREFIX}/includeos/post.service.cmake)
+
+# Create in-memory filesystem from folder
+#diskbuilder(my_folder)
diff --git a/src/arch/i686/linker.ld b/src/arch/i686/linker.ld
@@ -117,6 +117,7 @@ SECTIONS
     _CONFIG_JSON_START_ = .;
     KEEP(*(.config))
     _CONFIG_JSON_END_ = .;
+    BYTE(0);
   }
 
   .rodata :
diff --git a/src/arch/x86_64/linker.ld b/src/arch/x86_64/linker.ld
@@ -121,6 +121,7 @@ SECTIONS
     _CONFIG_JSON_START_ = .;
     KEEP(*(.config))
     _CONFIG_JSON_END_ = .;
+    BYTE(0);
   }
 
   .rodata :
diff --git a/src/drivers/CMakeLists.txt b/src/drivers/CMakeLists.txt
@@ -16,8 +16,8 @@ add_dependencies(vmxnet3 PrecompiledLibraries)
 add_library(heap_debugging STATIC heap_debugging.cpp)
 add_dependencies(heap_debugging PrecompiledLibraries)
 
-add_library(silent_start STATIC silent.cpp)
-add_dependencies(silent_start PrecompiledLibraries)
+add_library(boot_logger STATIC bootlog.cpp)
+add_dependencies(boot_logger PrecompiledLibraries)
 
 add_library(vga_output STATIC vgaout.cpp)
 add_dependencies(vga_output PrecompiledLibraries)
@@ -26,7 +26,7 @@ install(TARGETS
     virtionet virtioblk
     vmxnet3
     heap_debugging
-    silent_start vga_output
+    boot_logger vga_output
     DESTINATION includeos/${ARCH}/drivers)
 
 if(WITH_SOLO5)
diff --git a/src/drivers/bootlog.cpp b/src/drivers/bootlog.cpp
@@ -15,16 +15,5 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <os>
-#include <kprint>
-
-// prevent default serial out
-void default_stdout_handlers()
-{
-  OS::add_stdout(
-  [] (const char* str, size_t len)
-  {
-    if (OS::is_booted() || OS::is_panicking())
-        OS::default_stdout(str, len);
-  });
-}
+// enable logging during boot
+bool os_enable_boot_logging = true;
diff --git a/src/drivers/vgaout.cpp b/src/drivers/vgaout.cpp
@@ -15,10 +15,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// use VGA as default output instead of serial
 #include <vga>
 
+// output to VGA as well as the default stdout
 void default_stdout_handlers()
 {
+  OS::add_stdout(&OS::default_stdout);
   OS::add_stdout(TextmodeVGA::get().get_print_handler());
 }
diff --git a/src/drivers/vmxnet3.cpp b/src/drivers/vmxnet3.cpp
@@ -462,13 +462,13 @@ void vmxnet3::transmit(net::Packet_ptr pckt_ptr)
     sendq = std::move(next);
   }
 }
-int  vmxnet3::tx_tokens_free() const noexcept
+inline int  vmxnet3::tx_tokens_free() const noexcept
 {
   return VMXNET3_TX_FILL - (tx.producers - tx.consumers);
 }
-bool vmxnet3::can_transmit() const noexcept
+inline bool vmxnet3::can_transmit() const noexcept
 {
-  return tx.producers - tx.consumers < VMXNET3_TX_FILL;
+  return tx_tokens_free() > 0;
 }
 
 void vmxnet3::transmit_data(uint8_t* data, uint16_t data_length)
diff --git a/src/drivers/vmxnet3.hpp b/src/drivers/vmxnet3.hpp
@@ -87,27 +87,27 @@ class vmxnet3 : public net::Link_layer<net::Ethernet>
   void enable_intr(uint8_t idx) noexcept;
   void disable_intr(uint8_t idx) noexcept;
 
-  int  tx_tokens_free() const noexcept;
-  bool can_transmit() const noexcept;
+  inline int  tx_tokens_free() const noexcept;
+  inline bool can_transmit() const noexcept;
   void transmit_data(uint8_t* data, uint16_t);
   net::Packet_ptr recv_packet(uint8_t* data, uint16_t);
 
   // tx/rx ring state
   struct ring_stuff {
     uint8_t* buffers[NUM_TX_DESC];
-    int producers  = 0;
-    int prod_count = 0;
-    int consumers  = 0;
+    uint32_t producers  = 0;
+    uint32_t prod_count = 0;
+    uint32_t consumers  = 0;
   };
   struct rxring_state {
     uint8_t* buffers[NUM_RX_DESC];
     vmxnet3_rx_desc* desc0 = nullptr;
     vmxnet3_rx_desc* desc1 = nullptr;
     vmxnet3_rx_comp* comp  = nullptr;
     int index = 0;
-    int producers  = 0;
-    int prod_count = 0;
-    int consumers  = 0;
+    uint32_t producers  = 0;
+    uint32_t prod_count = 0;
+    uint32_t consumers  = 0;
   };
   void refill(rxring_state&);
 
@@ -120,10 +120,10 @@ class vmxnet3 : public net::Link_layer<net::Ethernet>
 
   hw::PCI_Device& pcidev;
   std::vector<uint8_t> irqs;
-  uintptr_t       iobase;
-  uintptr_t       ptbase;
-  MAC::Addr    hw_addr;
-  vmxnet3_dma*    dma;
+  uintptr_t     iobase;
+  uintptr_t     ptbase;
+  MAC::Addr     hw_addr;
+  vmxnet3_dma*  dma;
 
   ring_stuff tx;
   rxring_state rx[NUM_RX_QUEUES];
diff --git a/src/kernel/os.cpp b/src/kernel/os.cpp
@@ -139,12 +139,16 @@ void OS::add_stdout(OS::print_func func)
 __attribute__ ((weak))
 void default_stdout_handlers()
 {
-  OS::add_default_stdout();
+  OS::add_stdout(&OS::default_stdout);
 }
+__attribute__((weak))
+bool os_enable_boot_logging = false;
 void OS::print(const char* str, const size_t len)
 {
-  for (auto& func : os_print_handlers)
-      func(str, len);
+  for (auto& callback : os_print_handlers) {
+    if (os_enable_boot_logging || OS::is_booted() || OS::is_panicking())
+      callback(str, len);
+  }
 }
 
 void OS::legacy_boot() {
diff --git a/src/kernel/syscalls.cpp b/src/kernel/syscalls.cpp
@@ -15,17 +15,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <kernel/syscalls.hpp>
+
 #include <fcntl.h> // open()
 #include <string.h>
 #include <signal.h>
-
 #include <sys/errno.h>
 #include <sys/stat.h>
-
 #include <kernel/os.hpp>
-#include <kernel/syscalls.hpp>
 #include <kernel/rtc.hpp>
-#include <hw/serial.hpp>
 
 #include <statman>
 #include <kprint>
@@ -51,6 +49,26 @@ extern "C" {
   uintptr_t heap_end;
 }
 
+extern "C"
+void abort() {
+  panic("abort() called");
+}
+extern "C"
+void abort_message(const char* fmt, ...)
+{
+  char buffer[1024];
+  va_list list;
+  va_start(list, fmt);
+  vsnprintf(buffer, sizeof(buffer), fmt, list);
+  va_end(list);
+#ifdef ARCH_x86_64
+  asm("movq %0, %%rdi" : : "r"(buffer));
+  asm("jmp panic_begin");
+#else
+  panic(buffer);
+#endif
+}
+
 void _exit(int status) {
   kprintf("%s",std::string(LINEWIDTH, '=').c_str());
   kprint("\n");
@@ -90,8 +108,10 @@ int kill(pid_t pid, int sig) THROW {
   SMP::global_lock();
   printf("!!! Kill PID: %i, SIG: %i - %s ", pid, sig, strsignal(sig));
 
-  if (sig == 6ul) {
+  if (sig == 6) {
     printf("/ ABORT\n");
+  } else {
+    printf("\n");
   }
   SMP::global_unlock();
 
@@ -139,6 +159,7 @@ bool OS::is_panicking() noexcept
 **/
 void panic(const char* why)
 {
+asm("panic_begin:");
   /// prevent re-entering panic() more than once per CPU
   //if (panic_reenter) OS::reboot();
   panic_reenter = true;
@@ -160,7 +181,6 @@ void panic(const char* why)
   // heap info
   typedef unsigned long ulong;
   uintptr_t heap_total = OS::heap_max() - heap_begin;
-  double total = (heap_end - heap_begin) / (double) heap_total;
   fprintf(stderr, "Heap is at: %p / %p  (diff=%lu)\n",
          (void*) heap_end, (void*) OS::heap_max(), (ulong) (OS::heap_max() - heap_end));
   fprintf(stderr, "Heap usage: %lu / %lu Kb\n", // (%.2f%%)\n",
diff --git a/test/kernel/integration/smp/CMakeLists.txt b/test/kernel/integration/smp/CMakeLists.txt

Original file line number	Diff line number	Diff line change
`@@ -73,6 +73,7 @@ if (EXISTS ${CMAKE_SOURCE_DIR}/config.json)`
`73`	`73`	`add_library(config_json STATIC config_json.o)`
`74`	`74`	`set_target_properties(config_json PROPERTIES LINKER_LANGUAGE CXX)`
`75`	`75`	`target_link_libraries(service --whole-archive config_json --no-whole-archive)`
	`76`	`+ set(PLUGINS ${PLUGINS} autoconf)`
`76`	`77`	`endif()`
`77`	`78`
`78`	`79`	`#`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,6 @@ set(SOURCES`
`34`	`34`	`# DRIVERS / PLUGINS:`
`35`	`35`
`36`	`36`	`set(DRIVERS`
`37`		`- silent_start`
`38`	`37`	`virtionet # Virtio networking`
`39`	`38`	`# ... Others from IncludeOS/src/drivers`
`40`	`39`	`)`
Original file line number	Diff line number	Diff line change
`@@ -117,6 +117,7 @@ SECTIONS`
`117`	`117`	`_CONFIG_JSON_START_ = .;`
`118`	`118`	`KEEP(*(.config))`
`119`	`119`	`_CONFIG_JSON_END_ = .;`
	`120`	`+ BYTE(0);`
`120`	`121`	`}`
`121`	`122`
`122`	`123`	`.rodata :`
Original file line number	Diff line number	Diff line change
`@@ -121,6 +121,7 @@ SECTIONS`
`121`	`121`	`_CONFIG_JSON_START_ = .;`
`122`	`122`	`KEEP(*(.config))`
`123`	`123`	`_CONFIG_JSON_END_ = .;`
	`124`	`+ BYTE(0);`
`124`	`125`	`}`
`125`	`126`
`126`	`127`	`.rodata :`