Update implementation of OAGUnownedGraphContextRef

# Conflicts:
#	Sources/OpenGraphCxx/Graph/OGGraph.cpp
#	Sources/OpenGraphCxx/Graph/OGGraphContext.cpp
#	Sources/OpenGraphCxx/Graph/OGSubgraph.cpp
#	Sources/OpenGraphCxx/Graph/Subgraph.cpp
#	Sources/OpenGraphCxx/include/OpenGraph/OGGraph.h
#	Sources/OpenGraphCxx/include/OpenGraph/OGGraphContext.h
#	Sources/OpenGraphCxx/include/OpenGraph/OGSubgraph.h
#	Sources/OpenGraphCxx/include/OpenGraphCxx/Graph/Graph.hpp
#	Sources/OpenGraphCxx/include/OpenGraphCxx/Graph/Subgraph.hpp

Author: jcmosc

Sources/OpenAttributeGraph/Graph/Graph.swift

@@ -9,7 +9,7 @@ public import OpenAttributeGraphCxx
 
 extension Graph {
     public static func typeIndex(
-        ctx: GraphContext,
+        ctx: UnownedGraphContext,
         body: _AttributeBody.Type,
         valueType: Metadata,
         flags: _AttributeType.Flags,

Sources/OpenAttributeGraphCxx/Graph/OAGGraph.cpp

@@ -110,11 +110,11 @@ void OAGGraphSetContext(OAGGraphRef graph, const void * _Nullable context) {
     graph->context.set_context(context);
 }
 
-OAGGraphContextRef OAGGraphGetGraphContext(OAGGraphRef graph) {
+OAGUnownedGraphContextRef OAGGraphGetGraphContext(OAGGraphRef graph) {
     if (graph->context.isInvalid()) {
         OAG::precondition_failure("invalidated graph");
     }
-    return reinterpret_cast<OAGGraphContextRef>(reinterpret_cast<uintptr_t>(graph) + sizeof(CFRuntimeBase));
+    return reinterpret_cast<OAGUnownedGraphContextRef>(&graph->context.get_graph());
 }
 
 void OAGGraphInvalidate(OAGGraphRef graph) {

Sources/OpenAttributeGraphCxx/Graph/OAGGraphContext.cpp

@@ -5,6 +5,6 @@
 #include <OpenAttributeGraph/OAGGraphContext.h>
 #include <OpenAttributeGraph/Private/CFRuntime.h>
 
-OAGGraphRef OAGGraphContextGetGraph(OAGGraphContextRef context) {
+OAGGraphRef OAGGraphContextGetGraph(void *context) {
     return reinterpret_cast<OAGGraphRef>(reinterpret_cast<uintptr_t>(context) - sizeof(CFRuntimeBase));
 }

Sources/OpenAttributeGraphCxx/Graph/OAGSubgraph.cpp

@@ -95,12 +95,13 @@ void OAGSubgraphSetCurrent(_Nullable OAGSubgraphRef cf_subgraph) {
     }
 }
 
-OAGGraphContextRef OAGSubgraphGetCurrentGraphContext() {
+OAGUnownedGraphContextRef OAGSubgraphGetCurrentGraphContext() {
     OAG::Subgraph *subgraph = OAG::Subgraph::get_current();
     if (subgraph == nullptr) {
         return nullptr;
     }
-    return subgraph->get_context();
+    OAG::Graph &graph = subgraph->get_graph();
+    return reinterpret_cast<OAGUnownedGraphContextRef>(&graph);
 }
 
 void OAGSubgraphInvalidate(OAGSubgraphRef cf_subgraph) {
@@ -121,7 +122,8 @@ OAGGraphRef OAGSubgraphGetGraph(OAGSubgraphRef cf_subgraph) {
     if (cf_subgraph->subgraph == nullptr) {
         OAG::precondition_failure("accessing invalidated subgraph");
     }
-    return OAGGraphContextGetGraph(cf_subgraph->subgraph->get_context());
+    // TODO
+    return nullptr;
 }
 
 void OAGSubgraphAddChild(OAGSubgraphRef parent, OAGSubgraphRef child) {

Sources/OpenAttributeGraphCxx/Graph/Subgraph.cpp

@@ -23,9 +23,8 @@ void OAG::Subgraph::apply(OAGAttributeFlags flags, OAG::ClosureFunction<void, OA
     // TODO
 }
 
-OAG::Subgraph::Subgraph(OAG::SubgraphObject* cf_subgraph, OAG::Graph::Context& context, OAG::AttributeID):
-_cf_subgraph((OAGSubgraphRef)cf_subgraph), // FIXME
-_context((OAGGraphContextStorage &)context){
+OAG::Subgraph::Subgraph(OAG::SubgraphObject* object, OAG::Graph::Context& context, OAG::AttributeID):
+_object(object), _graph(context.get_graph()), _graph_context_id(context.get_id()) {
     // TODO
 }
 

Sources/OpenAttributeGraphCxx/include/OpenAttributeGraph/OAGGraph.h

@@ -13,11 +13,11 @@
 
 typedef struct OAG_BRIDGED_TYPE(id) OAGGraphStorage * OAGGraphRef OAG_SWIFT_NAME(Graph);
 typedef struct OAG_BRIDGED_TYPE(id) OAGSubgraphStorage * OAGSubgraphRef OAG_SWIFT_NAME(Subgraph);
-typedef struct OAG_BRIDGED_TYPE(id) OAGGraphContextStorage * OAGGraphContextRef OAG_SWIFT_NAME(GraphContext);
+typedef struct OAGGraphContextStorage * OAGUnownedGraphContextRef OAG_SWIFT_STRUCT OAG_SWIFT_NAME(UnownedGraphContext);
 
 struct OAGGraphStorage;
-struct OAGGraphContextStorage;
 struct OAGSubgraphStorage;
+struct OAGGraphContextStorage;
 
 typedef uint32_t OAGAttribute OAG_SWIFT_STRUCT OAG_SWIFT_NAME(AnyAttribute);
 
@@ -63,7 +63,7 @@ void OAGGraphSetContext(OAGGraphRef graph, const void * _Nullable context) OAG_S
 
 OAG_EXPORT
 OAG_REFINED_FOR_SWIFT
-OAGGraphContextRef OAGGraphGetGraphContext(OAGGraphRef graph) OAG_SWIFT_NAME(getter:OAGGraphRef.graphContext(self:));
+OAGUnownedGraphContextRef OAGGraphGetGraphContext(OAGGraphRef graph) OAG_SWIFT_NAME(getter:OAGGraphRef.graphContext(self:));
 
 OAG_EXPORT
 OAG_REFINED_FOR_SWIFT

Sources/OpenAttributeGraphCxx/include/OpenAttributeGraph/OAGGraphContext.h

@@ -18,7 +18,7 @@ OAG_EXTERN_C_BEGIN
 
 OAG_EXPORT
 OAG_REFINED_FOR_SWIFT
-OAGGraphRef OAGGraphContextGetGraph(OAGGraphContextRef context) OAG_SWIFT_NAME(getter:OAGGraphContextRef.graph(self:));
+OAGGraphRef OAGGraphContextGetGraph(void *context);
 
 OAG_EXTERN_C_END
 

Sources/OpenAttributeGraphCxx/include/OpenAttributeGraph/OAGSubgraph.h

@@ -42,7 +42,7 @@ void OAGSubgraphSetCurrent(_Nullable OAGSubgraphRef cf_subgraph) OAG_SWIFT_NAME(
 
 OAG_EXPORT
 OAG_REFINED_FOR_SWIFT
-_Nullable OAGGraphContextRef OAGSubgraphGetCurrentGraphContext(void) OAG_SWIFT_NAME(getter:OAGSubgraphRef.currentGraphContext());
+_Nullable OAGUnownedGraphContextRef OAGSubgraphGetCurrentGraphContext(void) OAG_SWIFT_NAME(getter:OAGSubgraphRef.currentGraphContext());
 
 OAG_EXPORT
 OAG_REFINED_FOR_SWIFT

Sources/OpenAttributeGraphCxx/include/OpenAttributeGraphCxx/Graph/Graph.hpp

@@ -64,6 +64,11 @@ class Graph final {
             _context = context;
         }
 
+        OAG_INLINE OAG_CONSTEXPR
+        OAGUniqueID get_id() OAG_NOEXCEPT {
+            return _id;
+        }
+        
         OAG_INLINE
         void set_invalidation_callback(ClosureFunction<void, OAGAttribute> invalidation_callback) OAG_NOEXCEPT {
             _invalidation_callback = invalidation_callback;
@@ -181,7 +186,7 @@ struct OAGGraphStorage {
 };
 
 struct OAGGraphContextStorage {
-    OAG::Graph::Context context;
+    OAG::Graph graph;
 };
 
 OAG_ASSUME_NONNULL_END

Sources/OpenAttributeGraphCxx/include/OpenAttributeGraphCxx/Graph/Subgraph.hpp

@@ -19,8 +19,9 @@ class SubgraphObject;
 
 class Subgraph final {
 private:
-    OAGSubgraphRef _cf_subgraph;
-    OAGGraphContextStorage& _context;
+    SubgraphObject *_Nullable _object;
+    Graph& _graph;
+    OAGUniqueID _graph_context_id;
     // TODO
     bool _isInvalid;
     static pthread_key_t _current_subgraph_key;
@@ -30,7 +31,7 @@ class Subgraph final {
     static Subgraph *from_cf(OAGSubgraphRef cf_subgraph) OAG_NOEXCEPT;
 
     OAGSubgraphRef to_cf() const OAG_NOEXCEPT {
-        return _cf_subgraph;
+        return reinterpret_cast<OAGSubgraphRef>(_object);
     }
 
     // MARK: - pthread related
@@ -75,13 +76,13 @@ class Subgraph final {
     // MARK: - Getter and setter
 
     OAG_INLINE OAG_CONSTEXPR
-    const OAGGraphContextRef get_context() const OAG_NOEXCEPT {
-        return &_context;
+    const OAG::Graph &get_graph() const OAG_NOEXCEPT {
+        return _graph;
     }
-    
+
     OAG_INLINE OAG_CONSTEXPR
-    OAGGraphContextRef get_context() OAG_NOEXCEPT {
-        return &_context;
+    OAG::Graph &get_graph() OAG_NOEXCEPT {
+        return _graph;
     }
 
     OAG_INLINE OAG_CONSTEXPR
@@ -98,7 +99,7 @@ class Subgraph final {
 
 struct OAGSubgraphStorage {
     CFRuntimeBase base;
-    OAG::Subgraph *subgraph;
+    OAG::Subgraph *_Nullable subgraph;
 };
 
 namespace OAG {