From 52c1e500e6423e816757cca67c67b5bbb73b4e94 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Sun, 31 Mar 2024 01:57:08 -0400 Subject: [PATCH] Re-fixing PubSubserver exception caused by null server in internal tags --- docker/linux | 1 + docker/windows | 1 + .../Client/MetaData/PubSubClientMessage.cs | 2 +- .../PubSub/Misc/StreamUtilityMethods.cs | 16 ++++++++++++++++ .../SystemSubscriptionMapPublisher.cs | 3 +++ .../PubSub/Server/PubSubMessageReactor.cs | 18 ++++++++---------- 6 files changed, 30 insertions(+), 11 deletions(-) create mode 160000 docker/linux create mode 160000 docker/windows diff --git a/docker/linux b/docker/linux new file mode 160000 index 000000000..56c61231f --- /dev/null +++ b/docker/linux @@ -0,0 +1 @@ +Subproject commit 56c61231f38261f275e0b26baae70622c760dc33 diff --git a/docker/windows b/docker/windows new file mode 160000 index 000000000..de7d40c09 --- /dev/null +++ b/docker/windows @@ -0,0 +1 @@ +Subproject commit de7d40c09de473e1b2802c4b27e03dc7f0c360d6 diff --git a/src/DataStreamSuite/PubSub/Client/MetaData/PubSubClientMessage.cs b/src/DataStreamSuite/PubSub/Client/MetaData/PubSubClientMessage.cs index 100c2f063..22b4b1b64 100644 --- a/src/DataStreamSuite/PubSub/Client/MetaData/PubSubClientMessage.cs +++ b/src/DataStreamSuite/PubSub/Client/MetaData/PubSubClientMessage.cs @@ -109,7 +109,7 @@ namespace bts { /// /////////////////////////////////////////////////////////////////////// public class PublishMsg : IPubSubMessage { public string connection; - public string publishing_app; + public string publishing_app = ClientInfo.thisClient.app; public string tag; public string tag_type; public bool is_compressed; diff --git a/src/DataStreamSuite/PubSub/Misc/StreamUtilityMethods.cs b/src/DataStreamSuite/PubSub/Misc/StreamUtilityMethods.cs index 910aa5a2b..c4b607606 100644 --- a/src/DataStreamSuite/PubSub/Misc/StreamUtilityMethods.cs +++ b/src/DataStreamSuite/PubSub/Misc/StreamUtilityMethods.cs @@ -8,6 +8,22 @@ namespace BCG { /// public static class StreamUtilityMethods { + // extension method to write a string C++ style (len prefixed) + public static void write_string_cpp(this BinaryWriter bw, string str) { + int len = str.Length; + bw.Write(len); + foreach (char c in str) { + bw.Write(c); + } + } + + public static string read_string_cpp(this BinaryReader br) { + int len = br.ReadInt32(); + string rv = String.Empty; + char[] c_arr = br.ReadChars(len); + return new string(c_arr); + } + public static Stream getAggregatedStream(Stream[] streams) { if (streams.Length == 1) return streams[0]; diff --git a/src/DataStreamSuite/PubSub/Server/InternalTagHandling/SystemSubscriptionMapPublisher.cs b/src/DataStreamSuite/PubSub/Server/InternalTagHandling/SystemSubscriptionMapPublisher.cs index f7a01f311..da841c564 100644 --- a/src/DataStreamSuite/PubSub/Server/InternalTagHandling/SystemSubscriptionMapPublisher.cs +++ b/src/DataStreamSuite/PubSub/Server/InternalTagHandling/SystemSubscriptionMapPublisher.cs @@ -69,6 +69,9 @@ namespace BCG { var ser_bytes = TagPubSubInfo.serialize(tpsis); PublishMsg pub_msg = new PublishMsg() { publish_time_epoch_ms = 0, + tag = SystemSubscriptionMapPublisher.tag_name, + tag_type = SystemSubscriptionMapPublisher.tag_type, + connection = "Internal", is_compressed = false, data_to_publish = ser_bytes }; diff --git a/src/DataStreamSuite/PubSub/Server/PubSubMessageReactor.cs b/src/DataStreamSuite/PubSub/Server/PubSubMessageReactor.cs index ca27c30d6..e70e8d780 100644 --- a/src/DataStreamSuite/PubSub/Server/PubSubMessageReactor.cs +++ b/src/DataStreamSuite/PubSub/Server/PubSubMessageReactor.cs @@ -84,8 +84,13 @@ namespace BCG { _msg_hub.activate(); Action handle_internal_pubs = () => { var internal_pubs = _internal_pub_queue.dequeueMultipleElements(1, 64000); - foreach (var msg in internal_pubs) - _handle_pub("Internal", msg); + foreach (var msg in internal_pubs) { + try { + _handle_pub("Internal", msg); + } catch (Exception ex) { + bts.Log.Gen.error($"PubSubMessage>reactor._polling_thread_func ex: {ex}"); + } + } }; while (true) { @@ -183,17 +188,10 @@ namespace BCG { _state.handle_unsub(ubnsub_msg); } - public static void internalSend(byte[] data) { - // TODO - //myReceivingQueue.enqueue(new Pair(internalPublisherConnection, data)); - } - - //private static PubsSubM public static void internal_publish(PublishMsg msg) { bts.Log.Gen.info($"PubsubMessageReactor.internal_publish msg: {msg}"); + bts.Log.Gen.debug_assert(!String.IsNullOrEmpty(msg.tag)); _internal_pub_queue.enqueue(msg); } - - } }