Add Subgraph functionality (#176)

Kyle-Ye · web-flow · commit 7e1664cd4fcd · 2025-08-31T20:09:47.000+08:00
diff --git a/Package.resolved b/Package.resolved
diff --git a/Sources/OpenAttributeGraph/Graph/Subgraph.swift b/Sources/OpenAttributeGraph/Graph/Subgraph.swift
@@ -15,7 +15,7 @@ extension Subgraph {
 }
 
 extension Subgraph {
-    public func addObserver(_ observer: () -> Void) -> Int {
+    public func addObserver(_ observer: @escaping () -> Void) -> Int {
         Subgraph.addObserver(self, observer: observer)
     }
     
@@ -65,5 +65,5 @@ extension Subgraph {
     private static func apply(_ graph: Subgraph, flags: Flags, callback: (AnyAttribute) -> Void)
     
     @_silgen_name("OAGSubgraphAddObserver")
-    private static func addObserver(_ graph: Subgraph, observer: () -> Void) -> Int
+    private static func addObserver(_ graph: Subgraph, observer: @escaping () -> Void) -> Int
 }
diff --git a/Sources/OpenAttributeGraphCxx/Attribute/OAGAttribute.cpp b/Sources/OpenAttributeGraphCxx/Attribute/OAGAttribute.cpp
@@ -159,6 +159,21 @@ OAGGraphRef OAGGraphGetAttributeGraph(OAGAttribute attribute) {
 }
 
 OAGSubgraphRef OAGGraphGetAttributeSubgraph(OAGAttribute attribute) {
+    OAGSubgraphRef subgraph = OAGGraphGetAttributeSubgraph2(attribute);
+    if (subgraph == nullptr) {
+        OAG::precondition_failure("no subgraph");
+    }
+    return subgraph;
+}
+
+_Nullable OAGSubgraphRef OAGGraphGetAttributeSubgraph2(OAGAttribute attribute) {
+    auto attribute_id = OAG::AttributeID(attribute);
+//    attribute_id.validate_data_offset();
+//    auto subgraph = attribute_id.subgraph();
+//    if (subgraph == nullptr) {
+//        OAG::precondition_failure("internal error");
+//    }
+//    return subgraph->to_cf();
     // TODO
     return nullptr;
 }
diff --git a/Sources/OpenAttributeGraphCxx/Data/OAGUniqueID.c b/Sources/OpenAttributeGraphCxx/Data/OAGUniqueID.c
@@ -2,14 +2,13 @@
 //  OAGUniqueID.c
 //  OpenAttributeGraphCxx
 //
-//  Audited for iOS 18.0
+//  Audited for 6.5.1
 //  Status: Complete
 
 #include <OpenAttributeGraph/OAGUniqueID.h>
 #include <stdatomic.h>
 
 OAGUniqueID OAGMakeUniqueID(void) {
-    // Initial value is 1
-    static atomic_long counter = 1;
-    return counter++;
+    static atomic_ulong counter = 1;
+    return atomic_fetch_add_explicit(&counter, 1, memory_order_relaxed);
 }
diff --git a/Sources/OpenAttributeGraphCxx/Graph/OAGSubgraph.cpp b/Sources/OpenAttributeGraphCxx/Graph/OAGSubgraph.cpp
@@ -163,7 +163,7 @@ bool OAGSubgraphIsDirty(OAGSubgraphRef cf_subgraph, OAGAttributeFlags flags) {
     return false;
 }
 
-OAGUniqueID OAGSubgraphAddObserver(OAGSubgraphRef cf_subgraph,
+OAGObserverID OAGSubgraphAddObserver(OAGSubgraphRef cf_subgraph,
                                  const void (*function)(const void * _Nullable context OAG_SWIFT_CONTEXT) OAG_SWIFT_CC(swift),
                                  const void * _Nullable context) {
     OAG::Subgraph *subgraph = cf_subgraph->subgraph;
@@ -173,6 +173,14 @@ OAGUniqueID OAGSubgraphAddObserver(OAGSubgraphRef cf_subgraph,
     return subgraph->add_observer(OAG::ClosureFunction<void>(function, context));
 }
 
+void OAGSubgraphRemoveObserver(OAGSubgraphRef cf_subgraph, OAGObserverID observerID) {
+    OAG::Subgraph *subgraph = cf_subgraph->subgraph;
+    if (subgraph == nullptr) {
+        return;
+    }
+    subgraph->remove_observer(observerID);
+}
+
 #if !OAG_TARGET_OS_WASI
 static bool should_record_tree;
 static dispatch_once_t should_record_tree_once;
diff --git a/Sources/OpenAttributeGraphCxx/Graph/Subgraph.cpp b/Sources/OpenAttributeGraphCxx/Graph/Subgraph.cpp
@@ -34,6 +34,10 @@ OAGUniqueID OAG::Subgraph::add_observer(OAG::ClosureFunction<void> observer) con
     return OAGMakeUniqueID();
 }
 
+void OAG::Subgraph::remove_observer(OAGUniqueID observerID) const OAG_NOEXCEPT {
+    // TODO
+}
+
 void OAG::Subgraph::begin_tree(OAG::AttributeID id, OAG::swift::metadata const* type, unsigned int flags) const OAG_NOEXCEPT {
     // TODO
 }
diff --git a/Sources/OpenAttributeGraphCxx/Graph/Subgraph.hpp b/Sources/OpenAttributeGraphCxx/Graph/Subgraph.hpp
diff --git a/Sources/OpenAttributeGraphCxx/include/OpenAttributeGraph/OAGAttribute.h b/Sources/OpenAttributeGraphCxx/include/OpenAttributeGraph/OAGAttribute.h
@@ -139,6 +139,10 @@ OAG_EXPORT
 OAG_REFINED_FOR_SWIFT
 OAGSubgraphRef OAGGraphGetAttributeSubgraph(OAGAttribute attribute) OAG_SWIFT_NAME(getter:OAGAttribute.subgraph(self:));
 
+OAG_EXPORT
+OAG_REFINED_FOR_SWIFT
+_Nullable OAGSubgraphRef OAGGraphGetAttributeSubgraph2(OAGAttribute attribute) OAG_SWIFT_NAME(getter:OAGAttribute.subgraph2(self:));
+
 OAG_EXPORT
 OAG_REFINED_FOR_SWIFT
 const void * OAGGraphReadCachedAttribute(long hashValue, OAGTypeID bodyType, const void *bodyPointer, OAGTypeID valueType, OAGCachedValueOptions options, OAGAttribute attribute, bool unknown/*, ...*/);
diff --git a/Sources/OpenAttributeGraphCxx/include/OpenAttributeGraph/OAGSubgraph.h b/Sources/OpenAttributeGraphCxx/include/OpenAttributeGraph/OAGSubgraph.h
@@ -87,12 +87,18 @@ OAG_EXPORT
 OAG_REFINED_FOR_SWIFT
 bool OAGSubgraphIsDirty(OAGSubgraphRef cf_subgraph, OAGAttributeFlags flags) OAG_SWIFT_NAME(OAGSubgraphRef.isDirty(self:flags:));
 
+typedef long OAGObserverID OAG_SWIFT_NAME(ObserverID);
+
 OAG_EXPORT
 OAG_REFINED_FOR_SWIFT
-OAGUniqueID OAGSubgraphAddObserver(OAGSubgraphRef cf_subgraph,
+OAGObserverID OAGSubgraphAddObserver(OAGSubgraphRef cf_subgraph,
                            const void (*function)(const void * _Nullable context OAG_SWIFT_CONTEXT) OAG_SWIFT_CC(swift),
                            const void * _Nullable context);
 
+OAG_EXPORT
+OAG_REFINED_FOR_SWIFT
+void OAGSubgraphRemoveObserver(OAGSubgraphRef cf_subgraph, OAGObserverID observerID) OAG_SWIFT_NAME(OAGSubgraphRef.removeObserver(self:_:));
+
 OAG_EXPORT
 OAG_REFINED_FOR_SWIFT
 bool OAGSubgraphShouldRecordTree(void) OAG_SWIFT_NAME(getter:OAGSubgraphRef.shouldRecordTree());
diff --git a/Sources/OpenAttributeGraphCxx/include/OpenAttributeGraph/OAGUniqueID.h b/Sources/OpenAttributeGraphCxx/include/OpenAttributeGraph/OAGUniqueID.h
@@ -2,14 +2,14 @@
 //  OAGUniqueID.h
 //  OpenAttributeGraphCxx
 //
-//  Audited for iOS 18.0
+//  Audited for 6.5.1
 //  Status: Complete
 
 #ifndef OAGUniqueID_h
 #define OAGUniqueID_h
 
 #include <OpenAttributeGraph/OAGBase.h>
-typedef long OAGUniqueID;
+typedef u_long OAGUniqueID OAG_SWIFT_NAME(UniqueID);
 
 OAG_EXTERN_C_BEGIN
 OAG_EXPORT
diff --git a/Sources/OpenAttributeGraphCxx/include/OpenAttributeGraphCxx/Graph/Subgraph.hpp b/Sources/OpenAttributeGraphCxx/include/OpenAttributeGraphCxx/Graph/Subgraph.hpp
@@ -62,7 +62,8 @@ class Subgraph final {
     void apply(OAGAttributeFlags flags, OAG::ClosureFunction<void, OAGAttribute> body) const OAG_NOEXCEPT;
     
     OAGUniqueID add_observer(OAG::ClosureFunction<void> observer) const OAG_NOEXCEPT;
-    
+    void remove_observer(OAGUniqueID observerID) const OAG_NOEXCEPT;
+
     void begin_tree(OAG::AttributeID id, OAG::swift::metadata const *type, uint32_t flags) const OAG_NOEXCEPT;
     void add_tree_value(OAG::AttributeID id, OAG::swift::metadata const *type, const char* key, uint32_t flags) const OAG_NOEXCEPT;
     void end_tree(OAG::AttributeID id) const OAG_NOEXCEPT;
diff --git a/Sources/OpenAttributeGraphShims/GraphShims.swift b/Sources/OpenAttributeGraphShims/GraphShims.swift
@@ -8,7 +8,6 @@ public typealias OAGAttributeInfo = AGAttributeInfo
 public typealias OAGCachedValueOptions = AGCachedValueOptions
 public typealias OAGChangedValueFlags = AGChangedValueFlags
 public typealias OAGInputOptions = AGInputOptions
-public typealias OAGUniqueID = AGUniqueID
 public typealias OAGValue = AGValue
 public typealias OAGValueOptions = AGValueOptions
 public let attributeGraphEnabled = true
diff --git a/Tests/OpenAttributeGraphCompatibilityTests/Graph/SubgraphCompatibilityTests.swift b/Tests/OpenAttributeGraphCompatibilityTests/Graph/SubgraphCompatibilityTests.swift
@@ -28,4 +28,52 @@ struct SubgraphCompatibilityTests {
             Subgraph.endTreeElement(value: value)
         }
     }
+
+    @Suite
+    struct ObserverTests {
+        @Test
+        func observerNotifiedOnSubgraphDestroyed() {
+            var notifiedCount = 0
+            do {
+                let graph = Graph()
+                do {
+                    let subgraph = Subgraph(graph: graph)
+                    let _ = subgraph.addObserver {
+                        notifiedCount += 1
+                    }
+                }
+                #expect(notifiedCount == 1)
+            }
+            // Observers aren't notified more than once
+            #expect(notifiedCount == 1)
+        }
+
+        @Test
+        func observerNotifiedOnGraphDestroyed() {
+            var notifiedCount = 0
+            do {
+                let graph = Graph()
+                let subgraph = Subgraph(graph: graph)
+                let _ = subgraph.addObserver {
+                    notifiedCount += 1
+                }
+                #expect(notifiedCount == 0)
+            }
+            #expect(notifiedCount == 1)
+        }
+
+        @Test
+        func removedObserverNotNotified() {
+            var notifiedCount = 0
+            do {
+                let graph = Graph()
+                let subgraph = Subgraph(graph: graph)
+                let observerID = subgraph.addObserver {
+                    notifiedCount += 1
+                }
+                subgraph.removeObserver(observerID)
+            }
+            #expect(notifiedCount == 0)
+        }
+    }
 }
diff --git a/Tests/OpenAttributeGraphCompatibilityTests/GraphShims.swift b/Tests/OpenAttributeGraphCompatibilityTests/GraphShims.swift
@@ -8,7 +8,6 @@ public typealias OAGAttributeInfo = AGAttributeInfo
 public typealias OAGCachedValueOptions = AGCachedValueOptions
 public typealias OAGChangedValueFlags = AGChangedValueFlags
 public typealias OAGInputOptions = AGInputOptions
-public typealias OAGUniqueID = AGUniqueID
 public typealias OAGValue = AGValue
 public typealias OAGValueOptions = AGValueOptions
 public let compatibilityTestEnabled = true

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ extension Subgraph {`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`extension Subgraph {`
`18`		`- public func addObserver(_ observer: () -> Void) -> Int {`
	`18`	`+ public func addObserver(_ observer: @escaping () -> Void) -> Int {`
`19`	`19`	`Subgraph.addObserver(self, observer: observer)`
`20`	`20`	`}`
`21`	`21`
`@@ -65,5 +65,5 @@ extension Subgraph {`
`65`	`65`	`private static func apply(_ graph: Subgraph, flags: Flags, callback: (AnyAttribute) -> Void)`
`66`	`66`
`67`	`67`	`@_silgen_name("OAGSubgraphAddObserver")`
`68`		`- private static func addObserver(_ graph: Subgraph, observer: () -> Void) -> Int`
	`68`	`+ private static func addObserver(_ graph: Subgraph, observer: @escaping () -> Void) -> Int`
`69`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,10 @@ OAGUniqueID OAG::Subgraph::add_observer(OAG::ClosureFunction<void> observer) con`
`34`	`34`	`return OAGMakeUniqueID();`
`35`	`35`	`}`
`36`	`36`
	`37`	`+void OAG::Subgraph::remove_observer(OAGUniqueID observerID) const OAG_NOEXCEPT {`
	`38`	`+ // TODO`
	`39`	`+}`
	`40`	`+`
`37`	`41`	`void OAG::Subgraph::begin_tree(OAG::AttributeID id, OAG::swift::metadata const* type, unsigned int flags) const OAG_NOEXCEPT {`
`38`	`42`	`// TODO`
`39`	`43`	`}`