diff --git a/src/DataStreamSuite/DataStreamQueryAnalyzer/MainForm.cs b/src/DataStreamSuite/DataStreamQueryAnalyzer/MainForm.cs index a310124e3..294042507 100644 --- a/src/DataStreamSuite/DataStreamQueryAnalyzer/MainForm.cs +++ b/src/DataStreamSuite/DataStreamQueryAnalyzer/MainForm.cs @@ -19,6 +19,7 @@ using System.Reactive; using System.Reactive.Linq; using System.Reactive.Subjects; using System.Text.RegularExpressions; +using System.Threading; using System.Windows.Forms; namespace BCG @@ -46,6 +47,7 @@ namespace BCG IBlueRowCollection? tagRows; private string myKQ; private TextWriter? myConsoleOutput; + IDataPacket? pendingData; IDisposable? titleSub; public MainForm() @@ -372,18 +374,24 @@ namespace BCG // this is the stream callback private void myCallback(object o) { - _stopwatch.Stop(); - var timer = Stopwatch.StartNew(); var dp = (IDataPacket)o; - myCrono.Stop(); - Log.Ui.diag($"Received callback for {dp.Schema.tableName}"); - if (o == null) - { - System.Windows.Forms.MessageBox.Show(this, "Received a Null Data packet", - "Invalid Data", MessageBoxButtons.OK, MessageBoxIcon.Error); + Log.Ui.diag(dp.GetIncrementalIdString()); + Volatile.Write(ref pendingData, dp); + } + + private Stopwatch myCrono = new(); + + private DataStreamExpression? myExp; + + private void myTimer_Tick(object sender, System.EventArgs e) + { + var dp = Interlocked.Exchange(ref pendingData, null); + if (dp is null) { return; } - Log.Ui.diag(dp.GetIncrementalIdString()); + _stopwatch.Stop(); + var timer = Stopwatch.StartNew(); + myCrono.Stop(); myToolStripStatusLabelTime.BackColor = Color.Black; myToolStripStatusLabelRows.BackColor = Color.Black; myToolStripStatusLabelTime.ForeColor = Color.White; @@ -420,28 +428,6 @@ namespace BCG $"DSQA MainForm.myCallback table: {dp.Schema.tableName} rows: {dp.newRows.Count} time: {timer.Elapsed.TotalMilliseconds:0.00}ms"); } - private Stopwatch myCrono = new(); - - private DataStreamExpression? myExp; - - private void myTimer_Tick(object sender, System.EventArgs e) - { - // try - // { - ViewStreamDatabase.instance.doWork(); - MasterWorker.getInstance(false).doWork(); - //} - // catch (Exception exc) { - // Log.Ui.warn(exc.ToString()); - - // myDataGrid.DataSource = null; - // //myTabControl.SelectedIndex = 1; - // myTabControl.SelectedTab = myErrorTabPage; - // myErrorTextBox.Text = exc.Message; - // myErrorTextBox.Text += "\n" + exc.StackTrace; - // } - } - class StringWrapper { public StringWrapper(string s)