smp: Fix unused warnings when building single threaded

Author: fwsGonzo

api/net/buffer_store.hpp

@@ -82,9 +82,10 @@ namespace net
     std::vector<buffer_t> available_;
     int                  cpu;
     static bool          smp_enabled_;
+#ifndef INCLUDEOS_SINGLE_THREADED
     // has strict alignment reqs, so put at end
     spinlock_t           plock;
-
+#endif
     BufferStore(BufferStore&)  = delete;
     BufferStore(BufferStore&&) = delete;
     BufferStore& operator=(BufferStore&)  = delete;

src/arch/x86/smp.cpp

@@ -171,7 +171,6 @@ void ::SMP::unicast(int cpu, uint8_t irq)
 }
 
 static spinlock_t __global_lock = 0;
-static spinlock_t __memory_lock = 0;
 
 void ::SMP::global_lock() noexcept
 {
@@ -184,6 +183,8 @@ void ::SMP::global_unlock() noexcept
 
 /// SMP variants of malloc and free ///
 #ifndef INCLUDEOS_SINGLE_THREADED
+static spinlock_t __memory_lock = 0;
+
 #include <malloc.h>
 void* malloc(size_t size)
 {

src/kernel/elf.cpp

@@ -168,8 +168,8 @@ class ElfTables
     int status;
     // internally, demangle just returns buf when status is ok
     auto* res = __cxa_demangle(name, (char*) buffer, &buflen, &status);
-    if (status) return name;
-    return res;
+    if (status == 0) return res;
+    return name;
   }
 
   SymTab    symtab;
@@ -215,8 +215,8 @@ bool Elf::verify_symbols()
 
 void print_backtrace()
 {
-  char _symbol_buffer[4096];
-  char _btrace_buffer[4096];
+  char _symbol_buffer[8192];
+  char _btrace_buffer[8192];
 
   if (Elf::get_strtab() == NULL) {
     int len = snprintf(_btrace_buffer, sizeof(_btrace_buffer),

src/net/buffer_store.cpp

@@ -66,8 +66,8 @@ namespace net {
 
   BufferStore::buffer_t BufferStore::get_buffer()
   {
-    bool is_locked = false;
 #ifndef INCLUDEOS_SINGLE_THREADED
+    bool is_locked = false;
     if (smp_enabled_) {
       lock(plock);
       is_locked = true;

src/net/inet4.cpp

@@ -1,4 +1,20 @@
-//-*- C++ -*-
+// 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.
+
 #include <net/inet4.hpp>
 #include <net/dhcp/dh4client.hpp>
 #include <smp>