From dcbc5962a50bb1c7946e732aa813bf4dae112576 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Wed, 27 May 2020 23:13:21 +0000 Subject: [PATCH] --- .../AyaNova/Controllers/ServerMetricsController.cs | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/server/AyaNova/Controllers/ServerMetricsController.cs b/server/AyaNova/Controllers/ServerMetricsController.cs index d42e502f..3f656331 100644 --- a/server/AyaNova/Controllers/ServerMetricsController.cs +++ b/server/AyaNova/Controllers/ServerMetricsController.cs @@ -32,6 +32,7 @@ namespace AyaNova.Api.Controllers private readonly ILogger log; private readonly ApiServerState serverState; private const int MAX_RECORDS_BEFORE_DOWNSAMPLING = 400; + private const long MB = (1024 * 1024); /// /// ctor @@ -129,11 +130,11 @@ namespace AyaNova.Api.Controllers gen2 = dsGen2.Select(z => (int)z.Item2).ToArray(), memAllLabels = dsAllocated.Select(z => DateTime.FromOADate(z.Item1)).Union(dsWorkingSet.Select(z => DateTime.FromOADate(z.Item1))).Union(dsPrivateBytes.Select(z => DateTime.FromOADate(z.Item1))).ToArray(), // allocatedLabels = dsAllocated.Select(z => DateTime.FromOADate(z.Item1)).ToArray(), - allocated = dsAllocated.Select(z => (long)z.Item2).ToArray(), + allocated = dsAllocated.Select(z => z.Item2 / MB).ToArray(), //workingSetLabels = dsWorkingSet.Select(z => DateTime.FromOADate(z.Item1)).ToArray(), - workingSet = dsWorkingSet.Select(z => (long)z.Item2).ToArray(), + workingSet = dsWorkingSet.Select(z => z.Item2 / MB).ToArray(), // privateBytesLabels = dsPrivateBytes.Select(z => DateTime.FromOADate(z.Item1)).ToArray(), - privateBytes = dsPrivateBytes.Select(z => (long)z.Item2).ToArray() + privateBytes = dsPrivateBytes.Select(z => z.Item2 / MB).ToArray() } @@ -155,9 +156,9 @@ namespace AyaNova.Api.Controllers gen0 = MinuteMetrics.Select(z => z.Gen0).ToArray(), gen1 = MinuteMetrics.Select(z => z.Gen1).ToArray(), gen2 = MinuteMetrics.Select(z => z.Gen2).ToArray(), - allocated = MinuteMetrics.Select(z => z.Allocated).ToArray(), - workingSet = MinuteMetrics.Select(z => z.WorkingSet).ToArray(), - privateBytes = MinuteMetrics.Select(z => z.PrivateBytes).ToArray() + allocated = MinuteMetrics.Select(z => z.Allocated / MB).ToArray(), + workingSet = MinuteMetrics.Select(z => z.WorkingSet / MB).ToArray(), + privateBytes = MinuteMetrics.Select(z => z.PrivateBytes / MB).ToArray() }