loops

Author: KSemenenko

ManagedCode.Orleans.Graph.Tests/Cluster/TestSiloConfigurations.cs

@@ -11,6 +11,9 @@ public void Configure(ISiloBuilder siloBuilder)
         siloBuilder.AddOrleansGraph()
             .CreateGraph(graph =>
             {
+                graph.AddGrain<IGrainA>()
+                    .WithReentrancy();
+                
                 graph.AddGrainTransition<IGrainA, IGrainB>().AllMethods().WithReentrancy();
                 graph.AddGrainTransition<IGrainB, IGrainC>().AllMethods().WithReentrancy();
                 graph.AddGrainTransition<IGrainC, IGrainD>().AllMethods().WithReentrancy();

ManagedCode.Orleans.Graph.Tests/GrainGraphManagerTests.cs

@@ -5,7 +5,7 @@
 
 namespace ManagedCode.Orleans.Graph.Tests;
 
-public class GrainGraphManagerTests
+public class GrainTransitionManagerTests
 {
 
 [Fact]

ManagedCode.Orleans.Graph/Builder/GrainCallsBuilder.cs

@@ -62,10 +62,10 @@ internal void AddReentrancy(string source, string target)
         _graph.AddTransition(source, target, new GrainTransition("*", "*", IsReentrant: true));
     }
 
-    public GrainGraphManager Build()
+    public GrainTransitionManager Build()
     {
         ValidateCycles();
-        return new GrainGraphManager(_graph);
+        return new GrainTransitionManager(_graph);
     }
 
     private void ValidateCycles()

ManagedCode.Orleans.Graph/Builder/Interfaces/IGrainCallsBuilder.cs

@@ -50,6 +50,6 @@ public interface IGrainCallsBuilder
     /// <summary>
     /// Builds the grain graph manager.
     /// </summary>
-    /// <returns>An instance of <see cref="GrainGraphManager"/>.</returns>
-    GrainGraphManager Build();
+    /// <returns>An instance of <see cref="GrainTransitionManager"/>.</returns>
+    GrainTransitionManager Build();
 }

ManagedCode.Orleans.Graph/Common/DirectedGraph.cs

@@ -92,6 +92,9 @@ private bool IsCyclicUtil(string vertex, HashSet<string> visited, HashSet<string
             {
                 foreach (var neighbor in _adjacencyList[vertex].Keys)
                 {
+                    if (_allowSelfLoops && vertex.Equals(neighbor))
+                        continue;
+
                     if (!visited.Contains(neighbor) && IsCyclicUtil(neighbor, visited, recursionStack))
                         return true;
                     else if (recursionStack.Contains(neighbor))

ManagedCode.Orleans.Graph/Filters/GraphIncomingGrainCallFilter.cs

@@ -9,7 +9,7 @@ namespace ManagedCode.Orleans.Graph.Filters;
 
 public class GraphIncomingGrainCallFilter(IServiceProvider serviceProvider, GraphCallFilterConfig graphCallFilterConfig) : IIncomingGrainCallFilter
 {
-    private GrainGraphManager? GraphManager => serviceProvider.GetService<GrainGraphManager>();
+    private GrainTransitionManager? GraphManager => serviceProvider.GetService<GrainTransitionManager>();
 
     public Task Invoke(IIncomingGrainCallContext context)
     {

ManagedCode.Orleans.Graph/Filters/GraphOutgoingGrainCallFilter.cs

@@ -9,7 +9,7 @@ namespace ManagedCode.Orleans.Graph.Filters;
 
 public class GraphOutgoingGrainCallFilter(IServiceProvider serviceProvider, GraphCallFilterConfig graphCallFilterConfig) : IOutgoingGrainCallFilter
 {
-    private GrainGraphManager? GraphManager => serviceProvider.GetService<GrainGraphManager>();
+    private GrainTransitionManager? GraphManager => serviceProvider.GetService<GrainTransitionManager>();
 
     public Task Invoke(IOutgoingGrainCallContext context)
     {

ManagedCode.Orleans.Graph/GrainGraphManager.cs

@@ -5,11 +5,11 @@
 
 namespace ManagedCode.Orleans.Graph;
 
-public class GrainGraphManager
+public class GrainTransitionManager
 {
     private readonly DirectedGraph _grainGraph;
 
-    public GrainGraphManager(DirectedGraph grainGraph)
+    public GrainTransitionManager(DirectedGraph grainGraph)
     {
         _grainGraph = grainGraph ?? throw new ArgumentNullException(nameof(grainGraph));
     }
@@ -18,19 +18,27 @@ public bool IsTransitionAllowed(CallHistory callHistory)
     {
         if (callHistory.IsEmpty())
             return false;
-        
-        //TODO: check this code
+
         var calls = callHistory.History.Reverse().ToArray();
+        var visited = new HashSet<string>();
 
         for (var i = 0; i < calls.Length - 1; i++)
         {
             var currentCall = calls[i];
             var nextCall = calls[i + 1];
 
-            if (currentCall.Direction == Direction.Out && nextCall.Direction == Direction.In)
+            // Check for cycles
+            var transitionKey = $"{currentCall.Interface}->{nextCall.Interface}";
+            if (visited.Contains(transitionKey))
+            {
+                return false;
+            }
+            visited.Add(transitionKey);
+
+            // Check if the transition is allowed
+            if (!_grainGraph.IsTransitionAllowed(currentCall.Interface, nextCall.Interface, currentCall.Method, nextCall.Method))
             {
-                if (!_grainGraph.IsTransitionAllowed(currentCall.Interface, nextCall.Interface, currentCall.Method, nextCall.Method))
-                    return false;
+                return false;
             }
         }