OpenSwiftUIProject · Kyle-Ye · Apr 4, 2024 · Apr 4, 2024 · Apr 4, 2024 · Apr 4, 2024
diff --git a/AG/AttributeGraph.xcframework/ios-arm64-arm64e/AttributeGraph.framework/Headers/AGSubgraph.h b/AG/AttributeGraph.xcframework/ios-arm64-arm64e/AttributeGraph.framework/Headers/AGSubgraph.h
@@ -82,6 +82,26 @@ AGUniqueID AGSubgraphAddObserver(AGSubgraphRef cf_subgraph,
                            const void (*function)(const void * _Nullable context AG_SWIFT_CONTEXT) AG_SWIFT_CC(swift),
                            const void * _Nullable context);
 
+AG_EXPORT
+AG_REFINED_FOR_SWIFT
+bool AGSubgraphShouldRecordTree(void) AG_SWIFT_NAME(getter:AGSubgraphRef.shouldRecordTree());
+
+AG_EXPORT
+AG_REFINED_FOR_SWIFT
+void AGSubgraphSetShouldRecordTree(void) AG_SWIFT_NAME(AGSubgraphRef.setShouldRecordTree());
+
+AG_EXPORT
+AG_REFINED_FOR_SWIFT
+void AGSubgraphBeginTreeElement(AGAttribute attribute, AGTypeID type, uint32_t flags);
+
+AG_EXPORT
+AG_REFINED_FOR_SWIFT
+void AGSubgraphAddTreeValue(AGAttribute attribute, AGTypeID type, const char * key, uint32_t flags);
+
+AG_EXPORT
+AG_REFINED_FOR_SWIFT
+void AGSubgraphEndTreeElement(AGAttribute attribute);
+
 AG_EXTERN_C_END
 
 AG_ASSUME_NONNULL_END

diff --git a/...ttributeGraph.framework/Modules/AttributeGraph.swiftmodule/arm64-apple-ios.swiftinterface b/...ttributeGraph.framework/Modules/AttributeGraph.swiftmodule/arm64-apple-ios.swiftinterface
@@ -403,6 +403,12 @@ extension AttributeGraph.AGSubgraph {
 	public func forEach(_ flags: AGAttributeFlags, _ callback: (AGAttribute) -> Void)
 }
 
+extension AttributeGraph.AGSubgraph {
+	public static func beginTreeElement<Value>(value: AttributeGraph.Attribute<Value>, flags: Swift.UInt32)
+	public static func endTreeElement<Value>(value: AttributeGraph.Attribute<Value>)
+	public static func addTreeValue<Value>(_ value: AttributeGraph.Attribute<Value>, forKey key: Swift.UnsafePointer<Int8>, flags: Swift.UInt32)
+}
+
 // MARK: - Rule Related
 
 // MARK: - Rule

diff --git a/...tributeGraph.framework/Modules/AttributeGraph.swiftmodule/arm64e-apple-ios.swiftinterface b/...tributeGraph.framework/Modules/AttributeGraph.swiftmodule/arm64e-apple-ios.swiftinterface
@@ -403,6 +403,12 @@ extension AttributeGraph.AGSubgraph {
 	public func forEach(_ flags: AGAttributeFlags, _ callback: (AGAttribute) -> Void)
 }
 
+extension AttributeGraph.AGSubgraph {
+	public static func beginTreeElement<Value>(value: AttributeGraph.Attribute<Value>, flags: Swift.UInt32)
+	public static func endTreeElement<Value>(value: AttributeGraph.Attribute<Value>)
+	public static func addTreeValue<Value>(_ value: AttributeGraph.Attribute<Value>, forKey key: Swift.UnsafePointer<Int8>, flags: Swift.UInt32)
+}
+
 // MARK: - Rule Related
 
 // MARK: - Rule

diff --git a/...raph.xcframework/ios-arm64-x86_64-simulator/AttributeGraph.framework/Headers/AGSubgraph.h b/...raph.xcframework/ios-arm64-x86_64-simulator/AttributeGraph.framework/Headers/AGSubgraph.h
@@ -82,6 +82,26 @@ AGUniqueID AGSubgraphAddObserver(AGSubgraphRef cf_subgraph,
                            const void (*function)(const void * _Nullable context AG_SWIFT_CONTEXT) AG_SWIFT_CC(swift),
                            const void * _Nullable context);
 
