Update to dynamic framework

Author: Kyle-Ye

Package.swift

@@ -159,9 +159,8 @@ let openGraphSPICompatibilityTestTarget = Target.testTarget(
 let package = Package(
     name: "OpenGraph",
     products: [
-        .library(name: "OpenGraph_SPI", targets: ["OpenGraph_SPI"]),
-        .library(name: "OpenGraph", targets: ["OpenGraph"]),
-        .library(name: "OpenGraphShims", targets: ["OpenGraphShims"]),
+        .library(name: "OpenGraph", type: .dynamic, targets: ["OpenGraph", "OpenGraph_SPI"]),
+        .library(name: "OpenGraphShims", type: .dynamic, targets: ["OpenGraph", "OpenGraph_SPI", "OpenGraphShims"]),
     ],
     dependencies: [
         .package(url: "https://github.com/apple/swift-numerics", from: "1.0.2"),

Sources/OpenGraph_SPI/Data/ptr.hpp

@@ -38,15 +38,15 @@ template <typename T> class ptr {
 
     OG_INLINE OG_CONSTEXPR
     void assert_valid() const {
-        if (_offset >= table::shared().data_capacity()) {
+        if (_offset >= shared_table().data_capacity()) {
             precondition_failure("invalid data offset: %u", _offset);
         }
     }
 
     OG_INLINE OG_CONSTEXPR
     element_type *_Nonnull get() const OG_NOEXCEPT {
         assert(_offset != 0);
-        return reinterpret_cast<element_type *>(table::shared().data_base() + _offset);
+        return reinterpret_cast<element_type *>(shared_table().data_base() + _offset);
     }
 
     OG_INLINE OG_CONSTEXPR

Sources/OpenGraph_SPI/Data/table.cpp

@@ -18,21 +18,16 @@ void *OGGraphVMRegionBaseAddress;
 namespace OG {
 namespace data {
 
-uint8_t _shared_table_bytes[sizeof(table) / sizeof(uint8_t)] = {};
-
 malloc_zone_t *_Nullable _malloc_zone;
 
 table &table::ensure_shared() {
     static dispatch_once_t once;
     dispatch_once_f(&once, nullptr, [](void *_Nullable context){
          new (_shared_table_bytes) table();
     });
-    return shared();
+    return shared_table();
 }
 
-table &table::shared() { return *reinterpret_cast<data::table *>(&_shared_table_bytes); }
-
-// FIXME
 table::table() {
     constexpr vm_size_t initial_size = 32 * pages_per_map * page_size;
     _region_capacity = initial_size;

Sources/OpenGraph_SPI/Data/table.hpp

@@ -24,7 +24,6 @@ class table {
 
 public:
     static table &ensure_shared();
-    static table &shared();
 
     OG_INLINE OG_CONSTEXPR
     vm_address_t data_base() const OG_NOEXCEPT { return _data_base; };
@@ -98,9 +97,15 @@ class table {
     using page_map_type = std::bitset<pages_per_map>;
     vector<page_map_type, 0, uint32_t> _page_maps = {};
     vector<page_map_type, 0, uint32_t> _page_metadata_maps = {};
-
 }; /* table */
 
+static uint8_t _shared_table_bytes[sizeof(table) / sizeof(uint8_t)] = {};
+
+OG_INLINE
+static table &shared_table() {
+    return *reinterpret_cast<data::table *>(&_shared_table_bytes);
+}
+
 } /* data */
 } /* OG */
 

Sources/OpenGraph_SPI/Data/zone.cpp

@@ -11,13 +11,13 @@ namespace OG {
 namespace data {
 
 void zone::clear() OG_NOEXCEPT {
-    table::shared().lock();
+    shared_table().lock();
     while (last_page()) {
         auto page = last_page();
         _last_page = page->previous;
-        table::shared().dealloc_page_locked(page);
+        shared_table().dealloc_page_locked(page);
     }
-    table::shared().unlock();
+    shared_table().unlock();
 }
 
 ptr<void> zone::alloc_slow(uint32_t size, uint32_t alignment_mask) OG_NOEXCEPT {
@@ -41,12 +41,12 @@ ptr<void> zone::alloc_slow(uint32_t size, uint32_t alignment_mask) OG_NOEXCEPT {
 
     ptr<page> new_page;
     if (size <= page_size / 2) {
-        new_page = table::shared().alloc_page(this, page_size);
+        new_page = shared_table().alloc_page(this, page_size);
         new_page->previous = _last_page;
         _last_page = new_page;
     } else {
         uint32_t aligned_size = ((sizeof(page) + size) + alignment_mask) & ~alignment_mask;
-        new_page = table::shared().alloc_page(this, aligned_size);
+        new_page = shared_table().alloc_page(this, aligned_size);
         if (_last_page) {
             // It's less likely we will be able to alloc unused bytes from this page,
             // so insert it before the last page.