Update modulemap.private and Data part (#148)

Author: Kyle-Ye

Sources/OpenGraphCxx/Attribute/OGAttribute.cpp

@@ -4,7 +4,7 @@
 
 #include <OpenGraph/OGAttribute.h>
 #include <OpenGraphCxx/Attribute/AttributeID.hpp>
-#include <OpenGraphCxx/Util/assert.hpp>
+#include <OpenGraphCxx/Misc/assert.hpp>
 #include <optional>
 
 const OGAttribute OGAttributeNil = OGAttribute(OG::AttributeID::Kind::Null);

Sources/OpenGraphCxx/Data/table.cpp

@@ -2,15 +2,15 @@
 //  table.cpp
 //  OpenGraphCxx
 //
-//  Audited for 6.5.4
+//  Audited for 6.5.1
 //  Status: WIP
 //  Modified based Compute code
 
 #include <OpenGraphCxx/Data/table.hpp>
 #include <OpenGraphCxx/Data/page.hpp>
 #include <OpenGraphCxx/Data/page_const.hpp>
 #include <OpenGraphCxx/Data/zone.hpp>
-#include <OpenGraphCxx/Util/assert.hpp>
+#include <OpenGraphCxx/Misc/assert.hpp>
 #include <sys/mman.h>
 #include <dispatch/dispatch.h>
 #if OG_TARGET_OS_DARWIN
@@ -29,7 +29,7 @@ namespace OG {
 namespace data {
 
 #if OG_TARGET_OS_DARWIN
-malloc_zone_t *_Nullable _malloc_zone;
+malloc_zone_t *table::_malloc_zone = nullptr;
 #endif
 
 table &table::ensure_shared() {
@@ -242,9 +242,9 @@ void table::dealloc_page_locked(ptr<page> page) OG_NOEXCEPT {
     }
 }
 
-// TO BE AUDITED
-uint64_t table::raw_page_seed(ptr<page> page) OG_NOEXCEPT {
-    page.assert_valid(_data_capacity);
+OG_CONSTEXPR
+uint64_t table::raw_page_seed(ptr<page> page) const OG_NOEXCEPT {
+    assert_valid(page);
     lock();
     uint32_t page_index = page.page_index();
     uint32_t map_index = page_index / pages_per_map;
@@ -255,8 +255,8 @@ uint64_t table::raw_page_seed(ptr<page> page) OG_NOEXCEPT {
     if (map_index < _page_metadata_maps.size() && _page_metadata_maps[map_index].test(page_index % page_size)) {
         auto info = page->zone->info();
         // FIXME
-        w22 = info.to_raw_value() & 0xffffff00;
-        w21 = info.to_raw_value() & 0x000000ff;
+        w22 = info.value() & 0xffffff00;
+        w21 = info.value() & 0x000000ff;
         result = uint64_t(1) << 32;
     }
     unlock();
@@ -267,9 +267,9 @@ void table::print() const OG_NOEXCEPT {
     lock();
     fprintf(stderr, "data::table %p:\n  %.2fKB allocated, %.2fKB used, %.2fKB reusable.\n",
             this,
-            double(_region_capacity - page_size) / 1024.0,
+            double(region_capacity() - page_size) / 1024.0,
             double(this->used_pages_num()) / 1024.0,
-            double(_reusable_pages_num) / 1024.0);
+            double(reusable_pages_num()) / 1024.0);
     unlock();
 }
 

Sources/OpenGraphCxx/Data/zone.cpp

@@ -5,7 +5,7 @@
 #include <OpenGraphCxx/Data/zone.hpp>
 #include <OpenGraphCxx/Data/table.hpp>
 #include <OpenGraphCxx/Data/page.hpp>
-#include <OpenGraphCxx/Util/assert.hpp>
+#include <OpenGraphCxx/Misc/assert.hpp>
 #if OG_TARGET_OS_DARWIN
 #include <malloc/malloc.h>
 #else
@@ -15,7 +15,17 @@
 namespace OG {
 namespace data {
 
-void zone::clear() OG_NOEXCEPT {
+//zone::zone() : _info(info(shared_table().make_zone_id())) {}
+
+//zone::~zone() {
+//    clear();
+//
+//}
+
+void zone::clear() {
+//    for (auto &element : malloc_buffers()) {
+//        element.reset();
+//    }
     shared_table().lock();
     while (last_page()) {
         auto page = last_page();
@@ -121,7 +131,7 @@ void zone::print() const OG_NOEXCEPT {
     );
 }
 
-void zone::print_header() OG_NOEXCEPT {
+void zone::print_header() const OG_NOEXCEPT {
     fprintf(stderr, "Zones\n%-16s %6s %8s %8s    %6s %6s     %6s %8s\n",
             "zone ptr", "pages", "total", "in-use", "free", "bytes", "malloc", "total");
 }

Sources/OpenGraphCxx/DebugServer/og-debug-server.mm

@@ -8,8 +8,8 @@
 #if OG_TARGET_OS_DARWIN
 
 #include <OpenGraph/OGGraphDescription.h>
-#include <OpenGraphCxx/Util/log.hpp>
-#include <OpenGraphCxx/Util/assert.hpp>
+#include <OpenGraphCxx/Misc/log.hpp>
+#include <OpenGraphCxx/Misc/assert.hpp>
 #include <OpenGraphCxx/Graph/Graph.hpp>
 
 #include <iostream>

Sources/OpenGraphCxx/Graph/GraphContext.cpp

@@ -4,7 +4,7 @@
 
 #include <OpenGraphCxx/Graph/Graph.hpp>
 #include <OpenGraph/OGGraph.h>
-#include <OpenGraphCxx/Util/assert.hpp>
+#include <OpenGraphCxx/Misc/assert.hpp>
 
 OG::Graph::Context &OG::Graph::Context::from_cf(OGGraphRef storage) OG_NOEXCEPT {
     if (storage->context.isInvalid()) {

Sources/OpenGraphCxx/Graph/GraphDescription.cpp

@@ -5,7 +5,7 @@
 #include <OpenGraph/OGGraphDescription.h>
 #include <OpenGraph/OGGraph.h>
 #include <OpenGraphCxx/Graph/Graph.hpp>
-#include <OpenGraphCxx/Util/assert.hpp>
+#include <OpenGraphCxx/Misc/assert.hpp>
 
 CFTypeRef OGGraphDescription(OGGraphRef graph, CFDictionaryRef options) {
     #if OG_OBJC_FOUNDATION

Sources/OpenGraphCxx/Graph/GraphDescription.mm

@@ -5,7 +5,7 @@
 #include <OpenGraph/OGGraphDescription.h>
 #include <OpenGraph/OGGraph.h>
 #include <OpenGraphCxx/Graph/Graph.hpp>
-#include <OpenGraphCxx/Util/assert.hpp>
+#include <OpenGraphCxx/Misc/assert.hpp>
 
 #if OG_OBJC_FOUNDATION
 

Sources/OpenGraphCxx/Graph/OGGraph.cpp

@@ -4,7 +4,7 @@
 
 #include <OpenGraph/OGGraph.h>
 #include <OpenGraphCxx/Graph/Graph.hpp>
-#include <OpenGraphCxx/Util/assert.hpp>
+#include <OpenGraphCxx/Misc/assert.hpp>
 #include <OpenGraphCxx/Data/ClosureFunction.hpp>
 #include <pthread.h>
 

Sources/OpenGraphCxx/Graph/OGSubgraph.cpp

@@ -6,8 +6,8 @@
 #include <OpenGraph/OGGraph.h>
 #include <OpenGraphCxx/Graph/Subgraph.hpp>
 #include <OpenGraph/OGGraphContext.h>
-#include <OpenGraphCxx/Util/assert.hpp>
-#include <OpenGraphCxx/Util/env.hpp>
+#include <OpenGraphCxx/Misc/assert.hpp>
+#include <OpenGraphCxx/Misc/env.hpp>
 #include <pthread.h>
 #if !OG_TARGET_OS_WASI
 #include <dispatch/dispatch.h>

Sources/OpenGraphCxx/Util/assert.cpp Sources/OpenGraphCxx/Misc/assert.cppSources/OpenGraphCxx/Util/assert.cpp renamed to Sources/OpenGraphCxx/Misc/assert.cpp

@@ -2,8 +2,8 @@
 //  assert.cpp
 //  OpenGraphCxx
 
-#include <OpenGraphCxx/Util/assert.hpp>
-#include <OpenGraphCxx/Util/log.hpp>
+#include <OpenGraphCxx/Misc/assert.hpp>
+#include <OpenGraphCxx/Misc/log.hpp>
 
 #include <stdio.h>
 #include <stdlib.h>