diff --git a/src/DataStreamSuite/BaseUtilities/BaseUtilities.csproj b/src/DataStreamSuite/BaseUtilities/BaseUtilities.csproj
index cfadb03dd..53304f092 100644
--- a/src/DataStreamSuite/BaseUtilities/BaseUtilities.csproj
+++ b/src/DataStreamSuite/BaseUtilities/BaseUtilities.csproj
@@ -6,4 +6,8 @@
enable
+
+
+
+
diff --git a/src/DataStreamSuite/BaseUtilities/Crono.cs b/src/DataStreamSuite/BaseUtilities/Crono.cs
index 313d0fe3e..a2996614a 100644
--- a/src/DataStreamSuite/BaseUtilities/Crono.cs
+++ b/src/DataStreamSuite/BaseUtilities/Crono.cs
@@ -1,3 +1,5 @@
+using mbts.spark;
+
using System;
using System.Runtime;
diff --git a/src/DataStreamSuite/BaseUtilities/HighPerformanceTimer.cs b/src/DataStreamSuite/BaseUtilities/HighPerformanceTimer.cs
deleted file mode 100644
index 5e731ac53..000000000
--- a/src/DataStreamSuite/BaseUtilities/HighPerformanceTimer.cs
+++ /dev/null
@@ -1,119 +0,0 @@
-using System;
-using System.Runtime.InteropServices;
-
-namespace BCG.Utilities.General
-{
- ///
- /// Provides a timer, much more accurate than using timers based on System.DateTime. It does not accumulate time, as the
- /// stress was on small time intervals.
- ///
- public class HighPerformanceTimer
- {
- [DllImport("kernel32.dll")]
- public extern static short QueryPerformanceCounter(ref long x);
- [DllImport("kernel32.dll")]
- public extern static short QueryPerformanceFrequency(ref long x);
-
- private long myStartCount = 0, myEndCount = 0, myFreq = 0, myTotalCount = 0;
- private long myZeroTime;
- ///
- /// This a static instance that can be shared across a running process.
- /// The only member function that is thread-safe right now
- /// is 'runningMilliseconds'
- ///
- public readonly static HighPerformanceTimer sharedTimer = new HighPerformanceTimer ();
-
-
- public HighPerformanceTimer()
- {
- QueryPerformanceFrequency(ref myFreq);
- if (myFreq == 0)
- throw new ApplicationException ("High resolution timers not supported by this machine's hardware");
- QueryPerformanceCounter(ref myZeroTime);
- }
- ///
- /// starts measuring the time
- ///
- public void start()
- {
- QueryPerformanceCounter (ref myStartCount);
- }
-
- public double runningMilliseconds()
- {
- double rv = 0;
- lock (this)
- {
- long t = 0;
- QueryPerformanceCounter (ref t);
- rv = (t - myZeroTime) * 1000.0 / myFreq;
- }
- return rv;
- }
-
- public double toMilliseconds(long count)
- {
- lock (this)
- return count * 1000.0 / myFreq;
- }
- public double getRunningMilliseconds (long count)
- {
- double rv = 0;
- lock (this)
- {
- rv = (count - myZeroTime) * 1000.0 / myFreq;
- }
- return rv;
- }
-
- public long nowCount
- {
- get
- {
- long t = 0;
- QueryPerformanceCounter (ref t);
- return t;
- }
- }
-
- ///
- /// stops recording time
- ///
- public void stop()
- {
- QueryPerformanceCounter (ref myEndCount);
- myTotalCount += myEndCount - myStartCount;
- }
-
- ///
- /// total milliseconds, ie aggregated time of all intervals
- ///
- public double totalMilliseconds {get{return myTotalCount * 1000.0 / myFreq ; }}
-
- public double getMilliseconds (long count)
- {
- return count * 1000.0 / myFreq;
- }
-
- public long ticks {get{return myEndCount - myStartCount;}}
-
- ///
- /// time between the last start-stop
- ///
- public double lastIntervalTime {get{return (myEndCount - myStartCount) * 1000.0 / myFreq ; }}
-
- ///
- /// Resets the running time
- ///
- public void reset ()
- {
- QueryPerformanceCounter(ref myZeroTime);
- myTotalCount = 0;
- }
-
- public long freq
- {
- get { return myFreq; }
- }
- }
-}
diff --git a/src/DataStreamSuite/DataStream/Core/ViewStreamDatabase.cs b/src/DataStreamSuite/DataStream/Core/ViewStreamDatabase.cs
index 9c64db8d9..3588edd58 100644
--- a/src/DataStreamSuite/DataStream/Core/ViewStreamDatabase.cs
+++ b/src/DataStreamSuite/DataStream/Core/ViewStreamDatabase.cs
@@ -10,7 +10,7 @@ using mbts;
namespace BCG
{
- using HighPerformanceTimer = Utilities.General.HighPerformanceTimer;
+ using HighPerformanceTimer = mbts.spark.HighPerformanceTimer;
public class ViewStreamDatabase : IWorker, IDisposable
{
diff --git a/src/DataStreamSuite/DataStream/Primitives/Filter/FilterStream.cs b/src/DataStreamSuite/DataStream/Primitives/Filter/FilterStream.cs
index 38b4a3b23..fd52a450d 100644
--- a/src/DataStreamSuite/DataStream/Primitives/Filter/FilterStream.cs
+++ b/src/DataStreamSuite/DataStream/Primitives/Filter/FilterStream.cs
@@ -5,6 +5,7 @@ using System.Collections;
using BCG.Utilities;
using System.Text.RegularExpressions;
using mbts;
+using mbts.spark;
namespace BCG.StreamWorld.Addition
{
diff --git a/src/DataStreamSuite/DataStream/Primitives/GroupBy/NonIncremental/NonIncGroupByStream.cs b/src/DataStreamSuite/DataStream/Primitives/GroupBy/NonIncremental/NonIncGroupByStream.cs
index ca44d0a3e..0d6e3c42d 100644
--- a/src/DataStreamSuite/DataStream/Primitives/GroupBy/NonIncremental/NonIncGroupByStream.cs
+++ b/src/DataStreamSuite/DataStream/Primitives/GroupBy/NonIncremental/NonIncGroupByStream.cs
@@ -4,6 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
using mbts;
+using mbts.spark;
namespace BCG
{
diff --git a/src/DataStreamSuite/DataStream/Primitives/Join/NonIncremental/NonIncJoinBookkeeper.cs b/src/DataStreamSuite/DataStream/Primitives/Join/NonIncremental/NonIncJoinBookkeeper.cs
index d30d99def..f585acb5d 100644
--- a/src/DataStreamSuite/DataStream/Primitives/Join/NonIncremental/NonIncJoinBookkeeper.cs
+++ b/src/DataStreamSuite/DataStream/Primitives/Join/NonIncremental/NonIncJoinBookkeeper.cs
@@ -4,6 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
using mbts;
+using mbts.spark;
namespace BCG
{
diff --git a/src/DataStreamSuite/DataStream/Primitives/Join/NonIncremental/NonIncJoinStream.cs b/src/DataStreamSuite/DataStream/Primitives/Join/NonIncremental/NonIncJoinStream.cs
index 6c52ce66e..1851832c2 100644
--- a/src/DataStreamSuite/DataStream/Primitives/Join/NonIncremental/NonIncJoinStream.cs
+++ b/src/DataStreamSuite/DataStream/Primitives/Join/NonIncremental/NonIncJoinStream.cs
@@ -4,6 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
using mbts;
+using mbts.spark;
namespace BCG
{
diff --git a/src/DataStreamSuite/DataStream/Primitives/Map/MapStream.cs b/src/DataStreamSuite/DataStream/Primitives/Map/MapStream.cs
index 049faa6e0..9adbcadb6 100644
--- a/src/DataStreamSuite/DataStream/Primitives/Map/MapStream.cs
+++ b/src/DataStreamSuite/DataStream/Primitives/Map/MapStream.cs
@@ -2,6 +2,7 @@ using System;
using System.Data;
using System.Collections;
using mbts;
+using mbts.spark;
namespace BCG
{
diff --git a/src/DataStreamSuite/DataStream/Primitives/Project/ProjectStream.cs b/src/DataStreamSuite/DataStream/Primitives/Project/ProjectStream.cs
index ea664264a..45ed7b822 100644
--- a/src/DataStreamSuite/DataStream/Primitives/Project/ProjectStream.cs
+++ b/src/DataStreamSuite/DataStream/Primitives/Project/ProjectStream.cs
@@ -1,15 +1,17 @@
-using System;
-using System.Collections;
+namespace BCG {
+ using mbts.spark;
+
+ using Spark.Core.Collections;
+
+ using System.Collections;
-namespace BCG
-{
public class ProjectStream : ViewStream
{
private ProjectHelper myHelper;
private string myColExp, myTableName;
private ViewStream myVs;
private IDictionary myDic;
- private BCG.Utilities.General.HighPerformanceTimer _timer = new Utilities.General.HighPerformanceTimer();
+ private HighPerformanceTimer _timer = new();
///
///
/// stream to susbsribe to as the input stream
diff --git a/src/DataStreamSuite/DataStream/Primitives/Union/MutableAppendStream.cs b/src/DataStreamSuite/DataStream/Primitives/Union/MutableAppendStream.cs
index 13ea0f06c..5b563f784 100644
--- a/src/DataStreamSuite/DataStream/Primitives/Union/MutableAppendStream.cs
+++ b/src/DataStreamSuite/DataStream/Primitives/Union/MutableAppendStream.cs
@@ -2,6 +2,7 @@ using System;
using System.Collections.Generic;
using System.Text;
using mbts;
+using mbts.spark;
namespace BCG
{
diff --git a/src/DataStreamSuite/DataStreamCore/DataStreamCore.csproj b/src/DataStreamSuite/DataStreamCore/DataStreamCore.csproj
index d696ddc8d..acc509193 100644
--- a/src/DataStreamSuite/DataStreamCore/DataStreamCore.csproj
+++ b/src/DataStreamSuite/DataStreamCore/DataStreamCore.csproj
@@ -1,12 +1,13 @@
-
-
-
- true
-
+ true
net7.0
disable
+
+
+
+
+
diff --git a/src/DataStreamSuite/DataStreamCore/Messaging/Accumulation/TableAccumulator.cs b/src/DataStreamSuite/DataStreamCore/Messaging/Accumulation/TableAccumulator.cs
index c2978b55f..e2a5b7b97 100644
--- a/src/DataStreamSuite/DataStreamCore/Messaging/Accumulation/TableAccumulator.cs
+++ b/src/DataStreamSuite/DataStreamCore/Messaging/Accumulation/TableAccumulator.cs
@@ -2,6 +2,7 @@ using System;
using System.IO;
//using BCG.Utilities;
using mbts;
+using mbts.spark;
namespace BCG
{
diff --git a/src/DataStreamSuite/PubSub/Misc/HighPerformanceTimer.cs b/src/DataStreamSuite/PubSub/Misc/HighPerformanceTimer.cs
deleted file mode 100644
index 05e53e502..000000000
--- a/src/DataStreamSuite/PubSub/Misc/HighPerformanceTimer.cs
+++ /dev/null
@@ -1,119 +0,0 @@
-using System;
-using System.Runtime.InteropServices;
-
-namespace mbts
-{
- ///
- /// Provides a timer, much more accurate than using timers based on System.DateTime. It does not accumulate time, as the
- /// stress was on small time intervals.
- ///
- public class HighPerformanceTimer
- {
- [DllImport("kernel32.dll")]
- public extern static short QueryPerformanceCounter(ref long x);
- [DllImport("kernel32.dll")]
- public extern static short QueryPerformanceFrequency(ref long x);
-
- private long myStartCount = 0, myEndCount = 0, myFreq = 0, myTotalCount = 0;
- private long myZeroTime;
- ///
- /// This a static instance that can be shared across a running process.
- /// The only member function that is thread-safe right now
- /// is 'runningMilliseconds'
- ///
- public readonly static HighPerformanceTimer sharedTimer = new HighPerformanceTimer ();
-
-
- public HighPerformanceTimer()
- {
- QueryPerformanceFrequency(ref myFreq);
- if (myFreq == 0)
- throw new ApplicationException ("High resolution timers not supported by this machine's hardware");
- QueryPerformanceCounter(ref myZeroTime);
- }
- ///
- /// starts measuring the time
- ///
- public void start()
- {
- QueryPerformanceCounter (ref myStartCount);
- }
-
- public double runningMilliseconds()
- {
- double rv = 0;
- lock (this)
- {
- long t = 0;
- QueryPerformanceCounter (ref t);
- rv = (t - myZeroTime) * 1000.0 / myFreq;
- }
- return rv;
- }
-
- public double toMilliseconds(long count)
- {
- lock (this)
- return count * 1000.0 / myFreq;
- }
- public double getRunningMilliseconds (long count)
- {
- double rv = 0;
- lock (this)
- {
- rv = (count - myZeroTime) * 1000.0 / myFreq;
- }
- return rv;
- }
-
- public long nowCount
- {
- get
- {
- long t = 0;
- QueryPerformanceCounter (ref t);
- return t;
- }
- }
-
- ///
- /// stops recording time
- ///
- public void stop()
- {
- QueryPerformanceCounter (ref myEndCount);
- myTotalCount += myEndCount - myStartCount;
- }
-
- ///
- /// total milliseconds, ie aggregated time of all intervals
- ///
- public double totalMilliseconds {get{return myTotalCount * 1000.0 / myFreq ; }}
-
- public double getMilliseconds (long count)
- {
- return count * 1000.0 / myFreq;
- }
-
- public long ticks {get{return myEndCount - myStartCount;}}
-
- ///
- /// time between the last start-stop
- ///
- public double lastIntervalTime {get{return (myEndCount - myStartCount) * 1000.0 / myFreq ; }}
-
- ///
- /// Resets the running time
- ///
- public void reset ()
- {
- QueryPerformanceCounter(ref myZeroTime);
- myTotalCount = 0;
- }
-
- public long freq
- {
- get { return myFreq; }
- }
- }
-}
diff --git a/src/DataStreamSuite/PubSub/Misc/MasterWorker.cs b/src/DataStreamSuite/PubSub/Misc/MasterWorker.cs
index c5d0aba4a..d3f3e1962 100644
--- a/src/DataStreamSuite/PubSub/Misc/MasterWorker.cs
+++ b/src/DataStreamSuite/PubSub/Misc/MasterWorker.cs
@@ -4,6 +4,7 @@ using System.Text;
using BCG.Utilities.General;
using System.Threading;
using mbts;
+using mbts.spark;
//using BCG.Utilities;
namespace BCG
@@ -165,4 +166,4 @@ namespace BCG
// }
//}
-}
\ No newline at end of file
+}
diff --git a/src/DataStreamSuite/PubSub/Server/PubSubMessageReactor.cs b/src/DataStreamSuite/PubSub/Server/PubSubMessageReactor.cs
index 3152d5387..35ef25355 100644
--- a/src/DataStreamSuite/PubSub/Server/PubSubMessageReactor.cs
+++ b/src/DataStreamSuite/PubSub/Server/PubSubMessageReactor.cs
@@ -14,6 +14,7 @@ using System.Collections.Generic;
//using BCG.Utilities;
//using BCG.Utilities.General;
using mbts;
+using mbts.spark;
namespace BCG
{
@@ -441,4 +442,4 @@ namespace BCG
}
}
}
-}
\ No newline at end of file
+}
diff --git a/src/DataStreamSuite/PubSub/SingleServerSubscriberCore.cs b/src/DataStreamSuite/PubSub/SingleServerSubscriberCore.cs
index a76f31c23..0c1d89d61 100644
--- a/src/DataStreamSuite/PubSub/SingleServerSubscriberCore.cs
+++ b/src/DataStreamSuite/PubSub/SingleServerSubscriberCore.cs
@@ -5,6 +5,7 @@ using System.Text;
using BCG.Utilities;
using BCG.Utilities.General;
using mbts;
+using mbts.spark;
namespace BCG
{
@@ -214,4 +215,4 @@ namespace BCG
}
}
}
-}
\ No newline at end of file
+}
diff --git a/src/DataStreamSuite/PubSub/StaticSubscriberCore.cs b/src/DataStreamSuite/PubSub/StaticSubscriberCore.cs
index b24b00829..8d3c7c814 100644
--- a/src/DataStreamSuite/PubSub/StaticSubscriberCore.cs
+++ b/src/DataStreamSuite/PubSub/StaticSubscriberCore.cs
@@ -10,6 +10,7 @@ using BCG;
using BCG.Utilities;
using BCG.Utilities.General;
using mbts;
+using mbts.spark;
//using BCG.Utilities.BlueConfiguration;
namespace BCG
@@ -184,4 +185,4 @@ namespace BCG
#endregion
}
-}
\ No newline at end of file
+}
diff --git a/src/client/spark/AW2/Misc/HighPerformanceTimer.cs b/src/client/spark_core/HighPerformanceTimer.cs
similarity index 100%
rename from src/client/spark/AW2/Misc/HighPerformanceTimer.cs
rename to src/client/spark_core/HighPerformanceTimer.cs