runtime: add a switch to turn handles off

Author: nickwanninger

runtime/rt/halloc.cpp

@@ -9,13 +9,19 @@
  * and modify it as specified in the file "LICENSE".
  */
 
+// #define MALLOC_BYPASS
+
+#ifdef MALLOC_BYPASS
+#include <malloc.h>
+#endif
 
 #include <alaska/Runtime.hpp>
 #include <alaska/ThreadCache.hpp>
 #include <alaska.h>
 #include <errno.h>
 
 
+
 // TODO: don't have this be global!
 static __thread alaska::ThreadCache *g_tc = nullptr;
 
@@ -38,12 +44,25 @@ static void *_halloc(size_t sz, int zero) {
 }
 
 
-void *halloc(size_t sz) noexcept { return _halloc(sz, 0); }
+void *halloc(size_t sz) noexcept {
+#ifdef MALLOC_BYPASS
+  return ::malloc(sz);
+#endif
+  return _halloc(sz, 0);
+}
 
-void *hcalloc(size_t nmemb, size_t size) { return _halloc(nmemb * size, 1); }
+void *hcalloc(size_t nmemb, size_t size) {
+#ifdef MALLOC_BYPASS
+  return ::calloc(nmemb, size);
+#endif
+  return _halloc(nmemb * size, 1);
+}
 
 // Reallocate a handle
 void *hrealloc(void *handle, size_t new_size) {
+#ifdef MALLOC_BYPASS
+  return ::realloc(handle, new_size);
+#endif
   // If the handle is null, then this call is equivalent to malloc(size)
   if (handle == NULL) return halloc(new_size);
 
@@ -71,6 +90,9 @@ void *hrealloc(void *handle, size_t new_size) {
 
 
 void hfree(void *ptr) {
+#ifdef MALLOC_BYPASS
+  return ::free(ptr);
+#endif
   // no-op if NULL is passed
   if (unlikely(ptr == NULL)) return;
 
@@ -86,4 +108,9 @@ void hfree(void *ptr) {
 
 
 
-size_t alaska_usable_size(void *ptr) { return get_tc()->get_size(ptr); }
+size_t alaska_usable_size(void *ptr) {
+#ifdef MALLOC_BYPASS
+  return ::malloc_usable_size(ptr);
+#endif
+  return get_tc()->get_size(ptr);
+}

runtime/yukon/yukon.cpp

@@ -37,6 +37,10 @@ static alaska::ThreadCache *tc = NULL;
 
 static void set_ht_addr(void *addr) {
   alaska::printf("set htbase to %p\n", addr);
+  uint64_t value = (uint64_t)addr;
+  if (value != 0 and getenv("YUKON_PHYS") != nullptr) {
+    value |= (1LU << 63);
+  }
   write_csr(0xc2, addr);
 }
 
@@ -107,6 +111,16 @@ static void handle_sig(int sig) {
 }
 
 
+static void segv_handler(int sig, siginfo_t *info, void *ucontext) {
+  printf("Caught segfault to address %p\n", info->si_addr);
+  void *buffer[BACKTRACE_SIZE];
+  // Get the backtrace
+  int nptrs = backtrace(buffer, BACKTRACE_SIZE);
+  // Print the backtrace symbols
+  backtrace_symbols_fd(buffer, nptrs, STDOUT_FILENO);
+  exit(0);
+}
+
 
 static void init(void) {
   setvbuf(stdout, stdout_buf, _IOLBF, BUFSIZ);
@@ -125,9 +139,14 @@ static void init(void) {
   asm volatile("fence" ::: "memory");
   set_ht_addr(handle_table_base);
 
+  struct sigaction act = {0};
+  act.sa_sigaction = segv_handler;
+  act.sa_flags = SA_SIGINFO;
+  sigaction(SIGSEGV, &act, NULL);
+
 
   signal(SIGABRT, handle_sig);
-  signal(SIGSEGV, handle_sig);
+  // signal(SIGSEGV, handle_sig);
   signal(SIGBUS, handle_sig);
   signal(SIGILL, handle_sig);
 }