From 0ed1a2c122dc10cfb110c38ffb1e4fdabfd2d917 Mon Sep 17 00:00:00 2001 From: Stephen Hodgson Date: Wed, 8 Jan 2020 15:50:16 -0500 Subject: [PATCH 1/2] Fixed the issue with the diagnostics data provider not reporting the correct memory limit --- .../MixedRealityMemoryDiagnosticsDataProvider.cs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/XRTK-Core/Packages/com.xrtk.core/Services/DiagnosticsSystem/MixedRealityMemoryDiagnosticsDataProvider.cs b/XRTK-Core/Packages/com.xrtk.core/Services/DiagnosticsSystem/MixedRealityMemoryDiagnosticsDataProvider.cs index ff4d38f1c..a20cf0297 100644 --- a/XRTK-Core/Packages/com.xrtk.core/Services/DiagnosticsSystem/MixedRealityMemoryDiagnosticsDataProvider.cs +++ b/XRTK-Core/Packages/com.xrtk.core/Services/DiagnosticsSystem/MixedRealityMemoryDiagnosticsDataProvider.cs @@ -1,7 +1,6 @@ // Copyright (c) XRTK. All rights reserved. // Licensed under the MIT License. See LICENSE in the project root for license information. -using UnityEngine; using UnityEngine.Profiling; using XRTK.Definitions.DiagnosticsSystem; @@ -23,8 +22,7 @@ public MixedRealityMemoryDiagnosticsDataProvider(string name, uint priority, Mix { } - private int systemMemorySize; - private int lastSystemMemorySize; + private ulong lastSystemMemorySize; private ulong lastMemoryUsage; private ulong peakMemoryUsage; private ulong lastMemoryLimit; @@ -36,13 +34,13 @@ public override void LateUpdate() { base.LateUpdate(); - systemMemorySize = SystemInfo.systemMemorySize; + var systemMemorySize = (ulong)Profiler.GetTotalReservedMemoryLong(); if (lastSystemMemorySize != systemMemorySize) { lastSystemMemorySize = systemMemorySize; - var currentMemoryLimit = DiagnosticsUtils.ConvertMegabytesToBytes(lastSystemMemorySize); + var currentMemoryLimit = lastSystemMemorySize; if (currentMemoryLimit != lastMemoryLimit) { From 0c37db5fa488c9575b372c1331af50e6dd180aab Mon Sep 17 00:00:00 2001 From: Stephen Hodgson Date: Wed, 8 Jan 2020 16:04:13 -0500 Subject: [PATCH 2/2] A bit cleaner --- .../MixedRealityMemoryDiagnosticsDataProvider.cs | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/XRTK-Core/Packages/com.xrtk.core/Services/DiagnosticsSystem/MixedRealityMemoryDiagnosticsDataProvider.cs b/XRTK-Core/Packages/com.xrtk.core/Services/DiagnosticsSystem/MixedRealityMemoryDiagnosticsDataProvider.cs index a20cf0297..6bdb45faa 100644 --- a/XRTK-Core/Packages/com.xrtk.core/Services/DiagnosticsSystem/MixedRealityMemoryDiagnosticsDataProvider.cs +++ b/XRTK-Core/Packages/com.xrtk.core/Services/DiagnosticsSystem/MixedRealityMemoryDiagnosticsDataProvider.cs @@ -22,7 +22,6 @@ public MixedRealityMemoryDiagnosticsDataProvider(string name, uint priority, Mix { } - private ulong lastSystemMemorySize; private ulong lastMemoryUsage; private ulong peakMemoryUsage; private ulong lastMemoryLimit; @@ -36,16 +35,12 @@ public override void LateUpdate() var systemMemorySize = (ulong)Profiler.GetTotalReservedMemoryLong(); - if (lastSystemMemorySize != systemMemorySize) + if (lastMemoryUsage != systemMemorySize) { - lastSystemMemorySize = systemMemorySize; - - var currentMemoryLimit = lastSystemMemorySize; - - if (currentMemoryLimit != lastMemoryLimit) + if (systemMemorySize > lastMemoryLimit) { - MixedRealityToolkit.DiagnosticsSystem.RaiseMemoryLimitChanged(new MemoryLimit(currentMemoryLimit)); - lastMemoryLimit = currentMemoryLimit; + MixedRealityToolkit.DiagnosticsSystem.RaiseMemoryLimitChanged(new MemoryLimit(systemMemorySize)); + lastMemoryLimit = systemMemorySize; } }