Merge branch 'dev' of https://github.com/hioa-cs/IncludeOS into dev

Author: mnordsletten

src/kernel/elf.cpp

@@ -16,6 +16,7 @@
 // limitations under the License.
 
 #include <kernel/elf.hpp>
+#include <common>
 #include <cassert>
 #include <cstdio>
 #include <string>
@@ -72,14 +73,16 @@ class ElfTables
   func_offset getsym(Elf32_Addr addr)
   {
     // probably just a null pointer with ofs=addr
-    if (addr < 0x7c00) return {null_stringz, 0, addr};
+    if (UNLIKELY(addr < 0x7c00))
+        return {null_stringz, 0, addr};
     // definitely in the bootloader
-    if (addr < 0x7e00) return {boot_stringz, 0x7c00, addr - 0x7c00};
+    if (UNLIKELY(addr < 0x7e00))
+        return {boot_stringz, 0x7c00, addr - 0x7c00};
     // resolve manually from symtab
     auto* sym = getaddr(addr);
     // validate symbol address
     //assert(sym >= symtab.base && sym < symtab.base + symtab.entries);
-    if (sym) {
+    if (LIKELY(sym)) {
       auto base   = sym->st_value;
       auto offset = addr - base;
       // return string name for symbol

src/seed/Makefile

@@ -50,8 +50,8 @@ INCLUDES = -I$(INC_LIBCXX) -I$(INSTALL)/api/sys -I$(INC_NEWLIB) -I$(INSTALL)/api
 all:      CAPABS = $(CAPABS_COMMON) -O2 -DOS_TERMINATE_ON_CONTRACT_VIOLATION
 debug:    CAPABS = $(CAPABS_COMMON) -O0
 stripped: CAPABS = $(CAPABS_COMMON) -Os
-# by default, remove debugging
-STRIPPED=-S
+# by default, don't use strip because it has caused us some problems
+STRIPPED=
 
 CPPOPTS = $(CAPABS) $(WARNS) -c -m32 -std=c++14 $(INCLUDES) -D_LIBCPP_HAS_NO_THREADS=1 -D_GNU_SOURCE
 LDOPTS = -nostdlib -melf_i386 -N --eh-frame-hdr --script=$(INSTALL)/linker.ld --defsym _MAX_MEM_MIB_=$(MAX_MEM) --defsym=__stack_rand_ba=`date +%s`
@@ -88,6 +88,7 @@ DEPS = $(OBJS:.o=.d)
 # - a "service", to be linked with OS-objects (OS included)
 .PHONY: all stripped debug debug-info debug-all memdisk service
 
+all: LDOPTS += --strip-debug
 all: service
 
 stripped: LDOPTS  += -s

src/util/statman.cpp

@@ -15,6 +15,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <iterator>
 #include <statman>
 
 // Stat
@@ -76,15 +77,10 @@ Statman::Statman(uintptr_t start, Size_type num_bytes)
 }
 
 Statman::Span_iterator Statman::last_used() {
-  int i = 0;
-
-  for(auto it = stats_.begin(); it not_eq stats_.end(); ++it) {
-    if(i == next_available_)
-      return it;
-    i++;
-  }
-
-  return stats_.end();
+  Expects(next_available_ <= stats_.size());
+  auto it = stats_.begin();
+  std::advance(it, next_available_);
+  return it;
 }
 
 Stat& Statman::create(const Stat::stat_type type, const std::string& name) {