icdsystems/ICD.Common.Utils
1
0
Fork 0
mirror of https://github.com/ICDSystems/ICD.Common.Utils.git synced 2026-04-12 03:57:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix: Added critical section to IcdConsole to clean up multi-threaded output

Browse source
This commit is contained in:
Chris Cameron 2020-10-28 14:42:30 -04:00
parent 64cc662ee7
commit 1e934c9877
1 changed files with 36 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

42
ICD.Common.Utils/IcdConsole.cs
View file

@ -22,6 +22,16 @@ namespace ICD.Common.Utils
public static event EventHandler<StringEventArgs> OnConsolePrint;
private static readonly SafeCriticalSection s_Section;
/// <summary>
/// Static constructor.
/// </summary>
static IcdConsole()
{
s_Section = new SafeCriticalSection();
}
/// <summary>
/// Wraps CrestronConsole.ConsoleCommandResponse for S+ compatibility.
/// </summary>
@ -64,12 +74,22 @@ namespace ICD.Common.Utils
public static void PrintLine(string message)
{
s_Section.Enter();
try
{
#if SIMPLSHARP
if (IcdEnvironment.RuntimeEnvironment != IcdEnvironment.eRuntimeEnvironment.SimplSharpProServer)
CrestronConsole.PrintLine(message);
if (IcdEnvironment.RuntimeEnvironment != IcdEnvironment.eRuntimeEnvironment.SimplSharpProServer)
CrestronConsole.PrintLine(message);
#else
Console.WriteLine(message);
Console.WriteLine(message);
#endif
}
finally
{
s_Section.Leave();
}
OnConsolePrint.Raise(null, new StringEventArgs(message + IcdEnvironment.NewLine));
}
@ -93,12 +113,22 @@ namespace ICD.Common.Utils
public static void Print(string message)
{
s_Section.Enter();
try
{
#if SIMPLSHARP
if (IcdEnvironment.RuntimeEnvironment != IcdEnvironment.eRuntimeEnvironment.SimplSharpProServer)
CrestronConsole.Print(message);
if (IcdEnvironment.RuntimeEnvironment != IcdEnvironment.eRuntimeEnvironment.SimplSharpProServer)
CrestronConsole.Print(message);
#else
Console.Write(message);
Console.Write(message);
#endif
}
finally
{
s_Section.Leave();
}
OnConsolePrint.Raise(null, new StringEventArgs(message));
}