+AG_EXPORT
+AG_REFINED_FOR_SWIFT
+bool AGSubgraphShouldRecordTree(void) AG_SWIFT_NAME(getter:AGSubgraphRef.shouldRecordTree());
+
+AG_EXPORT
+AG_REFINED_FOR_SWIFT
+void AGSubgraphSetShouldRecordTree(void) AG_SWIFT_NAME(AGSubgraphRef.setShouldRecordTree());
+
+AG_EXPORT
+AG_REFINED_FOR_SWIFT
+void AGSubgraphBeginTreeElement(AGAttribute attribute, AGTypeID type, uint32_t flags);
+
+AG_EXPORT
+AG_REFINED_FOR_SWIFT
+void AGSubgraphAddTreeValue(AGAttribute attribute, AGTypeID type, const char * key, uint32_t flags);
+
+AG_EXPORT
+AG_REFINED_FOR_SWIFT
+void AGSubgraphEndTreeElement(AGAttribute attribute);
+
 AG_EXTERN_C_END
 
 AG_ASSUME_NONNULL_END

diff --git a/...aph.framework/Modules/AttributeGraph.swiftmodule/arm64-apple-ios-simulator.swiftinterface b/...aph.framework/Modules/AttributeGraph.swiftmodule/arm64-apple-ios-simulator.swiftinterface
@@ -403,6 +403,12 @@ extension AttributeGraph.AGSubgraph {
 	public func forEach(_ flags: AGAttributeFlags, _ callback: (AGAttribute) -> Void)
 }
 
+extension AttributeGraph.AGSubgraph {
+	public static func beginTreeElement<Value>(value: AttributeGraph.Attribute<Value>, flags: Swift.UInt32)
+	public static func endTreeElement<Value>(value: AttributeGraph.Attribute<Value>)
+	public static func addTreeValue<Value>(_ value: AttributeGraph.Attribute<Value>, forKey key: Swift.UnsafePointer<Int8>, flags: Swift.UInt32)
+}
+
 // MARK: - Rule Related
 
 // MARK: - Rule

diff --git a/...ph.framework/Modules/AttributeGraph.swiftmodule/x86_64-apple-ios-simulator.swiftinterface b/...ph.framework/Modules/AttributeGraph.swiftmodule/x86_64-apple-ios-simulator.swiftinterface
@@ -403,6 +403,12 @@ extension AttributeGraph.AGSubgraph {
 	public func forEach(_ flags: AGAttributeFlags, _ callback: (AGAttribute) -> Void)
 }
 
+extension AttributeGraph.AGSubgraph {
+	public static func beginTreeElement<Value>(value: AttributeGraph.Attribute<Value>, flags: Swift.UInt32)
+	public static func endTreeElement<Value>(value: AttributeGraph.Attribute<Value>)
+	public static func addTreeValue<Value>(_ value: AttributeGraph.Attribute<Value>, forKey key: Swift.UnsafePointer<Int8>, flags: Swift.UInt32)
+}
+
 // MARK: - Rule Related
 
 // MARK: - Rule

diff --git a/...Graph.xcframework/macos-arm64e-arm64-x86_64/AttributeGraph.framework/Headers/AGSubgraph.h b/...Graph.xcframework/macos-arm64e-arm64-x86_64/AttributeGraph.framework/Headers/AGSubgraph.h
@@ -82,6 +82,26 @@ AGUniqueID AGSubgraphAddObserver(AGSubgraphRef cf_subgraph,
                            const void (*function)(const void * _Nullable context AG_SWIFT_CONTEXT) AG_SWIFT_CC(swift),
                            const void * _Nullable context);
 
+AG_EXPORT
+AG_REFINED_FOR_SWIFT
+bool AGSubgraphShouldRecordTree(void) AG_SWIFT_NAME(getter:AGSubgraphRef.shouldRecordTree());
+
+AG_EXPORT
+AG_REFINED_FOR_SWIFT
+void AGSubgraphSetShouldRecordTree(void) AG_SWIFT_NAME(AGSubgraphRef.setShouldRecordTree());
+
+AG_EXPORT
+AG_REFINED_FOR_SWIFT
+void AGSubgraphBeginTreeElement(AGAttribute attribute, AGTypeID type, uint32_t flags);
+
+AG_EXPORT
+AG_REFINED_FOR_SWIFT
+void AGSubgraphAddTreeValue(AGAttribute attribute, AGTypeID type, const char * key, uint32_t flags);
+
+AG_EXPORT
+AG_REFINED_FOR_SWIFT
+void AGSubgraphEndTreeElement(AGAttribute attribute);
+
 AG_EXTERN_C_END
 
 AG_ASSUME_NONNULL_END

