check pt: Make subscriber core shared (so all observers see every update)

This commit is contained in:
John Colvin committed 2025-12-05 15:56:24 +00:00
1 parent af452e8fff
commit 2b80c79eae
4 files changed
+58 -35

No files matched your search

@@ -132,32 +132,31 @@ namespace bts
private void _subscribe_thread_func()
{
var sub = subscriberCore.Updates().Subscribe(onUpdate);
// subscription is done in another thread
subscriberCore.subscribe(_tag_name);
while (_continue_sub_thread)
{
// TODO recv_id
var updates = subscriberCore.get_updates(TimeSpan.FromMilliseconds(250));
if (updates == null || updates.Count() == 0)
continue;
_log_updates(updates);
_n_updates += updates.Count();
if (updates.Count() > 0)
{
var server_msg = updates.Last();
if (server_msg.data != null && server_msg.data.Length > 0)
{
_last_recvd_msg = PayloadMessage.deserialize(server_msg.data);
_last_recvd_msg.travel_epoch_ms = epoch_now();
}
else
{
// why are we getting empty or null data ? (server is sending data regardless?)
}
_fire_dirty = true;
}
subscriberCore.get_updates(TimeSpan.FromMilliseconds(250));
}
}
sub.Dispose();
void onUpdate(IEnumerable<PubSubServerMessage> updates) {
_log_updates(updates);
_n_updates += updates.Count();
if (updates.Count() > 0) {
var server_msg = updates.Last();
if (server_msg.data != null && server_msg.data.Length > 0) {
_last_recvd_msg = PayloadMessage.deserialize(server_msg.data);
_last_recvd_msg.travel_epoch_ms = epoch_now();
} else {
// why are we getting empty or null data ? (server is sending data regardless?)
}
_fire_dirty = true;
}
}
}
private void _publish_next_packet()
{
@@ -2,7 +2,6 @@ using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Reactive.Disposables;
using System.Reactive.Linq;
using BCG.Utilities.General;
@@ -11,6 +10,8 @@ using bts;
using Bts.PubSub;
using Spark.Core.Disposables;
using OnData = System.Action<byte[]>;
namespace BCG {
@@ -27,15 +28,15 @@ namespace BCG {
// private IDictionary myTypedDispatchTable = new Hashtable(),
// myRawDispatchTable = new Hashtable();
private Dictionary<string, List<OnData>> _dispatch_table = new Dictionary<string, List<OnData>>();
IDisposable? updatesSub;
public ManagedSubscriber(ISubscriberCore subsCore) { _subcore = subsCore; }
public ManagedSubscriber(ISubscriberCore subsCore) {
_subcore = subsCore;
updatesSub = subsCore.Updates().Subscribe(_fire_events);
}
public void doWork() {
var msg_map = new Dictionary<string, List<bts.PubSubServerMessage>>();
var updates = _subcore.get_updates(TimeSpan.Zero);
if (updates.Count() == 0)
return;
_fire_events(updates);
_subcore.get_updates(TimeSpan.Zero);
}
public void subscribe(string tag, OnData on_data) {
@@ -111,6 +112,7 @@ namespace BCG {
#region IDisposable Members
public void Dispose() {
Disposable.dispose(ref updatesSub);
_subcore.Dispose();
}
@@ -11,6 +11,7 @@ namespace BCG {
void unsubscribe(params string[] tags);
IEnumerable<bts.PubSubServerMessage> get_updates(TimeSpan timeout);
IPubSubRouter get_router();
IObservable<IEnumerable<bts.PubSubServerMessage>> Updates();
event PubSubConnectionChange onPubSubConnectionChange;
}
+29 -8
View File
@@ -3,8 +3,12 @@ using bts;
using Bts.PubSub;
using Bts.PubSub.Routing;
using Spark.Core.Collections;
using System;
using System.Collections.Generic;
using System.Reactive.Linq;
using System.Reactive.Subjects;
namespace BCG {
@@ -18,9 +22,12 @@ namespace BCG {
///
/// </summary>
public class SubscriberCore : ISubscriberCore {
readonly Subject<IEnumerable<PubSubServerMessage>> publisher = new();
private Dictionary<RemoteConnectionInfo, ISingleServerSubscriberCore> _server_route_to_subcore_map = new();
private IPubSubRouter _tag_router;
private PubSubServerConnectionFactory _connection_factory = new PubSubServerConnectionFactory(true);
readonly object syncRoot = new();
readonly RefCountMap<string> tagRefs;
public event PubSubConnectionChange? onPubSubConnectionChange;
@@ -35,16 +42,25 @@ namespace BCG {
public IEnumerable<bts.PubSubServerMessage> get_updates(TimeSpan timeout) {
List<bts.PubSubServerMessage> rv = new List<bts.PubSubServerMessage>();
foreach (var kv in _server_route_to_subcore_map) {
var sub_core = kv.Value;
rv.AddRange(sub_core.get_updates(timeout));
lock (syncRoot) {
foreach (var kv in _server_route_to_subcore_map) {
var sub_core = kv.Value;
rv.AddRange(sub_core.get_updates(timeout));
}
}
publisher.OnNext(rv);
return rv;
}
public IObservable<IEnumerable<PubSubServerMessage>> Updates() =>
publisher.AsObservable();
public void subscribe(params string[] tags) {
lock (_server_route_to_subcore_map) {
lock (syncRoot) {
foreach (string tag in tags) {
if (!tagRefs.increment_adds_key(tag)) {
continue;
}
RemoteConnectionInfo server_rci = _tag_router.get_sub_route_for_tag(tag);
var server_sub_core = _find_subscribercore(server_rci);
server_sub_core.subscribe(tag);
@@ -79,8 +95,11 @@ namespace BCG {
}
public void unsubscribe(params string[] tags) {
lock (_server_route_to_subcore_map) {
lock (syncRoot) {
foreach (string tag in tags) {
if (!tagRefs.decrement_removes_key(tag)) {
continue;
}
var server_rci = _tag_router.get_sub_route_for_tag(tag);
var server_subcore = _find_subscribercore(server_rci);
server_subcore.unsubscribe(tag);
@@ -95,10 +114,12 @@ namespace BCG {
#region IDisposable Members
public void Dispose() {
foreach (var sssc in _server_route_to_subcore_map.Values) {
sssc.Dispose();
lock (syncRoot) {
foreach (var sssc in _server_route_to_subcore_map.Values) {
sssc.Dispose();
}
_connection_factory.Dispose();
}
_connection_factory.Dispose();
}
#endregion