icdsystems/ICD.Common.Utils
1
0
Fork 0
mirror of https://github.com/ICDSystems/ICD.Common.Utils.git synced 2026-02-16 05:05:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/processorUptimeCaching' of Common/Utils into MetLife_v5.4.2

Browse Source
This commit is contained in:
Chris Cameron
2019-06-05 18:28:28 +00:00
committed by Gogs
parent 723759f805 d649fb9dc4
commit fc482ec685
3 changed files with 48 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
## [Unreleased] ## [Unreleased]
### Changed
- fixed cached the uptime values and calculate the uptime from those values instead of polling the crestron processor each time its needed
## [8.4.0] - 2019-05-15 ## [8.4.0] - 2019-05-15
### Added ### Added

58
ICD.Common.Utils/ProcessorUtils.SimplSharp.cs
View File

@@ -14,13 +14,16 @@ namespace ICD.Common.Utils
private const string UPTIME_COMMAND = "uptime"; private const string UPTIME_COMMAND = "uptime";
private const string PROGUPTIME_COMMAND_ROOT = "proguptime:{0}"; private const string PROGUPTIME_COMMAND_ROOT = "proguptime:{0}";
private const string UPTIME_REGEX = @".*(?'uptime'\d+ days \d{2}:\d{2}:\d{2}\.\d+)"; private const string UPTIME_REGEX = @".*(?'uptime'(?'days'\d+) days (?'hours'\d{2}):(?'minutes'\d{2}):(?'seconds'\d{2})\.(?'milliseconds'\d+))";
private const string RAMFREE_COMMAND = "ramfree"; private const string RAMFREE_COMMAND = "ramfree";
private const string RAMFREE_DIGITS_REGEX = @"^(\d*)"; private const string RAMFREE_DIGITS_REGEX = @"^(\d*)";
private static string s_VersionResult; private static string s_VersionResult;
private static DateTime? s_SystemUptimeStartTime;
private static DateTime? s_ProgramUptimeStartTime;
#region Properties #region Properties
/// <summary> /// <summary>
@@ -224,24 +227,53 @@ namespace ICD.Common.Utils
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[PublicAPI] [PublicAPI]
public static string GetSystemUptime() public static TimeSpan GetSystemUptime()
{ {
string uptime = GetUptime(); if (s_SystemUptimeStartTime == null)
Match match = Regex.Match(uptime, UPTIME_REGEX); {
return match.Groups["uptime"].Value; string uptime = GetSystemUptimeFeedback();
Match match = Regex.Match(uptime, UPTIME_REGEX);
if (!match.Success)
return default(TimeSpan);
int days = int.Parse(match.Groups["days"].Value);
int hours = int.Parse(match.Groups["hours"].Value);
int minutes = int.Parse(match.Groups["minutes"].Value);
int seconds = int.Parse(match.Groups["seconds"].Value);
int milliseconds = int.Parse(match.Groups["milliseconds"].Value);
TimeSpan span = new TimeSpan(days, hours, minutes, seconds, milliseconds);
s_SystemUptimeStartTime = IcdEnvironment.GetLocalTime() - span;
}
return IcdEnvironment.GetLocalTime() - s_SystemUptimeStartTime.Value;
} }
/// <summary> /// <summary>
/// Gets the uptime /// Gets the uptime of the current program.
/// </summary> /// </summary>
/// <param name="progslot"></param>
/// <returns></returns> /// <returns></returns>
[PublicAPI] [PublicAPI]
public static string GetProgramUptime(int progslot) public static TimeSpan GetProgramUptimeFeedback()
{ {
string uptime = GetUptime(progslot); if (s_ProgramUptimeStartTime == null)
Match match = Regex.Match(uptime, UPTIME_REGEX); {
return match.Groups["uptime"].Value; string uptime = GetProgramUptimeFeedback((int)ProgramUtils.ProgramNumber);
Match match = Regex.Match(uptime, UPTIME_REGEX);
if (!match.Success)
return default(TimeSpan);
int days = int.Parse(match.Groups["days"].Value);
int hours = int.Parse(match.Groups["hours"].Value);
int minutes = int.Parse(match.Groups["minutes"].Value);
int seconds = int.Parse(match.Groups["seconds"].Value);
int milliseconds = int.Parse(match.Groups["milliseconds"].Value);
TimeSpan span = new TimeSpan(days, hours, minutes, seconds, milliseconds);
s_ProgramUptimeStartTime = IcdEnvironment.GetLocalTime() - span;
}
return IcdEnvironment.GetLocalTime() - s_ProgramUptimeStartTime.Value;
} }
#endregion #endregion
@@ -262,7 +294,7 @@ namespace ICD.Common.Utils
return ramfree; return ramfree;
} }
private static string GetUptime() private static string GetSystemUptimeFeedback()
{ {
string uptime = null; string uptime = null;
if (!IcdConsole.SendControlSystemCommand(UPTIME_COMMAND, ref uptime)) if (!IcdConsole.SendControlSystemCommand(UPTIME_COMMAND, ref uptime))
@@ -274,7 +306,7 @@ namespace ICD.Common.Utils
return uptime; return uptime;
} }
private static string GetUptime(int programSlot) private static string GetProgramUptimeFeedback(int programSlot)
{ {
string uptime = null; string uptime = null;
if (!IcdConsole.SendControlSystemCommand(string.Format(PROGUPTIME_COMMAND_ROOT, programSlot), ref uptime)) if (!IcdConsole.SendControlSystemCommand(string.Format(PROGUPTIME_COMMAND_ROOT, programSlot), ref uptime))

2
ICD.Common.Utils/ProcessorUtils.Standard.cs
View File

@@ -152,7 +152,7 @@ namespace ICD.Common.Utils
/// <param name="progslot"></param> /// <param name="progslot"></param>
/// <returns></returns> /// <returns></returns>
[PublicAPI] [PublicAPI]
public static string GetProgramUptime(int progslot) public static string GetProgramUptimeFeedback(int progslot)
{ {
// TODO // TODO
return null; return null;