From 4e3a02c31bbdc3e83b896274a58bade92dd68841 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Mon, 10 Jan 2022 00:00:40 -0500 Subject: [PATCH] Request-Reply works --- ...ingleVolSurfaceCommittedOutputRetriever.cs | 7 ++++--- .../spark/AW2/Bus/SingleVolSurfaceManager.cs | 2 ++ .../AW2/Bus/VolSurfaceBlackboardManager.cs | 5 +++-- .../spark/AW2/Misc/ThreadedBlackboard.cs | 21 ++++++++++++++++++- src/client/spark/core/Bus/SimpleBus.cs | 5 +++++ 5 files changed, 34 insertions(+), 6 deletions(-) diff --git a/src/client/spark/AW2/Bus/SingleVolSurfaceCommittedOutputRetriever.cs b/src/client/spark/AW2/Bus/SingleVolSurfaceCommittedOutputRetriever.cs index 392328fc3..66353fe80 100644 --- a/src/client/spark/AW2/Bus/SingleVolSurfaceCommittedOutputRetriever.cs +++ b/src/client/spark/AW2/Bus/SingleVolSurfaceCommittedOutputRetriever.cs @@ -46,10 +46,10 @@ namespace mbts.spark { private void _on_bb_data(object tag, object data) { if (_in_bb_vs_input_tag.Equals(tag) || _in_bb_nonvol_data_tag.Equals(tag) || _in_vs_standard_time_tag.Equals(tag)) - _recompute_and_publish(); + _recompute_and_publish(tag); } - private void _recompute_and_publish() { + private void _recompute_and_publish(object tag = null) { VolSurfaceInput vs_input = _bb.read_state(_in_bb_vs_input_tag); VolSurfaceNonVolData vs_nonvol_data = _bb.read_state(_in_bb_nonvol_data_tag); VolSurfaceStandardTime vs_standard_time = _bb.read_state(_in_vs_standard_time_tag); @@ -60,7 +60,8 @@ namespace mbts.spark { vs_nonvol_data.input, vs_nonvol_data.driver_price_map, vs_standard_time); VolSurfaceOutput vs_output = GeneralVolSurfaceCalculator.compute(vs_input, vs_nonvol_data.contracts, aux_data_map); _timer.stop(); - bts.Log.Gen.info($"SingleVolSurfaceCommittedOutputRetriever._recompute_and_publish vs_id:{_vs_id} time:{_timer.lastIntervalTime} msecs"); + var tag_str = tag == null ? "Null" : tag.ToString(); + bts.Log.Gen.info($"SingleVolSurfaceCommittedOutputRetriever._recompute_and_publish vs_id:{_vs_id} time:{_timer.lastIntervalTime} msecs tag:{tag_str}"); _logger.log(_log_id, _log_id, _timer.lastIntervalTime); _bb.post(_out_bb_computed_vol_tag, vs_output); } diff --git a/src/client/spark/AW2/Bus/SingleVolSurfaceManager.cs b/src/client/spark/AW2/Bus/SingleVolSurfaceManager.cs index fc78c5db4..71defbd45 100644 --- a/src/client/spark/AW2/Bus/SingleVolSurfaceManager.cs +++ b/src/client/spark/AW2/Bus/SingleVolSurfaceManager.cs @@ -17,6 +17,8 @@ namespace mbts.spark { public SingleVolSurfaceManager(int vs_id, ThreadedBlackboard t_bb, AnalyticsService analytics_service) { + var tid = System.Threading.Thread.CurrentThread.ManagedThreadId; + bts.Log.Ui.info($"SingleVolSurfaceManager.cons vs_id:{vs_id} tid:{tid}"); _threaded_bb = t_bb; _threaded_bb.subscribe(_in_bb_delete_tag); _threaded_bb.data_callback += _on_data; diff --git a/src/client/spark/AW2/Bus/VolSurfaceBlackboardManager.cs b/src/client/spark/AW2/Bus/VolSurfaceBlackboardManager.cs index 90c7103cb..2f27951f5 100644 --- a/src/client/spark/AW2/Bus/VolSurfaceBlackboardManager.cs +++ b/src/client/spark/AW2/Bus/VolSurfaceBlackboardManager.cs @@ -70,6 +70,7 @@ namespace mbts.spark { public VolSurfaceBlackboardManager(bts.api.IBus bus, bts.api.analytics.AnalyticsService analytics_service) { + bts.Log.Ui.info("VSBusManager cons"); _bus = bus; _bb = new ThreadedBlackboard(bus); _analytics_service = analytics_service; @@ -122,8 +123,8 @@ namespace mbts.spark { // (will take care of it later) foreach (var vs_id in vs_ids) { if (!_vs_manager_map.ContainsKey(vs_id)) { - _vs_manager_map[vs_id] = new SingleVolSurfaceManager( - vs_id, _bb, _analytics_service); + _vs_manager_map.Add(vs_id, new SingleVolSurfaceManager( + vs_id, _bb, _analytics_service)); } } } diff --git a/src/client/spark/AW2/Misc/ThreadedBlackboard.cs b/src/client/spark/AW2/Misc/ThreadedBlackboard.cs index da3e86064..7d537276b 100644 --- a/src/client/spark/AW2/Misc/ThreadedBlackboard.cs +++ b/src/client/spark/AW2/Misc/ThreadedBlackboard.cs @@ -21,7 +21,8 @@ namespace mbts.spark { /// public class ThreadedBlackboard { private IBus _bus; - //public delegate void OnBBData(object tag, object data); + private List _subs = new List(); + private HashSet _tag_map = new HashSet(); public event Action data_callback = (t, v) => { }; public event Action timer_callback = () => { }; @@ -46,20 +47,38 @@ namespace mbts.spark { #region Templatized sub/write public void subscribe(ITag tag) { + if (_tag_map.Contains(tag)) { + return; + } + _tag_map.Add(tag); + bts.Log.Ui.info($"ThreadedBlackBoard.subscribe tag:{tag}"); var observable = _bus.subscribe(tag).OnDispatcher().Subscribe( data => _on_bus_data(tag, data)); + _subs.Add(observable); } + private static string _data_string(T data) { + string rv = "Null"; + try { + rv = data.ToString(); + } catch (Exception ex) { + bts.Log.Ui.error($"ThreadedBlackBoard data:Null ex:{ex.Message}"); + } + return rv; + } public void post(ITag tag, T data, bool block_until_written = false) { + bts.Log.Ui.info($"ThreadedBlackBoard.post tag:{tag} data:{_data_string(data)}"); _cache[tag] = data; _bus.post(tag, data); } private void _on_bus_data(ITag tag, T data) { + _cache[tag] = data; if (tag == SparkTags.SparkTimer) { timer_callback(); return; } + bts.Log.Ui.info($"ThreadedBlackBoard._on_bus_data tag:{tag} data:{_data_string(data)}"); data_callback(tag, data); } #endregion diff --git a/src/client/spark/core/Bus/SimpleBus.cs b/src/client/spark/core/Bus/SimpleBus.cs index d35045d71..5bb7ca3dc 100644 --- a/src/client/spark/core/Bus/SimpleBus.cs +++ b/src/client/spark/core/Bus/SimpleBus.cs @@ -32,6 +32,11 @@ namespace bts.core { public void post(ITag tag, T data) { try { subject(tag).OnNext(data); + // TODO: for debugging purposes, remove it later + if (tag != mbts.spark.SparkTags.SparkTimer) { + bts.Log.Ui.info($"SimpleBus.post tag:{tag} data:{data}"); + return; + } } catch (Exception e) { Log.Ui.error($"Exception posting to '{tag}': {e}"); }