update

Surveily · Dec 1, 2023 · 42427d6 · 42427d6
1 parent 833ab71
commit 42427d6
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 12 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -9,7 +9,7 @@
             "program": "${workspaceFolder}/src/Orleans.Streaming.Grains.Performance/bin/Release/net7.0/Orleans.Streaming.Grains.Performance.dll",
             "args": [
                 "--filter",
-                "*Broadcast*",
+                "*Channel*",
                 "-m",
                 "-t"
             ],
@@ -25,7 +25,7 @@
             "program": "${workspaceFolder}/src/Orleans.Streaming.Grains.Performance/bin/Debug/net7.0/Orleans.Streaming.Grains.Performance.dll",
             "args": [
                 "--filter",
-                "*Broadcast*",
+                "*Channel*",
                 "-m",
                 "-t"
             ],

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -19,9 +19,6 @@
                 "kind": "build",
                 "isDefault": true
             },
-            "presentation": {
-                "reveal": "silent"
-            },
             "problemMatcher": "$msCompile"
         },
         {
@@ -41,9 +38,6 @@
             "group": {
                 "kind": "build",
             },
-            "presentation": {
-                "reveal": "silent"
-            },
             "problemMatcher": "$msCompile"
         }
     ]

diff --git a/src/Orleans.Streaming.Grains.Performance/Program.cs b/src/Orleans.Streaming.Grains.Performance/Program.cs
@@ -17,14 +17,22 @@ public static void Main(string[] args)
 #if DEBUG
             RunVerbose(args);
 #else
+            // Run(args);
             RunSummaries(args);
 #endif
         }
 
+        private static void Run(string[] args)
+        {
+            var config = DefaultConfig.Instance;
+
+            BenchmarkSwitcher.FromAssembly(typeof(Program).Assembly)
+                             .Run(args, config);
+        }
+
         private static void RunVerbose(string[] args)
         {
-            var config = DefaultConfig.Instance
-                                      .WithOptions(ConfigOptions.DisableOptimizationsValidator);
+            var config = new DebugInProcessConfig();
 
             BenchmarkSwitcher.FromAssembly(typeof(Program).Assembly)
                              .Run(args, config);

diff --git a/src/Orleans.Streaming.Grains.Tests/Streams/Grains/BlobReceiverGrain.cs b/src/Orleans.Streaming.Grains.Tests/Streams/Grains/BlobReceiverGrain.cs
@@ -2,6 +2,7 @@
 // Copyright (c) Surveily Sp. z o.o.. All rights reserved.
 // </copyright>
 
+using System.Text;
 using Orleans.BroadcastChannel;
 using Orleans.Providers;
 using Orleans.Runtime;
@@ -43,8 +44,19 @@ public override async Task OnActivateAsync(CancellationToken cancellationToken)
 
         public async Task OnSubscribed(IBroadcastChannelSubscription subscription)
         {
-            await subscription.Attach<BlobMessage>(OnNextAsync);
-            await subscription.Attach<BroadcastMessage>(OnBroadcastAsync);
+            var id = subscription.ChannelId;
+            var message = Encoding.Default.GetString(id.Namespace.ToArray());
+
+            // TODO: Channels don't support multiple subs.
+            if (message == nameof(BlobMessage))
+            {
+                await subscription.Attach<BlobMessage>(OnNextAsync);
+            }
+
+            if (message == nameof(BroadcastMessage))
+            {
+                await subscription.Attach<BroadcastMessage>(OnBroadcastAsync);
+            }
         }
 
         private async Task OnNextAsync(BlobMessage message)