diff --git a/...ributeGraph.framework/Modules/AttributeGraph.swiftmodule/arm64-apple-macos.swiftinterface b/...ributeGraph.framework/Modules/AttributeGraph.swiftmodule/arm64-apple-macos.swiftinterface
@@ -403,6 +403,12 @@ extension AttributeGraph.AGSubgraph {
 	public func forEach(_ flags: AGAttributeFlags, _ callback: (AGAttribute) -> Void)
 }
 
+extension AttributeGraph.AGSubgraph {
+	public static func beginTreeElement<Value>(value: AttributeGraph.Attribute<Value>, flags: Swift.UInt32)
+	public static func endTreeElement<Value>(value: AttributeGraph.Attribute<Value>)
+	public static func addTreeValue<Value>(_ value: AttributeGraph.Attribute<Value>, forKey key: Swift.UnsafePointer<Int8>, flags: Swift.UInt32)
+}
+
 // MARK: - Rule Related
 
 // MARK: - Rule

diff --git a/...ibuteGraph.framework/Modules/AttributeGraph.swiftmodule/arm64e-apple-macos.swiftinterface b/...ibuteGraph.framework/Modules/AttributeGraph.swiftmodule/arm64e-apple-macos.swiftinterface
@@ -403,6 +403,12 @@ extension AttributeGraph.AGSubgraph {
 	public func forEach(_ flags: AGAttributeFlags, _ callback: (AGAttribute) -> Void)
 }
 
+extension AttributeGraph.AGSubgraph {
+	public static func beginTreeElement<Value>(value: AttributeGraph.Attribute<Value>, flags: Swift.UInt32)
+	public static func endTreeElement<Value>(value: AttributeGraph.Attribute<Value>)
+	public static func addTreeValue<Value>(_ value: AttributeGraph.Attribute<Value>, forKey key: Swift.UnsafePointer<Int8>, flags: Swift.UInt32)
+}
+
 // MARK: - Rule Related
 
 // MARK: - Rule

diff --git a/...ibuteGraph.framework/Modules/AttributeGraph.swiftmodule/x86_64-apple-macos.swiftinterface b/...ibuteGraph.framework/Modules/AttributeGraph.swiftmodule/x86_64-apple-macos.swiftinterface
@@ -403,6 +403,12 @@ extension AttributeGraph.AGSubgraph {
 	public func forEach(_ flags: AGAttributeFlags, _ callback: (AGAttribute) -> Void)
 }
 
+extension AttributeGraph.AGSubgraph {
+	public static func beginTreeElement<Value>(value: AttributeGraph.Attribute<Value>, flags: Swift.UInt32)
+	public static func endTreeElement<Value>(value: AttributeGraph.Attribute<Value>)
+	public static func addTreeValue<Value>(_ value: AttributeGraph.Attribute<Value>, forKey key: Swift.UnsafePointer<Int8>, flags: Swift.UInt32)
+}
+
 // MARK: - Rule Related
 
 // MARK: - Rule

diff --git a/AG/Sources/Headers/AGSubgraph.h b/AG/Sources/Headers/AGSubgraph.h
@@ -82,6 +82,26 @@ AGUniqueID AGSubgraphAddObserver(AGSubgraphRef cf_subgraph,
                            const void (*function)(const void * _Nullable context AG_SWIFT_CONTEXT) AG_SWIFT_CC(swift),
                            const void * _Nullable context);
 
+AG_EXPORT
+AG_REFINED_FOR_SWIFT
+bool AGSubgraphShouldRecordTree(void) AG_SWIFT_NAME(getter:AGSubgraphRef.shouldRecordTree());
+
+AG_EXPORT
+AG_REFINED_FOR_SWIFT
+void AGSubgraphSetShouldRecordTree(void) AG_SWIFT_NAME(AGSubgraphRef.setShouldRecordTree());
+
+AG_EXPORT
+AG_REFINED_FOR_SWIFT
+void AGSubgraphBeginTreeElement(AGAttribute attribute, AGTypeID type, uint32_t flags);
+
+AG_EXPORT
+AG_REFINED_FOR_SWIFT
+void AGSubgraphAddTreeValue(AGAttribute attribute, AGTypeID type, const char * key, uint32_t flags);
+
+AG_EXPORT
+AG_REFINED_FOR_SWIFT
+void AGSubgraphEndTreeElement(AGAttribute attribute);
+
 AG_EXTERN_C_END
 
 AG_ASSUME_NONNULL_END

