runtime: adjust some things to compile w/ barriers easier

Author: nickwanninger

CMakeLists.txt

@@ -26,12 +26,19 @@ function(alaska_option OPT DEFAULT)
   message(STATUS "${Purple}OPTION${ColorReset} ${OPT} ${Green}${${OPT}}${ColorReset}")
 endfunction()
 
+function(alaska_option_nodef OPT DEFAULT)
+  set(${OPT} ${DEFAULT} CACHE STRING "")
+  message(STATUS "${Purple}OPTION${ColorReset} ${OPT} ${Green}${${OPT}}${ColorReset}")
+endfunction()
+
 
 alaska_switch(ALASKA_ENABLE_COMPILER ON)
 alaska_switch(ALASKA_ENABLE_TESTING  ON)
+alaska_switch(ALASKA_CORE_ONLY       OFF)
 
 alaska_option(ALASKA_SIZE_BITS 24)
 alaska_option(CMAKE_BUILD_TYPE Release)
+alaska_option_nodef(ALASKA_ENABLE_COMPONENTS "compiler;compiler-rts")
 
 set(ALASKA_VERSION 2)
 
@@ -46,6 +53,19 @@ if(CMAKE_BUILD_TYPE STREQUAL "Debug")
 endif()
 
 
+
+list(FIND ALASKA_ENABLE_COMPONENTS "compiler" INDEX)
+if (NOT INDEX EQUAL -1)
+  message(STATUS "compiler")
+endif()
+
+
+list(FIND ALASKA_ENABLE_COMPONENTS "compiler-rts" INDEX)
+if (NOT INDEX EQUAL -1)
+  message(STATUS "compiler-rts")
+endif()
+
+
 # -------------------------------------------------------------------------------------------
 
 cmake_minimum_required(VERSION 3.13)
@@ -59,12 +79,6 @@ else()
   set(ALASKA_ENABLE_COMPILER FALSE)
 endif()
 
-
-# If we are building the core only, don't enable the compiler!
-if(ALASKA_CORE_ONLY)
-  set(ALASKA_ENABLE_COMPILER FALSE)
-endif()
-
 add_compile_definitions("ALASKA_INSTALL_PREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
 add_definitions(-include "${CMAKE_CURRENT_SOURCE_DIR}/runtime/include/alaska/config.h")
 

Makefile

@@ -33,7 +33,7 @@ sanity: alaska
 test: alaska
 	@build/runtime/alaska_test
 
-.PHONY: alaska all 
+.PHONY: alaska all
 
 # Run compilation unit tests to validate that the compiler can
 # handle all the funky control flow in the GCC test suite
@@ -49,6 +49,10 @@ clean:
 	[ -d $(BUILD) ] && make -C $(BUILD) clean
 	rm -f .*.o*
 
+mrproper:
+	rm -rf $(BUILD) .*.o*
+
+
 docker:
 	docker build -t alaska .
 	docker run -it --rm alaska bash

runtime/CMakeLists.txt

@@ -66,16 +66,14 @@ set(CORE_SOURCES
 )
 
 
-find_library(LIBUNWIND_LIBRARIES NAMES unwind )
-message(STATUS "UNWIND: ${LIBUNWIND_LIBRARIES}")
 
-add_library(alaska_core STATIC ${CORE_SOURCES})
+add_library(alaska_core SHARED ${CORE_SOURCES})
 
 target_compile_options(alaska_core PRIVATE $<$<COMPILE_LANGUAGE:CXX>:-nostdlib++ -nostdinc++>)
 
 set_target_properties(alaska_core PROPERTIES LINKER_LANGUAGE C)
 set_target_properties(alaska_core PROPERTIES SOVERSION ${ALASKA_VERSION})
-target_link_libraries(alaska_core ${LIBUNWIND_LIBRARIES})
+# target_link_libraries(alaska_core ${LIBUNWIND_LIBRARIES})
 
 set_property(TARGET alaska_core PROPERTY POSITION_INDEPENDENT_CODE ON)
 target_link_libraries(alaska_core dl pthread)
@@ -99,6 +97,8 @@ install(
 # This defines the runtime that compiled code is linked against
 if(NOT ALASKA_CORE_ONLY) # -----------------------------------------------------------------------------------
 
+  find_library(LIBUNWIND_LIBRARIES NAMES unwind )
+  message(STATUS "UNWIND: ${LIBUNWIND_LIBRARIES}")
 
   add_library(alaska SHARED
     rt/init.cpp

runtime/core/HandleTable.cpp

@@ -8,6 +8,9 @@
  * This is free software.  You are permitted to use, redistribute,
  * and modify it as specified in the file "LICENSE".
  */
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
 
 
 #include <alaska/HandleTable.hpp>

runtime/core/Runtime.cpp

@@ -17,21 +17,16 @@
 #include <stdlib.h>
 
 namespace alaska {
-
-
-  struct NopBarrierManager final : public alaska::BarrierManager {
-    ~NopBarrierManager() override = default;
-    void begin(void) override {}
-    void end(void) override {}
-  };
-
-  static NopBarrierManager global_nop_barrier_manager;
-
+  // The default instance of a barrier manager.
+  static BarrierManager global_nop_barrier_manager;
+  // The current global instance of the runtime, since we can only have one at a time
   static Runtime *g_runtime = nullptr;
 
 
   Runtime::Runtime() {
+    // Validate that there is not already a runtime (TODO: atomics?)
     ALASKA_ASSERT(g_runtime == nullptr, "Cannot create more than one runtime");
+    // Assign the global runtime to be this instance
     g_runtime = this;
     // Attach a default barrier manager
     this->barrier_manager = &global_nop_barrier_manager;
@@ -41,6 +36,7 @@ namespace alaska {
 
   Runtime::~Runtime() {
     log_debug("Destroying Alaska Runtime");
+    // Unset the global instance so another runtime can be allocated
     g_runtime = nullptr;
   }
 

runtime/include/alaska/BarrierManager.hpp

@@ -1,5 +1,6 @@
 #pragma once
 
+#include <alaska/alaska.hpp>
 
 
 namespace alaska {
@@ -16,12 +17,12 @@ namespace alaska {
   // The only requirement of this class is that when `::begin()` returns, all pinned handles must
   // be marked as such, and when `::end()` returns they should be released. The core runtime relies
   // on this to be the case for safe operation. If the user of the core runtime does not need to
-    // pin any handles, the barrier does not need to do anything.
-  struct BarrierManager {
+  // pin any handles, the barrier does not need to do anything.
+  struct BarrierManager : public alaska::InternalHeapAllocated {
     virtual ~BarrierManager() = default;
-    virtual void begin(void) = 0;
-    virtual void end(void) = 0;
+    virtual void begin(void){};
+    virtual void end(void){};
 
     unsigned long barrier_count = 0;
   };
-}
+}  // namespace alaska

runtime/include/alaska/alaska.hpp

@@ -14,6 +14,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
+#include <sys/types.h>
 #include <alaska/utils.h>
 #include <alaska/list_head.h>
 #include <alaska/liballoc.h>

runtime/rt/init.cpp

@@ -26,7 +26,7 @@
 static alaska::Runtime *the_runtime = nullptr;
 
 
-struct CompilerRuntimeBarrierManager final : public alaska::BarrierManager {
+struct CompilerRuntimeBarrierManager : public alaska::BarrierManager {
   ~CompilerRuntimeBarrierManager() override = default;
   void begin(void) override { alaska::barrier::begin(); }
   void end(void) override { alaska::barrier::end(); }