From 2f6243d8bc41adb54c34c26a7e5c7302f7a78fb0 Mon Sep 17 00:00:00 2001 From: Michael Pysson Date: Sat, 7 Sep 2024 00:23:16 +0000 Subject: [PATCH] Merged PR 802346: Conditionalize Windows specific perf stats based on OS Conditionalize Windows specific perf stats based on OS --- Public/Src/Engine/Scheduler/Scheduler.cs | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Public/Src/Engine/Scheduler/Scheduler.cs b/Public/Src/Engine/Scheduler/Scheduler.cs index 249242973..6ad54a32a 100644 --- a/Public/Src/Engine/Scheduler/Scheduler.cs +++ b/Public/Src/Engine/Scheduler/Scheduler.cs @@ -2356,24 +2356,24 @@ namespace BuildXL.Scheduler return new StatusRows() { { "Cpu Percent", data => data.CpuPercent }, - { "Cpu Percent (WMI)", data => m_perfInfo.CpuWMIUsagePercentage }, + { "Cpu Percent (WMI)", data => m_perfInfo.CpuWMIUsagePercentage, OperatingSystemHelper.IsWindowsOS }, - { "ContextSwitches (WMI)", data => m_perfInfo.ContextSwitchesPerSec }, - { "CpuQueueLength (WMI)", data => m_perfInfo.CpuQueueLength }, - { "Threads (WMI)", data => m_perfInfo.Threads }, - { "Processes (WMI)", data => m_perfInfo.Processes }, + { "ContextSwitches (WMI)", data => m_perfInfo.ContextSwitchesPerSec, OperatingSystemHelper.IsWindowsOS }, + { "CpuQueueLength (WMI)", data => m_perfInfo.CpuQueueLength, OperatingSystemHelper.IsWindowsOS }, + { "Threads (WMI)", data => m_perfInfo.Threads, OperatingSystemHelper.IsWindowsOS }, + { "Processes (WMI)", data => m_perfInfo.Processes , OperatingSystemHelper.IsWindowsOS}, { "BuildXL Cpu Percent", data => m_perfInfo.ProcessCpuPercentage }, - { "JobObject Cpu Percent", data => m_perfInfo.JobObjectCpu }, - { "JobObject Processes", data => m_perfInfo.JobObjectProcesses }, + { "JobObject Cpu Percent", data => m_perfInfo.JobObjectCpu, OperatingSystemHelper.IsWindowsOS }, + { "JobObject Processes", data => m_perfInfo.JobObjectProcesses, OperatingSystemHelper.IsWindowsOS }, { "Ram Percent", data => data.RamPercent }, { "EffectiveRam Percent", data => m_perfInfo.EffectiveRamUsagePercentage ?? 0}, { "Used Ram Mb", data => data.RamUsedMb }, { "Free Ram Mb", data => data.RamFreeMb }, - { "ModifiedPagelistMb", data => m_perfInfo.ModifiedPagelistMb ?? 0}, - { "Commit Percent", data => data.CommitPercent }, - { "Used Commit Mb", data => data.CommitUsedMb }, - { "Free Commit Mb", data => data.CommitFreeMb }, + { "ModifiedPagelistMb", data => m_perfInfo.ModifiedPagelistMb ?? 0, OperatingSystemHelper.IsWindowsOS}, + { "Commit Percent", data => data.CommitPercent , OperatingSystemHelper.IsWindowsOS}, + { "Used Commit Mb", data => data.CommitUsedMb , OperatingSystemHelper.IsWindowsOS}, + { "Free Commit Mb", data => data.CommitFreeMb , OperatingSystemHelper.IsWindowsOS}, { "NetworkBandwidth", data => m_perfInfo.MachineBandwidth }, { "MachineKbitsPerSecSent", data => (long)m_perfInfo.MachineKbitsPerSecSent }, { "MachineKbitsPerSecReceived", data => (long)m_perfInfo.MachineKbitsPerSecReceived },