diff --git a/AG/Sources/Modules/AttributeGraph.swiftmodule/template.swiftinterface b/AG/Sources/Modules/AttributeGraph.swiftmodule/template.swiftinterface
@@ -399,6 +399,12 @@ extension AttributeGraph.AGSubgraph {
 	public func forEach(_ flags: AGAttributeFlags, _ callback: (AGAttribute) -> Void)
 }
 
+extension AttributeGraph.AGSubgraph {
+	public static func beginTreeElement<Value>(value: AttributeGraph.Attribute<Value>, flags: Swift.UInt32)
+	public static func endTreeElement<Value>(value: AttributeGraph.Attribute<Value>)
+	public static func addTreeValue<Value>(_ value: AttributeGraph.Attribute<Value>, forKey key: Swift.UnsafePointer<Int8>, flags: Swift.UInt32)
+}
+
 // MARK: - Rule Related
 
 // MARK: - Rule

diff --git a/Sources/OpenGraph/Graph/OGSubgraph.swift b/Sources/OpenGraph/Graph/OGSubgraph.swift
@@ -30,17 +30,25 @@ extension OGSubgraph {
     public func forEach(_ flags: OGAttributeFlags, _ callback: (OGAttribute) -> Void) {
         OGSubgraph.apply(self, flags: flags, callback: callback)
     }
-
-    /*public*/ static func beginTreeElement<A>(value _: Attribute<A>, flags _: UInt32) {
-        fatalError("TODO")
+}
+
+extension OGSubgraph {
+    public static func beginTreeElement<Value>(value: Attribute<Value>, flags: UInt32) {
+        if shouldRecordTree {
+            __OGSubgraphBeginTreeElement(value.identifier, OGTypeID(Value.self), flags)
+        }
     }
 
-    /*public*/ static func addTreeValue<A>(_: Attribute<A>, forKey _: UnsafePointer<Int8>, flags _: UInt32) {
-        fatalError("TODO")
+    public static func addTreeValue<Value>(_ value: Attribute<Value>, forKey key: UnsafePointer<Int8>, flags: UInt32) {
+        if shouldRecordTree {
+            __OGSubgraphAddTreeValue(value.identifier, OGTypeID(Value.self), key, flags)
+        }
     }
 
-    /*public*/ static func endTreeElement<A>(value _: Attribute<A>) {
-        fatalError("TODO")
+    public static func endTreeElement<Value>(value: Attribute<Value>) {
+        if shouldRecordTree {
+            __OGSubgraphEndTreeElement(value.identifier)
+        }
     }
 }
 

diff --git a/Sources/_OpenGraph/Graph/OGSubgraph.cpp b/Sources/_OpenGraph/Graph/OGSubgraph.cpp
@@ -8,9 +8,13 @@
 #include "OGSubgraph.h"
 #include "OGGraph.h"
 #include "Subgraph.hpp"
+#include "OGGraphContext.h"
 #include "../Util/assert.hpp"
+#include "../Util/env.hpp"
 #include <pthread.h>
-#include "OGGraphContext.h"
+#if !OG_TARGET_OS_WASI
+#include <dispatch/dispatch.h>
+#endif
 
 namespace {
 CFRuntimeClass &subgraph_type_id() {
@@ -68,33 +72,34 @@ OGSubgraphRef OGSubgraphCreate2(OGGraphRef cf_graph, OGAttribute attribute) {
 }
 
 _Nullable OGSubgraphRef OGSubgraphGetCurrent() {
-    OG::Subgraph* subgraph = (OG::Subgraph*)pthread_getspecific(OG::Subgraph::current_key());
+    OG::Subgraph *subgraph = OG::Subgraph::get_current();
     if (subgraph == nullptr) {
         return nullptr;
     }
     return subgraph->to_cf();
 }
 
 void OGSubgraphSetCurrent(_Nullable OGSubgraphRef cf_subgraph) {
-    OG::Subgraph* oldSubgraph = (OG::Subgraph*)pthread_getspecific(OG::Subgraph::current_key());
+    OG::Subgraph *old_subgraph = OG::Subgraph::get_current();
     if (cf_subgraph == nullptr) {
-        pthread_setspecific(OG::Subgraph::current_key(), nullptr);
+        OG::Subgraph::set_current(nullptr);
     } else {
-        pthread_setspecific(OG::Subgraph::current_key(), cf_subgraph->subgraph);
-        if (cf_subgraph->subgraph != nullptr) {
+        OG::Subgraph *subgraph = cf_subgraph->subgraph;
+        OG::Subgraph::set_current(subgraph);
+        if (subgraph != nullptr) {
             CFRetain(cf_subgraph);
         }
     }
-    if (oldSubgraph != nullptr) {
-        OGSubgraphRef cf_oldSubgraph = oldSubgraph->to_cf();
-        if (cf_oldSubgraph) {
-            CFRelease(cf_oldSubgraph);
+    if (old_subgraph != nullptr) {
+        OGSubgraphRef old_cf_Subgraph = old_subgraph->to_cf();
+        if (old_cf_Subgraph) {
+            CFRelease(old_cf_Subgraph);
         }
     }
 }
 
 OGGraphContextRef OGSubgraphGetCurrentGraphContext() {
-    OG::Subgraph* subgraph = (OG::Subgraph*)pthread_getspecific(OG::Subgraph::current_key());
+    OG::Subgraph *subgraph = OG::Subgraph::get_current();
     if (subgraph == nullptr) {
         return nullptr;
     }
@@ -162,3 +167,49 @@ OGUniqueID OGSubgraphAddObserver(OGSubgraphRef cf_subgraph,
     }
     return subgraph->add_observer(OG::ClosureFunction<void>(function, context));
 }
+
+#if !OG_TARGET_OS_WASI
+static bool should_record_tree;
+static dispatch_once_t should_record_tree_once;
+
+void init_should_record_tree(void *) {
+    should_record_tree = OG::get_env("OG_TREE") != 0;
+}
+#endif
+
+bool OGSubgraphShouldRecordTree() {
+    #if !OG_TARGET_OS_WASI
+    dispatch_once_f(&should_record_tree_once, NULL, init_should_record_tree);
+    return should_record_tree;
+    #else
+    return false;
+    #endif
+}
+
+void OGSubgraphSetShouldRecordTree() {
+    #if !OG_TARGET_OS_WASI
+    dispatch_once_f(&should_record_tree_once, NULL, init_should_record_tree);
+    should_record_tree = true;
+    #endif
+}
+
+void OGSubgraphBeginTreeElement(OGAttribute attribute, OGTypeID type, uint32_t flags) {
+    OG::Subgraph * subgraph = OG::Subgraph::get_current();
+    if (subgraph) {
+        subgraph->begin_tree(attribute, type, flags);
+    }
+}
+
+void OGSubgraphAddTreeValue(OGAttribute attribute, OGTypeID type, const char * key, uint32_t flags) {
+    OG::Subgraph * subgraph = OG::Subgraph::get_current();
+    if (subgraph) {
+        subgraph->add_tree_value(attribute, type, key, flags);
+    }
+}
+
+void OGSubgraphEndTreeElement(OGAttribute attribute) {
+    OG::Subgraph * subgraph = OG::Subgraph::get_current();
+    if (subgraph) {
+        subgraph->end_tree(attribute);
+    }
+}
diff --git a/Sources/_OpenGraph/Graph/OGSubgraph.h b/Sources/_OpenGraph/Graph/OGSubgraph.h
@@ -82,6 +82,26 @@ OGUniqueID OGSubgraphAddObserver(OGSubgraphRef cf_subgraph,
                            const void (*function)(const void * _Nullable context OG_SWIFT_CONTEXT) OG_SWIFT_CC(swift),
                            const void * _Nullable context);
 
+OG_EXPORT
+OG_REFINED_FOR_SWIFT
+bool OGSubgraphShouldRecordTree(void) OG_SWIFT_NAME(getter:OGSubgraphRef.shouldRecordTree());
+
+OG_EXPORT
+OG_REFINED_FOR_SWIFT
+void OGSubgraphSetShouldRecordTree(void) OG_SWIFT_NAME(OGSubgraphRef.setShouldRecordTree());
+
+OG_EXPORT
+OG_REFINED_FOR_SWIFT
+void OGSubgraphBeginTreeElement(OGAttribute attribute, OGTypeID type, uint32_t flags);
+
+OG_EXPORT
+OG_REFINED_FOR_SWIFT
+void OGSubgraphAddTreeValue(OGAttribute attribute, OGTypeID type, const char * key, uint32_t flags);
+
+OG_EXPORT
+OG_REFINED_FOR_SWIFT
+void OGSubgraphEndTreeElement(OGAttribute attribute);
+
 OG_EXTERN_C_END
 
 OG_ASSUME_NONNULL_END