From 939ac5f29b85d2d325f6001b0fc6c7d0627956c6 Mon Sep 17 00:00:00 2001
From: "christopher.bennett" <christopher.bennett@metoffice.gov.uk>
Date: Mon, 24 Feb 2025 10:41:33 +0000
Subject: [PATCH 01/16] CPU/Memory logging working

---
 .../cylc/analysis/AnalysisTable.vue           | 65 +++++++++-----
 src/components/cylc/analysis/BoxPlot.vue      | 32 ++++---
 src/components/cylc/analysis/TimeSeries.vue   | 18 ++--
 src/utils/tasks.js                            | 86 +++++++++++++++----
 src/views/Analysis.vue                        | 15 +++-
 5 files changed, 155 insertions(+), 61 deletions(-)

diff --git a/src/components/cylc/analysis/AnalysisTable.vue b/src/components/cylc/analysis/AnalysisTable.vue
index d122f3ccd..60bd3ef8f 100644
--- a/src/components/cylc/analysis/AnalysisTable.vue
+++ b/src/components/cylc/analysis/AnalysisTable.vue
@@ -56,7 +56,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 <script>
 import { upperFirst } from 'lodash'
-import { formatDuration } from '@/utils/tasks'
+import {
+  formatDuration,
+  formatHeader
+} from '@/utils/tasks'
 import {
   initialOptions,
   updateInitialOptionsEvent,
@@ -130,48 +133,64 @@ export default {
       const times = upperFirst(this.timingOption)
       const timingHeaders = [
         {
-          title: `Mean T-${times}`,
-          key: `mean${times}Time`,
+          title: `Mean ${times}`,
+          key: `${formatHeader('mean', times)}`,
           formatter: formatDuration,
-          allowZeros: false
+          allowZeros: false,
+          timingOption: this.timingOption
         },
         {
-          title: `Std Dev T-${times}`,
-          key: `stdDev${times}Time`,
+          title: `Std Dev ${times}`,
+          key: `${formatHeader('stdDev', times)}`,
           formatter: formatDuration,
-          allowZeros: true
+          allowZeros: true,
+          timingOption: this.timingOption
         },
         {
-          title: `Min T-${times}`,
-          key: `min${times}Time`,
+          title: `Min ${times}`,
+          key: `${formatHeader('min', times)}`,
           formatter: formatDuration,
-          allowZeros: false
+          allowZeros: false,
+          timingOption: this.timingOption
         },
         {
-          title: `Q1 T-${times}`,
-          key: `${times.toLowerCase()}Quartiles.0`,
+          title: `Q1 ${times}`,
+          key: `${formatHeader('quartiles', times)}Quartiles.0`,
           formatter: formatDuration,
-          allowZeros: false
+          allowZeros: false,
+          timingOption: this.timingOption
         },
         {
-          title: `Median T-${times}`,
-          key: `${times.toLowerCase()}Quartiles.1`,
+          title: `Median ${times}`,
+          key: `${formatHeader('quartiles', times)}Quartiles.1`,
           formatter: formatDuration,
-          allowZeros: false
+          allowZeros: false,
+          timingOption: this.timingOption
         },
         {
-          title: `Q3 T-${times}`,
-          key: `${times.toLowerCase()}Quartiles.2`,
+          title: `Q3 ${times}`,
+          key: `${formatHeader('quartiles', times)}Quartiles.2`,
           formatter: formatDuration,
-          allowZeros: false
+          allowZeros: false,
+          timingOption: this.timingOption
         },
         {
-          title: `Max T-${times}`,
-          key: `max${times}Time`,
+          title: `Max ${times}`,
+          key: `${formatHeader('max', times)}`,
           formatter: formatDuration,
-          allowZeros: false
+          allowZeros: false,
+          timingOption: this.timingOption
         }
       ]
+      if (this.timingOption === 'cpuTime') {
+        timingHeaders.push({
+          title: 'Total CPU Time',
+          key: 'totalCpuTime',
+          formatter: formatDuration,
+          allowZeros: false,
+          timingOption: this.timingOption
+        })
+      }
       return this.headers.concat(timingHeaders)
     }
   },
@@ -186,7 +205,7 @@ export default {
         value = value[index]
       }
       if (header.formatter) {
-        return header.formatter(value, header.allowZeros)
+        return header.formatter(value, header.allowZeros, this.timingOption)
       }
       return value
     }
diff --git a/src/components/cylc/analysis/BoxPlot.vue b/src/components/cylc/analysis/BoxPlot.vue
index 68227c149..5ec31b326 100644
--- a/src/components/cylc/analysis/BoxPlot.vue
+++ b/src/components/cylc/analysis/BoxPlot.vue
@@ -65,7 +65,11 @@ import {
   mdiSortVariant,
 } from '@mdi/js'
 import { upperFirst } from 'lodash'
-import { formatDuration } from '@/utils/tasks'
+import {
+  formatDuration,
+  getTimingOption,
+  formatChartLabels
+} from '@/utils/tasks'
 import { useReducedAnimation } from '@/composables/localStorage'
 import {
   initialOptions,
@@ -165,11 +169,11 @@ export default {
       },
       tooltip: {
         custom ({ seriesIndex, dataPointIndex, w }) {
-          const max = formatDuration(w.globals.seriesCandleC[seriesIndex][dataPointIndex], true)
-          const q3 = formatDuration(w.globals.seriesCandleL[seriesIndex][dataPointIndex], true)
-          const med = formatDuration(w.globals.seriesCandleM[seriesIndex][dataPointIndex], true)
-          const q1 = formatDuration(w.globals.seriesCandleH[seriesIndex][dataPointIndex], true)
-          const min = formatDuration(w.globals.seriesCandleO[seriesIndex][dataPointIndex], true)
+          const max = formatDuration(w.globals.seriesCandleC[seriesIndex][dataPointIndex], true, props.timingOption)
+          const q3 = formatDuration(w.globals.seriesCandleL[seriesIndex][dataPointIndex], true, props.timingOption)
+          const med = formatDuration(w.globals.seriesCandleM[seriesIndex][dataPointIndex], true, props.timingOption)
+          const q1 = formatDuration(w.globals.seriesCandleH[seriesIndex][dataPointIndex], true, props.timingOption)
+          const min = formatDuration(w.globals.seriesCandleO[seriesIndex][dataPointIndex], true, props.timingOption)
           return `
             <div class="pa-2">
               <div>Maximum: ${max}</div>
@@ -194,10 +198,10 @@ export default {
       },
       xaxis: {
         title: {
-          text: `${upperFirst(props.timingOption)} time`,
+          text: `${upperFirst(getTimingOption(props.timingOption))}`,
         },
         labels: {
-          formatter: (value) => formatDuration(value, true)
+          formatter: (value) => formatDuration(value, true, props.timingOption)
         },
       },
     }))
@@ -221,11 +225,11 @@ export default {
         data.push({
           x: sortedTasks[i].name,
           y: [
-            sortedTasks[i][`min${upperFirst(this.timingOption)}Time`],
+            sortedTasks[i][`min${upperFirst(getTimingOption(this.timingOption))}`],
             sortedTasks[i][`${this.timingOption}Quartiles`][0],
             sortedTasks[i][`${this.timingOption}Quartiles`][1],
             sortedTasks[i][`${this.timingOption}Quartiles`][2],
-            sortedTasks[i][`max${upperFirst(this.timingOption)}Time`],
+            sortedTasks[i][`max${upperFirst(getTimingOption(this.timingOption))}`],
           ],
         })
       }
@@ -241,10 +245,10 @@ export default {
         { title: 'Task name', value: 'name' },
         { title: 'Platform', value: 'platform' },
         { title: 'Count', value: 'count' },
-        { title: `Mean ${this.timingOption} time`, value: `mean${upperFirst(this.timingOption)}Time` },
-        { title: `Median ${this.timingOption} time`, value: `median${upperFirst(this.timingOption)}Time` },
-        { title: `Min ${this.timingOption} time`, value: `min${upperFirst(this.timingOption)}Time` },
-        { title: `Max ${this.timingOption} time`, value: `max${upperFirst(this.timingOption)}Time` },
+        { title: `Mean ${formatChartLabels(this.timingOption)}`, value: `mean${upperFirst(getTimingOption(this.timingOption))}` },
+        { title: `Median ${formatChartLabels(this.timingOption)}`, value: `median${upperFirst(getTimingOption(this.timingOption))}` },
+        { title: `Min ${formatChartLabels(this.timingOption)}`, value: `min${upperFirst(getTimingOption(this.timingOption))}` },
+        { title: `Max ${formatChartLabels(this.timingOption)}`, value: `max${upperFirst(getTimingOption(this.timingOption))}` },
       ]
     },
   },
diff --git a/src/components/cylc/analysis/TimeSeries.vue b/src/components/cylc/analysis/TimeSeries.vue
index 40f8bb84a..2c62ae7c0 100644
--- a/src/components/cylc/analysis/TimeSeries.vue
+++ b/src/components/cylc/analysis/TimeSeries.vue
@@ -93,11 +93,14 @@ import {
   difference,
   pick,
   union,
-  uniq,
-  upperFirst
+  uniq
 } from 'lodash'
 import gql from 'graphql-tag'
-import { formatDuration } from '@/utils/tasks'
+import {
+  getTimingOption,
+  formatDuration,
+  formatChartLabels
+} from '@/utils/tasks'
 import {
   mdiDownload,
   mdiRefresh,
@@ -119,7 +122,8 @@ const jobFields = [
   'totalTime',
   'queueTime',
   'runTime',
-  'startedTime'
+  'startedTime',
+  'maxRss'
 ]
 
 /** The one-off query which retrieves historical job timing statistics */
@@ -284,7 +288,7 @@ export default {
             const currentStartedTime = seriesData[job.name].data[job.cyclePoint].startedTime
             // Only add data if this job was run more recently than any existing data
             if (currentStartedTime === undefined || job.startedTime.localeCompare(currentStartedTime) === 1) {
-              time = job[`${this.timingOption}Time`]
+              time = job[getTimingOption(this.timingOption)]
               Object.assign(seriesData[job.name].data[job.cyclePoint], {
                 x: job.cyclePoint,
                 y: time,
@@ -384,7 +388,7 @@ export default {
           forceNiceScale: true,
           min: this.showOrigin ? 0 : undefined,
           title: {
-            text: upperFirst(this.timingOption) + ' time',
+            text: formatChartLabels(this.timingOption),
           },
           labels: {
             formatter: function (value) {
@@ -445,7 +449,7 @@ export default {
         yaxis: {
           tickAmount: 3,
           title: {
-            text: upperFirst(this.timingOption) + ' time',
+            text: formatChartLabels(this.timingOption),
           },
           labels: {
             formatter: function (value) {
diff --git a/src/utils/tasks.js b/src/utils/tasks.js
index bf6cd4734..8fbd4d883 100644
--- a/src/utils/tasks.js
+++ b/src/utils/tasks.js
@@ -17,7 +17,9 @@
 
 import TaskState from '@/model/TaskState.model'
 import { TASK_OUTPUT_NAMES } from '@/model/TaskOutput.model'
-
+import {
+  upperFirst
+} from 'lodash'
 /**
  * States used when the parent is stopped.
  * @type {TaskState[]}
@@ -96,28 +98,80 @@ export function jobMessageOutputs (jobNode) {
  * 00:00:00, rather than undefined
  * @return {string=} Formatted duration
  */
-export function formatDuration (dur, allowZeros = false) {
-  if (dur || (dur === 0 && allowZeros === true)) {
-    const seconds = dur % 60
-    const minutes = ((dur - seconds) / 60) % 60
-    const hours = ((dur - minutes * 60 - seconds) / 3600) % 24
-    const days = (dur - hours * 3600 - minutes * 60 - seconds) / 86400
+ export function formatDuration (value, allowZeros = false, timingOption = false) {
+  // Smaller number of seconds are formatted as HH:MM:SS
+  if (timingOption === 'queue' || timingOption === 'total' || timingOption === 'run' || timingOption === 'cpuTime') {
+    if (value || (value === 0 && allowZeros === true)) {
+      if (timingOption === 'cpuTime') {
+        value = value / 1000
+      }
+      const seconds = value % 60
+      const minutes = ((value - seconds) / 60) % 60
+      const hours = ((value - minutes * 60 - seconds) / 3600) % 24
+      const days = (value - hours * 3600 - minutes * 60 - seconds) / 86400
 
-    let dayss = ''
-    if (days > 0) {
-      dayss = days.toString() + 'd '
-    }
+      let dayss = ''
+      if (days > 0) {
+        dayss = days.toString() + 'd '
+      }
 
-    return dayss +
-      hours.toString().padStart(2, '0') +
-      ':' + minutes.toString().padStart(2, '0') +
-      ':' + Math.round(seconds).toString().padStart(2, '0')
+      return dayss +
+        hours.toString().padStart(2, '0') +
+        ':' + minutes.toString().padStart(2, '0') +
+        ':' + Math.round(seconds).toString().padStart(2, '0')
+    }
+  // Larger number means it's memory
+  } else if (timingOption === 'maxRss') {
+    if (value / 1024 < 5000) {
+      const kilobytes = value / 1024
+      return kilobytes.toPrecision(3) + ' KB'
+    } else if (value / 1048576 < 1000) {
+      const megabytes = value / 1048576
+      return megabytes.toPrecision(3) + ' MB'
+    } else {
+      const gigabytes = value / 1073741824
+      return gigabytes.toPrecision(3) + ' GB'
+    }
   }
   // the meanElapsedTime can be 0/undefined (i.e. task has not run before)
   // return "undefined" rather than a number for these cases
   return undefined
 }
 
+export function formatChartLabels (timingOption) {
+  // Create correct labels for the charts
+  if (timingOption === 'maxRss') {
+    return 'Max RSS'
+  } else {
+    return upperFirst(timingOption) + ' time'
+  }
+}
+
+export function getTimingOption (timingOption) {
+  // Create correct timing option for the charts
+  if (timingOption === 'maxRss' || timingOption === 'cpuTime') {
+    return timingOption
+  } else {
+    return timingOption + 'Time'
+  }
+}
+
+export function formatHeader (statistic, timingOption) {
+  if (timingOption === 'MaxRss' || timingOption === 'CpuTime' || timingOption === 'totalCpuTime') {
+    if (statistic === 'quartiles') {
+      return timingOption.charAt(0).toLowerCase() + timingOption.slice(1)
+    } else {
+      return statistic + timingOption
+    }
+  } else {
+    if (statistic === 'quartiles') {
+      return timingOption.toLowerCase()
+    } else {
+      return statistic + timingOption + 'Time'
+    }
+  }
+}
+
 export function dtMean (taskNode) {
   // Convert to an easily read duration format:
   const dur = taskNode.node?.task?.meanElapsedTime
@@ -140,4 +194,4 @@ export function formatFlowNums (flowNums) {
  */
 export function isFlowNone (flowNums) {
   return Boolean(flowNums && !JSON.parse(flowNums).length)
-}
+}
\ No newline at end of file
diff --git a/src/views/Analysis.vue b/src/views/Analysis.vue
index d83dc805c..65308bd04 100644
--- a/src/views/Analysis.vue
+++ b/src/views/Analysis.vue
@@ -184,7 +184,18 @@ const taskFields = [
   'stdDevQueueTime',
   'minQueueTime',
   'queueQuartiles',
-  'maxQueueTime'
+  'maxQueueTime',
+  'maxMaxRss',
+  'meanMaxRss',
+  'stdDevMaxRss',
+  'minMaxRss',
+  'maxRssQuartiles',
+  'maxCpuTime',
+  'meanCpuTime',
+  'stdDevCpuTime',
+  'minCpuTime',
+  'totalCpuTime',
+  'cpuTimeQuartiles',
 ]
 
 /** The one-off query which retrieves historical task timing statistics */
@@ -359,6 +370,8 @@ export default {
     { value: 'totalTimes', title: 'Total times' },
     { value: 'runTimes', title: 'Run times' },
     { value: 'queueTimes', title: 'Queue times' },
+    { value: 'maxRss', title: 'Max RSS' },
+    { value: 'cpuTime', title: 'CPU Time' },
   ],
 }
 </script>

From 0bdd49ae013c82a5567fb57e83c8a4790f3e88b4 Mon Sep 17 00:00:00 2001
From: "christopher.bennett" <christopher.bennett@metoffice.gov.uk>
Date: Mon, 3 Mar 2025 16:29:53 +0000
Subject: [PATCH 02/16] Time series now working

---
 src/components/cylc/analysis/AnalysisTable.vue | 17 ++++++++++-------
 src/components/cylc/analysis/TimeSeries.vue    |  5 +++--
 src/utils/tasks.js                             |  7 ++++---
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/components/cylc/analysis/AnalysisTable.vue b/src/components/cylc/analysis/AnalysisTable.vue
index 60bd3ef8f..6d948f171 100644
--- a/src/components/cylc/analysis/AnalysisTable.vue
+++ b/src/components/cylc/analysis/AnalysisTable.vue
@@ -139,13 +139,6 @@ export default {
           allowZeros: false,
           timingOption: this.timingOption
         },
-        {
-          title: `Std Dev ${times}`,
-          key: `${formatHeader('stdDev', times)}`,
-          formatter: formatDuration,
-          allowZeros: true,
-          timingOption: this.timingOption
-        },
         {
           title: `Min ${times}`,
           key: `${formatHeader('min', times)}`,
@@ -191,6 +184,16 @@ export default {
           timingOption: this.timingOption
         })
       }
+      // Don't show std dev for cpuTime or maxRss
+      if (this.timingOption !== 'cpuTime' && this.timingOption !== 'maxRss') {
+        timingHeaders.push({
+          title: `Std Dev ${times}`,
+          key: `${formatHeader('stdDev', times)}`,
+          formatter: formatDuration,
+          allowZeros: true,
+          timingOption: this.timingOption
+        })
+      }
       return this.headers.concat(timingHeaders)
     }
   },
diff --git a/src/components/cylc/analysis/TimeSeries.vue b/src/components/cylc/analysis/TimeSeries.vue
index 2c62ae7c0..529aa6e97 100644
--- a/src/components/cylc/analysis/TimeSeries.vue
+++ b/src/components/cylc/analysis/TimeSeries.vue
@@ -123,7 +123,8 @@ const jobFields = [
   'queueTime',
   'runTime',
   'startedTime',
-  'maxRss'
+  'maxRss',
+  'cpuTime'
 ]
 
 /** The one-off query which retrieves historical job timing statistics */
@@ -370,7 +371,7 @@ export default {
               if (!value) {
                 return null
               }
-              const y = formatDuration(value, true)
+              const y = formatDuration(value, true, this.timingOption)
               const platform = this.series[seriesIndex].data[dataPointIndex].platform
               return `${y} (${platform})`
             }
diff --git a/src/utils/tasks.js b/src/utils/tasks.js
index 8fbd4d883..a7b0d9b33 100644
--- a/src/utils/tasks.js
+++ b/src/utils/tasks.js
@@ -98,10 +98,11 @@ export function jobMessageOutputs (jobNode) {
  * 00:00:00, rather than undefined
  * @return {string=} Formatted duration
  */
- export function formatDuration (value, allowZeros = false, timingOption = false) {
-  // Smaller number of seconds are formatted as HH:MM:SS
+export function formatDuration (value, allowZeros = false, timingOption = false) {
+  // Times are formatted as HH:MM:SS
   if (timingOption === 'queue' || timingOption === 'total' || timingOption === 'run' || timingOption === 'cpuTime') {
     if (value || (value === 0 && allowZeros === true)) {
+      // Convert CPU time to seconds
       if (timingOption === 'cpuTime') {
         value = value / 1000
       }
@@ -120,7 +121,7 @@ export function jobMessageOutputs (jobNode) {
         ':' + minutes.toString().padStart(2, '0') +
         ':' + Math.round(seconds).toString().padStart(2, '0')
     }
-  // Larger number means it's memory
+  // If memory value passed
   } else if (timingOption === 'maxRss') {
     if (value / 1024 < 5000) {
       const kilobytes = value / 1024

From f49aa126b5fc0bbf45ceca96b62022a14f4302ee Mon Sep 17 00:00:00 2001
From: "christopher.bennett" <christopher.bennett@metoffice.gov.uk>
Date: Tue, 4 Mar 2025 10:49:35 +0000
Subject: [PATCH 03/16] Fixed Chart Labels

---
 src/components/cylc/analysis/BoxPlot.vue | 2 +-
 src/utils/tasks.js                       | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/cylc/analysis/BoxPlot.vue b/src/components/cylc/analysis/BoxPlot.vue
index 5ec31b326..de805328c 100644
--- a/src/components/cylc/analysis/BoxPlot.vue
+++ b/src/components/cylc/analysis/BoxPlot.vue
@@ -198,7 +198,7 @@ export default {
       },
       xaxis: {
         title: {
-          text: `${upperFirst(getTimingOption(props.timingOption))}`,
+          text: `${formatChartLabels(props.timingOption)}`,
         },
         labels: {
           formatter: (value) => formatDuration(value, true, props.timingOption)
diff --git a/src/utils/tasks.js b/src/utils/tasks.js
index a7b0d9b33..4590de79e 100644
--- a/src/utils/tasks.js
+++ b/src/utils/tasks.js
@@ -143,8 +143,10 @@ export function formatChartLabels (timingOption) {
   // Create correct labels for the charts
   if (timingOption === 'maxRss') {
     return 'Max RSS'
+  } else if (timingOption === 'cpuTime') {
+    return 'CPU Time'
   } else {
-    return upperFirst(timingOption) + ' time'
+    return upperFirst(timingOption) + ' Time'
   }
 }
 

From 75b9adde86949e5d467433932d423735835f2b4d Mon Sep 17 00:00:00 2001
From: "christopher.bennett" <christopher.bennett@metoffice.gov.uk>
Date: Mon, 10 Mar 2025 15:27:37 +0000
Subject: [PATCH 04/16] Added "Total of Totals" for CPU time. Fixed bug memory
 values

---
 .../cylc/analysis/AnalysisTable.vue           | 120 ++++++++++--------
 src/utils/tasks.js                            |  14 +-
 src/views/Analysis.vue                        |  16 ++-
 3 files changed, 89 insertions(+), 61 deletions(-)

diff --git a/src/components/cylc/analysis/AnalysisTable.vue b/src/components/cylc/analysis/AnalysisTable.vue
index 6d948f171..d68d717e4 100644
--- a/src/components/cylc/analysis/AnalysisTable.vue
+++ b/src/components/cylc/analysis/AnalysisTable.vue
@@ -58,7 +58,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import { upperFirst } from 'lodash'
 import {
   formatDuration,
-  formatHeader
+  formatHeader,
+  formatChartLabels,
 } from '@/utils/tasks'
 import {
   initialOptions,
@@ -131,61 +132,74 @@ export default {
   computed: {
     shownHeaders () {
       const times = upperFirst(this.timingOption)
-      const timingHeaders = [
-        {
-          title: `Mean ${times}`,
-          key: `${formatHeader('mean', times)}`,
-          formatter: formatDuration,
-          allowZeros: false,
-          timingOption: this.timingOption
-        },
-        {
-          title: `Min ${times}`,
-          key: `${formatHeader('min', times)}`,
-          formatter: formatDuration,
-          allowZeros: false,
-          timingOption: this.timingOption
-        },
-        {
-          title: `Q1 ${times}`,
-          key: `${formatHeader('quartiles', times)}Quartiles.0`,
-          formatter: formatDuration,
-          allowZeros: false,
-          timingOption: this.timingOption
-        },
-        {
-          title: `Median ${times}`,
-          key: `${formatHeader('quartiles', times)}Quartiles.1`,
-          formatter: formatDuration,
-          allowZeros: false,
-          timingOption: this.timingOption
-        },
-        {
-          title: `Q3 ${times}`,
-          key: `${formatHeader('quartiles', times)}Quartiles.2`,
-          formatter: formatDuration,
-          allowZeros: false,
-          timingOption: this.timingOption
-        },
-        {
-          title: `Max ${times}`,
-          key: `${formatHeader('max', times)}`,
-          formatter: formatDuration,
-          allowZeros: false,
-          timingOption: this.timingOption
+      const timingHeaders = []
+      // Check if there are any stats to show
+      let stats = false
+      for (let i = 0; i < this.tasks.length; i++) {
+        if (this.tasks[i].count > 1) {
+          stats = true
+          break
         }
-      ]
-      if (this.timingOption === 'cpuTime') {
-        timingHeaders.push({
-          title: 'Total CPU Time',
-          key: 'totalCpuTime',
-          formatter: formatDuration,
-          allowZeros: false,
-          timingOption: this.timingOption
-        })
       }
+      if (stats) {
+        timingHeaders.push(
+          {
+            title: `Mean ${formatChartLabels(times)}`,
+            key: `${formatHeader('mean', times)}`,
+            formatter: formatDuration,
+            allowZeros: false,
+            timingOption: this.timingOption
+          },
+          {
+            title: `Min ${formatChartLabels(times)}`,
+            key: `${formatHeader('min', times)}`,
+            formatter: formatDuration,
+            allowZeros: false,
+            timingOption: this.timingOption
+          },
+          {
+            title: `Q1 ${formatChartLabels(times)}`,
+            key: `${formatHeader('quartiles', times)}Quartiles.0`,
+            formatter: formatDuration,
+            allowZeros: false,
+            timingOption: this.timingOption
+          },
+          {
+            title: `Median ${formatChartLabels(times)}`,
+            key: `${formatHeader('quartiles', times)}Quartiles.1`,
+            formatter: formatDuration,
+            allowZeros: false,
+            timingOption: this.timingOption
+          },
+          {
+            title: `Q3 ${formatChartLabels(times)}`,
+            key: `${formatHeader('quartiles', times)}Quartiles.2`,
+            formatter: formatDuration,
+            allowZeros: false,
+            timingOption: this.timingOption
+          },
+          {
+            title: `Max ${formatChartLabels(times)}`,
+            key: `${formatHeader('max', times)}`,
+            formatter: formatDuration,
+            allowZeros: false,
+            timingOption: this.timingOption
+          }
+        )
+      } else {
+        timingHeaders.push(
+          {
+            title: `${formatChartLabels(times)}`,
+            key: `${formatHeader('mean', times)}`,
+            formatter: formatDuration,
+            allowZeros: false,
+            timingOption: this.timingOption
+          }
+        )
+      }
+
       // Don't show std dev for cpuTime or maxRss
-      if (this.timingOption !== 'cpuTime' && this.timingOption !== 'maxRss') {
+      if (this.timingOption !== 'cpuTime' && this.timingOption !== 'maxRss' && stats) {
         timingHeaders.push({
           title: `Std Dev ${times}`,
           key: `${formatHeader('stdDev', times)}`,
diff --git a/src/utils/tasks.js b/src/utils/tasks.js
index 4590de79e..782532ab7 100644
--- a/src/utils/tasks.js
+++ b/src/utils/tasks.js
@@ -123,14 +123,14 @@ export function formatDuration (value, allowZeros = false, timingOption = false)
     }
   // If memory value passed
   } else if (timingOption === 'maxRss') {
-    if (value / 1024 < 5000) {
-      const kilobytes = value / 1024
+    if (value < 5000) {
+      const kilobytes = value
       return kilobytes.toPrecision(3) + ' KB'
-    } else if (value / 1048576 < 1000) {
-      const megabytes = value / 1048576
+    } else if (value / 1024 < 1000) {
+      const megabytes = value / 1024
       return megabytes.toPrecision(3) + ' MB'
     } else {
-      const gigabytes = value / 1073741824
+      const gigabytes = value / 1048576
       return gigabytes.toPrecision(3) + ' GB'
     }
   }
@@ -141,9 +141,9 @@ export function formatDuration (value, allowZeros = false, timingOption = false)
 
 export function formatChartLabels (timingOption) {
   // Create correct labels for the charts
-  if (timingOption === 'maxRss') {
+  if (timingOption === 'maxRss' || timingOption === 'MaxRss') {
     return 'Max RSS'
-  } else if (timingOption === 'cpuTime') {
+  } else if (timingOption === 'cpuTime' || timingOption === 'CpuTime') {
     return 'CPU Time'
   } else {
     return upperFirst(timingOption) + ' Time'
diff --git a/src/views/Analysis.vue b/src/views/Analysis.vue
index 65308bd04..65e3b6fcb 100644
--- a/src/views/Analysis.vue
+++ b/src/views/Analysis.vue
@@ -17,6 +17,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 <template>
   <div class="c-analysis">
+    <v-skeleton-loader
+      v-if="!Object.keys(callback.tasks).length"
+      type="table"
+      class="align-content-start"
+    />
     <v-container
       fluid
       class="pa-2"
@@ -109,6 +114,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
             <v-icon :icon="$options.icons.mdiRefresh" />
             <v-tooltip>Refresh data</v-tooltip>
           </v-btn>
+          <v-chip
+            location="right"
+            v-if="timingOption === 'cpuTime'"
+          >
+            Total CPU Time Of Suite {{ formatDuration(tasks[0].totalOfTotals, false, 'cpuTime') }}
+          </v-chip>
           <!-- Box plot sort input teleports here -->
         </v-defaults-provider>
       </div>
@@ -144,6 +155,7 @@ import {
   pick,
 } from 'lodash'
 import gql from 'graphql-tag'
+import { formatDuration } from '@/utils/tasks'
 import graphqlMixin from '@/mixins/graphql'
 import {
   initialOptions,
@@ -196,6 +208,7 @@ const taskFields = [
   'minCpuTime',
   'totalCpuTime',
   'cpuTimeQuartiles',
+  'totalOfTotals'
 ]
 
 /** The one-off query which retrieves historical task timing statistics */
@@ -356,7 +369,8 @@ export default {
         this.callback.onAdded(ret.data)
       },
       200 // only re-run this once every 0.2 seconds
-    )
+    ),
+    formatDuration
   },
 
   icons: {

From 33f24db87606efa47e74912961939bbaae9cfa68 Mon Sep 17 00:00:00 2001
From: "christopher.bennett" <christopher.bennett@metoffice.gov.uk>
Date: Wed, 12 Mar 2025 08:49:32 +0000
Subject: [PATCH 05/16] Time series Y axis labels fixed. Tests added

---
 src/components/cylc/analysis/TimeSeries.vue |  8 +-
 src/services/mock/json/analysisQuery.json   | 83 +++++++++++++++++----
 src/utils/tasks.js                          |  5 +-
 tests/e2e/specs/analysis.cy.js              | 83 +++++++++++++++++++++
 4 files changed, 159 insertions(+), 20 deletions(-)

diff --git a/src/components/cylc/analysis/TimeSeries.vue b/src/components/cylc/analysis/TimeSeries.vue
index 529aa6e97..0362210a8 100644
--- a/src/components/cylc/analysis/TimeSeries.vue
+++ b/src/components/cylc/analysis/TimeSeries.vue
@@ -392,9 +392,7 @@ export default {
             text: formatChartLabels(this.timingOption),
           },
           labels: {
-            formatter: function (value) {
-              return formatDuration(value, true)
-            }
+            formatter: (value) => formatDuration(value, true, this.timingOption)
           },
         },
       }
@@ -453,9 +451,7 @@ export default {
             text: formatChartLabels(this.timingOption),
           },
           labels: {
-            formatter: function (value) {
-              return formatDuration(value, true)
-            }
+            formatter: (value) => formatDuration(value, true, this.timingOption)
           },
           min: this.showOrigin ? 0 : undefined
         },
diff --git a/src/services/mock/json/analysisQuery.json b/src/services/mock/json/analysisQuery.json
index 583d20a6e..fd4da6e76 100644
--- a/src/services/mock/json/analysisQuery.json
+++ b/src/services/mock/json/analysisQuery.json
@@ -19,7 +19,19 @@
           "stdDevQueueTime": 3,
           "minQueueTime": 9,
           "queueQuartiles": [10, 11, 13],
-          "maxQueueTime": 14
+          "maxQueueTime": 14,
+          "maxMaxRss": 200000,
+          "meanMaxRss": 100000 ,
+          "stdDevMaxRss": 5,
+          "minMaxRss": 50000,
+          "maxRssQuartiles": [55000, 100000, 150000],
+          "maxCpuTime": 30000,
+          "meanCpuTime": 20000,
+          "stdDevCpuTime": 5,
+          "minCpuTime": 10000,
+          "totalCpuTime": 200000,
+          "cpuTimeQuartiles": [10000, 20000, 30000],
+          "totalOfTotals": 420000
         },
         {
           "name": "eventually_succeeded",
@@ -39,7 +51,19 @@
           "stdDevQueueTime": 2,
           "minQueueTime": 8,
           "queueQuartiles": [9, 10, 11],
-          "maxQueueTime": 11
+          "maxQueueTime": 11,
+          "maxMaxRss": 300000,
+          "meanMaxRss": 200000 ,
+          "stdDevMaxRss": 5,
+          "minMaxRss": 60000,
+          "maxRssQuartiles": [66000, 200000, 250000],
+          "maxCpuTime": 20000,
+          "meanCpuTime": 10000,
+          "stdDevCpuTime": 5,
+          "minCpuTime": 1000,
+          "totalCpuTime": 200000,
+          "cpuTimeQuartiles": [10000, 11000, 13000],
+          "totalOfTotals": 420000
         },
         {
           "name": "waiting",
@@ -59,7 +83,19 @@
           "stdDevQueueTime": 3,
           "minQueueTime": 10,
           "queueQuartiles": [10, 12, 13],
-          "maxQueueTime": 14
+          "maxQueueTime": 14,
+          "maxMaxRss": 400000,
+          "meanMaxRss": 300000 ,
+          "stdDevMaxRss": 5,
+          "minMaxRss": 70000,
+          "maxRssQuartiles": [77000, 300000, 350000],
+          "maxCpuTime": 30000,
+          "meanCpuTime": 20000,
+          "stdDevCpuTime": 5,
+          "minCpuTime": 9000,
+          "totalCpuTime": 200000,
+          "cpuTimeQuartiles": [10000, 11000, 13000],
+          "totalOfTotals": 420000
         }
       ]
     }
@@ -74,7 +110,9 @@
           "totalTime": 60,
           "queueTime": 2,
           "runTime": 58,
-          "startedTime": "2023-01-01T00:00:00Z"
+          "startedTime": "2023-01-01T00:00:00Z",
+          "maxRss": 1000,
+          "cpuTime": 50000
         },
         {
           "name": "succeeded",
@@ -83,7 +121,9 @@
           "totalTime": 61,
           "queueTime": 2,
           "runTime": 59,
-          "startedTime": "2023-01-01T01:00:00Z"
+          "startedTime": "2023-01-01T01:00:00Z",
+          "maxRss": 1000,
+          "cpuTime": 50000
         },
         {
           "name": "succeeded",
@@ -92,7 +132,9 @@
           "totalTime": 62,
           "queueTime": 2,
           "runTime": 60,
-          "startedTime": "2023-01-01T02:00:00Z"
+          "startedTime": "2023-01-01T02:00:00Z",
+          "maxRss": 1000,
+          "cpuTime": 50000
         },
         {
           "name": "eventually_succeeded",
@@ -101,7 +143,9 @@
           "totalTime": 41,
           "queueTime": 2,
           "runTime": 39,
-          "startedTime": "2023-01-01T01:00:00Z"
+          "startedTime": "2023-01-01T01:00:00Z",
+          "maxRss": 1000,
+          "cpuTime": 50000
         },
         {
           "name": "eventually_succeeded",
@@ -110,7 +154,9 @@
           "totalTime": 40,
           "queueTime": 2,
           "runTime": 38,
-          "startedTime": "2023-01-01T00:00:00Z"
+          "startedTime": "2023-01-01T00:00:00Z",
+          "maxRss": 1000,
+          "cpuTime": 50000
         },
         {
           "name": "eventually_succeeded",
@@ -119,7 +165,9 @@
           "totalTime": 42,
           "queueTime": 2,
           "runTime": 40,
-          "startedTime": "2023-01-01T02:00:00Z"
+          "startedTime": "2023-01-01T02:00:00Z",
+          "maxRss": 1000,
+          "cpuTime": 50000
         },
         {
           "name": "waiting",
@@ -128,7 +176,9 @@
           "totalTime": 50,
           "queueTime": 2,
           "runTime": 48,
-          "startedTime": "2023-01-01T00:00:00Z"
+          "startedTime": "2023-01-01T00:00:00Z",
+          "maxRss": 1000,
+          "cpuTime": 50000
         },
         {
           "name": "waiting",
@@ -137,7 +187,10 @@
           "totalTime": 4,
           "queueTime": 2,
           "runTime": 2,
-          "startedTime": "2023-01-01T02:01:00Z"},
+          "startedTime": "2023-01-01T02:01:00Z",
+          "maxRss": 1000,
+          "cpuTime": 50000
+        },
         {
           "name": "waiting",
           "platform": "platform_2",
@@ -145,7 +198,9 @@
           "totalTime": 52,
           "queueTime": 2,
           "runTime": 50,
-          "startedTime": "2023-01-01T02:02:00Z"
+          "startedTime": "2023-01-01T02:02:00Z",
+          "maxRss": 1000,
+          "cpuTime": 50000
         },
         {
           "name": "waiting",
@@ -154,7 +209,9 @@
           "totalTime": 3,
           "queueTime": 2,
           "runTime": 1,
-          "startedTime": "2023-01-01T02:00:00Z"
+          "startedTime": "2023-01-01T02:00:00Z",
+          "maxRss": 1000,
+          "cpuTime": 50000
         }
       ]
     }
diff --git a/src/utils/tasks.js b/src/utils/tasks.js
index 782532ab7..e88c441b3 100644
--- a/src/utils/tasks.js
+++ b/src/utils/tasks.js
@@ -136,6 +136,9 @@ export function formatDuration (value, allowZeros = false, timingOption = false)
   }
   // the meanElapsedTime can be 0/undefined (i.e. task has not run before)
   // return "undefined" rather than a number for these cases
+  console.log('got here somehow')
+  console.log(value)
+  console.log(timingOption)
   return undefined
 }
 
@@ -197,4 +200,4 @@ export function formatFlowNums (flowNums) {
  */
 export function isFlowNone (flowNums) {
   return Boolean(flowNums && !JSON.parse(flowNums).length)
-}
\ No newline at end of file
+}
diff --git a/tests/e2e/specs/analysis.cy.js b/tests/e2e/specs/analysis.cy.js
index a526f724e..506f7e8a4 100644
--- a/tests/e2e/specs/analysis.cy.js
+++ b/tests/e2e/specs/analysis.cy.js
@@ -135,6 +135,20 @@ describe('Analysis view', () => {
         cy
           .get('.c-analysis table > tbody > tr')
           .should('have.length', numTasks)
+        // Show Max RSS
+        cy
+          .get('#c-analysis-filter-task-timings')
+          .click({ force: true })
+        cy
+          .get('.v-list-item')
+          .contains('Max RSS')
+          .click({ force: true })
+        cy
+          .get('td')
+          .contains('MB')
+        cy
+          .get('.c-analysis table > tbody > tr')
+          .should('have.length', numTasks)
       })
 
       it('Should filter by task name, platform and timings', () => {
@@ -207,6 +221,43 @@ describe('Analysis view', () => {
           .should('have.length', 1)
           .should('be.visible')
       })
+      it('Should show Max RSS', () => {
+        cy
+          .get('#c-analysis-filter-task-timings')
+          .click({ force: true })
+        cy
+          .get('.v-list-item')
+          .contains('Max RSS')
+          .click({ force: true })
+        cy
+          .get('td')
+          .contains('MB')
+          .should('be.visible')
+        cy
+          .get('.c-analysis table > tbody > tr')
+          .should('have.length', numTasks)
+          .should('be.visible')
+        cy
+          .get('.v-chip__content')
+          .should('not.exist')
+      })
+      it('Should show CPU Time', () => {
+        cy
+          .get('#c-analysis-filter-task-timings')
+          .click({ force: true })
+        cy
+          .get('.v-list-item')
+          .contains('CPU Time')
+          .click({ force: true })
+        cy
+          .get('td')
+          .contains('00:00:10')
+          .should('be.visible')
+        cy
+          .get('.v-chip__content')
+          .should('exist')
+          .contains('CPU Time')
+      })
     })
   })
 
@@ -232,6 +283,38 @@ describe('Analysis view', () => {
         .get('.vue-apexcharts')
         .should('not.exist')
     })
+    it('Should show Max RSS', () => {
+      cy
+        .get('#c-analysis-filter-task-timings')
+        .click({ force: true })
+      cy
+        .get('.v-list-item')
+        .contains('Max RSS')
+        .click({ force: true })
+      cy
+        .get('.apexcharts-yaxis-label')
+        .should('have.length', numTasks)
+      cy
+        .get('.apexcharts-xaxis-label')
+        .contains('MB')
+        .should('be.visible')
+    })
+    it('Should show CPU Time', () => {
+      cy
+        .get('#c-analysis-filter-task-timings')
+        .click({ force: true })
+      cy
+        .get('.v-list-item')
+        .contains('CPU Time')
+        .click({ force: true })
+      cy
+        .get('.apexcharts-yaxis-label')
+        .should('have.length', numTasks)
+      cy
+        .get('.apexcharts-xaxis-label')
+        .contains('00:00:00')
+        .should('be.visible')
+    })
 
     it('refreshes without getting bogus apexcharts error', () => {
       // https://github.com/apexcharts/vue3-apexcharts/issues/79

From 00c5c56469a5ff300aab9d47d9c166165bd7441a Mon Sep 17 00:00:00 2001
From: "christopher.bennett" <christopher.bennett@metoffice.gov.uk>
Date: Wed, 12 Mar 2025 09:17:04 +0000
Subject: [PATCH 06/16] Removed console.log commands

---
 src/utils/tasks.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/utils/tasks.js b/src/utils/tasks.js
index e88c441b3..17ee28d24 100644
--- a/src/utils/tasks.js
+++ b/src/utils/tasks.js
@@ -136,9 +136,6 @@ export function formatDuration (value, allowZeros = false, timingOption = false)
   }
   // the meanElapsedTime can be 0/undefined (i.e. task has not run before)
   // return "undefined" rather than a number for these cases
-  console.log('got here somehow')
-  console.log(value)
-  console.log(timingOption)
   return undefined
 }
 

From c5f8cb4ae37fcd55ca9c988960b488b7f5e0a4b7 Mon Sep 17 00:00:00 2001
From: "christopher.bennett" <christopher.bennett@metoffice.gov.uk>
Date: Wed, 12 Mar 2025 11:18:26 +0000
Subject: [PATCH 07/16] Updated formatDuration to properly handle the lack of
 optional arguments

---
 src/utils/tasks.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/utils/tasks.js b/src/utils/tasks.js
index 17ee28d24..378f4c521 100644
--- a/src/utils/tasks.js
+++ b/src/utils/tasks.js
@@ -98,9 +98,9 @@ export function jobMessageOutputs (jobNode) {
  * 00:00:00, rather than undefined
  * @return {string=} Formatted duration
  */
-export function formatDuration (value, allowZeros = false, timingOption = false) {
+export function formatDuration (value, allowZeros = false, timingOption = true) {
   // Times are formatted as HH:MM:SS
-  if (timingOption === 'queue' || timingOption === 'total' || timingOption === 'run' || timingOption === 'cpuTime') {
+  if (timingOption === 'queue' || timingOption === 'total' || timingOption === 'run' || timingOption === 'cpuTime' || timingOption === true) {
     if (value || (value === 0 && allowZeros === true)) {
       // Convert CPU time to seconds
       if (timingOption === 'cpuTime') {

From d9c8ed3f8a799c010ff15017867b324a36bc0d03 Mon Sep 17 00:00:00 2001
From: "christopher.bennett" <christopher.bennett@metoffice.gov.uk>
Date: Wed, 2 Apr 2025 15:14:04 +0100
Subject: [PATCH 08/16] Adding towncrier fragment

---
 changes.d/2100.feat.md | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changes.d/2100.feat.md

diff --git a/changes.d/2100.feat.md b/changes.d/2100.feat.md
new file mode 100644
index 000000000..9a40cc43d
--- /dev/null
+++ b/changes.d/2100.feat.md
@@ -0,0 +1 @@
+Adding CPU time and Max RSS to Analysis Tools

From 1c7aca8617abcfb72aa9907e6c77d9704367ea6d Mon Sep 17 00:00:00 2001
From: Christopher Bennett <christopher.bennett@metoffice.gov.uk>
Date: Fri, 11 Jul 2025 14:26:04 +0100
Subject: [PATCH 09/16] Update src/views/Analysis.vue

Remove reference to 'suite'

Co-authored-by: Ronnie Dutta <61982285+MetRonnie@users.noreply.github.com>
---
 src/views/Analysis.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/Analysis.vue b/src/views/Analysis.vue
index 78c082e72..d2c775e43 100644
--- a/src/views/Analysis.vue
+++ b/src/views/Analysis.vue
@@ -117,7 +117,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
             location="right"
             v-if="timingOption === 'cpuTime'"
           >
-            Total CPU Time Of Suite {{ formatDuration(tasks[0].totalOfTotals, false, 'cpuTime') }}
+            Total CPU Time: {{ formatDuration(tasks[0].totalOfTotals, false, 'cpuTime') }}
           </v-chip>
           <!-- Box plot sort input teleports here -->
         </v-defaults-provider>

From 36db262ed5a61045952bca9d7fb4b8869c199c44 Mon Sep 17 00:00:00 2001
From: "christopher.bennett" <christopher.bennett@metoffice.gov.uk>
Date: Fri, 11 Jul 2025 15:22:25 +0100
Subject: [PATCH 10/16] Refactoring loop

---
 src/components/cylc/analysis/AnalysisTable.vue | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/components/cylc/analysis/AnalysisTable.vue b/src/components/cylc/analysis/AnalysisTable.vue
index d68d717e4..d486a5b62 100644
--- a/src/components/cylc/analysis/AnalysisTable.vue
+++ b/src/components/cylc/analysis/AnalysisTable.vue
@@ -134,13 +134,7 @@ export default {
       const times = upperFirst(this.timingOption)
       const timingHeaders = []
       // Check if there are any stats to show
-      let stats = false
-      for (let i = 0; i < this.tasks.length; i++) {
-        if (this.tasks[i].count > 1) {
-          stats = true
-          break
-        }
-      }
+      const stats = this.tasks.some((task) => task.count > 1)
       if (stats) {
         timingHeaders.push(
           {

From 3de05187ad197efa6bc69899f1b1da83f3eb67d6 Mon Sep 17 00:00:00 2001
From: Christopher Bennett <christopher.bennett@metoffice.gov.uk>
Date: Fri, 11 Jul 2025 15:25:17 +0100
Subject: [PATCH 11/16] Update src/views/Analysis.vue

Co-authored-by: Ronnie Dutta <61982285+MetRonnie@users.noreply.github.com>
---
 src/views/Analysis.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/Analysis.vue b/src/views/Analysis.vue
index d2c775e43..6a445136c 100644
--- a/src/views/Analysis.vue
+++ b/src/views/Analysis.vue
@@ -23,6 +23,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
       class="align-content-start"
     />
     <v-container
+      v-else
       fluid
       class="pa-2"
     >

From be7836f4834b64904fbb99975ffc9d30917baa10 Mon Sep 17 00:00:00 2001
From: "christopher.bennett" <christopher.bennett@metoffice.gov.uk>
Date: Mon, 14 Jul 2025 11:08:40 +0100
Subject: [PATCH 12/16] Adding unit test coverage

---
 tests/component/specs/boxPlot.cy.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/tests/component/specs/boxPlot.cy.js b/tests/component/specs/boxPlot.cy.js
index 2b770d6e8..eddcfe112 100644
--- a/tests/component/specs/boxPlot.cy.js
+++ b/tests/component/specs/boxPlot.cy.js
@@ -113,4 +113,16 @@ describe('BoxPlot', () => {
       .get('.apexcharts-yaxis title')
       .should('have.length', 3)
   })
+  it('shows tooltip', () => {
+    // see: https://on.cypress.io/mounting-vue
+    cy.mount(BoxPlot, merge(mountOpts, {
+      props: {
+        tasks: [task1, task2],
+      },
+    }))
+    cy.get('.vue-apexcharts')
+      .trigger('mousemove', { clientX: 100, clientY: 100 })
+      .get('.apexcharts-tooltip')
+      .should('be.visible')
+  })
 })

From e8133d0b01e821ea663c32f18a8a54a4a361e5ff Mon Sep 17 00:00:00 2001
From: Christopher Bennett <christopher.bennett@metoffice.gov.uk>
Date: Fri, 18 Jul 2025 11:27:21 +0100
Subject: [PATCH 13/16] Update src/utils/tasks.js

Conciseness

Co-authored-by: Ronnie Dutta <61982285+MetRonnie@users.noreply.github.com>
---
 src/utils/tasks.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils/tasks.js b/src/utils/tasks.js
index 378f4c521..1ecda49ef 100644
--- a/src/utils/tasks.js
+++ b/src/utils/tasks.js
@@ -141,7 +141,7 @@ export function formatDuration (value, allowZeros = false, timingOption = true)
 
 export function formatChartLabels (timingOption) {
   // Create correct labels for the charts
-  if (timingOption === 'maxRss' || timingOption === 'MaxRss') {
+  if (timingOption.toLowerCase() === 'maxrss') {
     return 'Max RSS'
   } else if (timingOption === 'cpuTime' || timingOption === 'CpuTime') {
     return 'CPU Time'

From a216ce31050639887ca01254c5badb9d52d8cb95 Mon Sep 17 00:00:00 2001
From: "christopher.bennett" <christopher.bennett@metoffice.gov.uk>
Date: Wed, 23 Jul 2025 09:49:10 +0100
Subject: [PATCH 14/16] Code review changes

---
 src/utils/tasks.js     | 35 ++++++++++++++++++++---------------
 src/views/Analysis.vue |  4 ++++
 2 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/src/utils/tasks.js b/src/utils/tasks.js
index 1ecda49ef..302e84daf 100644
--- a/src/utils/tasks.js
+++ b/src/utils/tasks.js
@@ -99,6 +99,9 @@ export function jobMessageOutputs (jobNode) {
  * @return {string=} Formatted duration
  */
 export function formatDuration (value, allowZeros = false, timingOption = true) {
+  if (timingOption === 'maxRss') {
+    return formatRSS(value)
+  }
   // Times are formatted as HH:MM:SS
   if (timingOption === 'queue' || timingOption === 'total' || timingOption === 'run' || timingOption === 'cpuTime' || timingOption === true) {
     if (value || (value === 0 && allowZeros === true)) {
@@ -121,22 +124,24 @@ export function formatDuration (value, allowZeros = false, timingOption = true)
         ':' + minutes.toString().padStart(2, '0') +
         ':' + Math.round(seconds).toString().padStart(2, '0')
     }
-  // If memory value passed
-  } else if (timingOption === 'maxRss') {
-    if (value < 5000) {
-      const kilobytes = value
-      return kilobytes.toPrecision(3) + ' KB'
-    } else if (value / 1024 < 1000) {
-      const megabytes = value / 1024
-      return megabytes.toPrecision(3) + ' MB'
-    } else {
-      const gigabytes = value / 1048576
-      return gigabytes.toPrecision(3) + ' GB'
-    }
+    // the meanElapsedTime can be 0/undefined (i.e. task has not run before)
+    // return "undefined" rather than a number for these cases
+    return undefined
+  }
+}
+
+function formatRSS (value) {
+  // Format the max RSS value in a human-readable format
+  if (value < 5000) {
+    const kilobytes = value
+    return kilobytes.toPrecision(3) + ' KB'
+  } else if (value / 1024 < 1000) {
+    const megabytes = value / 1024
+    return megabytes.toPrecision(3) + ' MB'
+  } else {
+    const gigabytes = value / 1048576
+    return gigabytes.toPrecision(3) + ' GB'
   }
-  // the meanElapsedTime can be 0/undefined (i.e. task has not run before)
-  // return "undefined" rather than a number for these cases
-  return undefined
 }
 
 export function formatChartLabels (timingOption) {
diff --git a/src/views/Analysis.vue b/src/views/Analysis.vue
index 8e62e2155..f07c210dd 100644
--- a/src/views/Analysis.vue
+++ b/src/views/Analysis.vue
@@ -118,6 +118,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
             <v-icon :icon="$options.icons.mdiRefresh" />
             <v-tooltip>Refresh data</v-tooltip>
           </v-btn>
+          <v-chip location="right" v-if="timingOption === 'cpuTime'">
+            Total CPU Time: {{
+            formatDuration(tasks[0].totalOfTotals, false, 'cpuTime') }}
+          </v-chip>
           <v-btn>
             <v-icon :icon="$options.icons.mdiInformationOutline" />
             <v-tooltip>

From 7812385c4dc85f64a94313161f0ad5966436bbaa Mon Sep 17 00:00:00 2001
From: "christopher.bennett" <christopher.bennett@metoffice.gov.uk>
Date: Thu, 31 Jul 2025 16:05:39 +0100
Subject: [PATCH 15/16] Changed table view behaviour to allow zeros

---
 src/components/cylc/analysis/AnalysisTable.vue | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/components/cylc/analysis/AnalysisTable.vue b/src/components/cylc/analysis/AnalysisTable.vue
index d486a5b62..b698074bf 100644
--- a/src/components/cylc/analysis/AnalysisTable.vue
+++ b/src/components/cylc/analysis/AnalysisTable.vue
@@ -141,42 +141,42 @@ export default {
             title: `Mean ${formatChartLabels(times)}`,
             key: `${formatHeader('mean', times)}`,
             formatter: formatDuration,
-            allowZeros: false,
+            allowZeros: true,
             timingOption: this.timingOption
           },
           {
             title: `Min ${formatChartLabels(times)}`,
             key: `${formatHeader('min', times)}`,
             formatter: formatDuration,
-            allowZeros: false,
+            allowZeros: true,
             timingOption: this.timingOption
           },
           {
             title: `Q1 ${formatChartLabels(times)}`,
             key: `${formatHeader('quartiles', times)}Quartiles.0`,
             formatter: formatDuration,
-            allowZeros: false,
+            allowZeros: true,
             timingOption: this.timingOption
           },
           {
             title: `Median ${formatChartLabels(times)}`,
             key: `${formatHeader('quartiles', times)}Quartiles.1`,
             formatter: formatDuration,
-            allowZeros: false,
+            allowZeros: true,
             timingOption: this.timingOption
           },
           {
             title: `Q3 ${formatChartLabels(times)}`,
             key: `${formatHeader('quartiles', times)}Quartiles.2`,
             formatter: formatDuration,
-            allowZeros: false,
+            allowZeros: true,
             timingOption: this.timingOption
           },
           {
             title: `Max ${formatChartLabels(times)}`,
             key: `${formatHeader('max', times)}`,
             formatter: formatDuration,
-            allowZeros: false,
+            allowZeros: true,
             timingOption: this.timingOption
           }
         )
@@ -186,7 +186,7 @@ export default {
             title: `${formatChartLabels(times)}`,
             key: `${formatHeader('mean', times)}`,
             formatter: formatDuration,
-            allowZeros: false,
+            allowZeros: true,
             timingOption: this.timingOption
           }
         )

From 51b0c2b25fc8a31682dc02798006654955d82fb5 Mon Sep 17 00:00:00 2001
From: "christopher.bennett" <christopher.bennett@metoffice.gov.uk>
Date: Thu, 11 Sep 2025 16:01:29 +0100
Subject: [PATCH 16/16] Add memory allocation

---
 src/components/cylc/analysis/BoxPlot.vue | 29 ++++++++++++++++++------
 src/views/Analysis.vue                   |  3 ++-
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/src/components/cylc/analysis/BoxPlot.vue b/src/components/cylc/analysis/BoxPlot.vue
index 306124b91..5eaa91984 100644
--- a/src/components/cylc/analysis/BoxPlot.vue
+++ b/src/components/cylc/analysis/BoxPlot.vue
@@ -169,20 +169,34 @@ export default {
       },
       tooltip: {
         custom ({ seriesIndex, dataPointIndex, w }) {
-          const max = formatDuration(w.globals.seriesCandleC[seriesIndex][dataPointIndex], true, props.timingOption)
-          const q3 = formatDuration(w.globals.seriesCandleL[seriesIndex][dataPointIndex], true, props.timingOption)
-          const med = formatDuration(w.globals.seriesCandleM[seriesIndex][dataPointIndex], true, props.timingOption)
-          const q1 = formatDuration(w.globals.seriesCandleH[seriesIndex][dataPointIndex], true, props.timingOption)
-          const min = formatDuration(w.globals.seriesCandleO[seriesIndex][dataPointIndex], true, props.timingOption)
-          return `
+          const max = formatDuration(w.globals.seriesCandleC[0][dataPointIndex], true, props.timingOption)
+          const q3 = formatDuration(w.globals.seriesCandleL[0][dataPointIndex], true, props.timingOption)
+          const med = formatDuration(w.globals.seriesCandleM[0][dataPointIndex], true, props.timingOption)
+          const q1 = formatDuration(w.globals.seriesCandleH[0][dataPointIndex], true, props.timingOption)
+          const min = formatDuration(w.globals.seriesCandleO[0][dataPointIndex], true, props.timingOption)
+          if (props.timingOption === 'maxRss') {
+            const memAlloc = formatDuration(w.globals.series[0][dataPointIndex], true, props.timingOption)
+            return `
             <div class="pa-2">
               <div>Maximum: ${max}</div>
               <div>Q3: ${q3} </div>
               <div>Median: ${med}</div>
               <div>Q1: ${q1}</div>
               <div>Minimum: ${min}</div>
+              <div>Memory Allocated: ${memAlloc}</div>
             </div>
           `
+          } else {
+            return `
+            <div class="pa-2">
+              <div>Maximum: ${max}</div>
+              <div>Q3: ${q3} </div>
+              <div>Median: ${med}</div>
+              <div>Q1: ${q1}</div>
+              <div>Minimum: ${min}</div>
+            </div>
+          `
+          }
         },
       },
       plotOptions: {
@@ -230,7 +244,8 @@ export default {
             sortedTasks[i][`${this.timingOption}Quartiles`][1],
             sortedTasks[i][`${this.timingOption}Quartiles`][2],
             sortedTasks[i][`max${upperFirst(getTimingOption(this.timingOption))}`],
-          ],
+            sortedTasks[i].memAlloc
+          ]
         })
       }
       return [{ data }]
diff --git a/src/views/Analysis.vue b/src/views/Analysis.vue
index f07c210dd..f27382e4c 100644
--- a/src/views/Analysis.vue
+++ b/src/views/Analysis.vue
@@ -218,7 +218,8 @@ const taskFields = [
   'minCpuTime',
   'totalCpuTime',
   'cpuTimeQuartiles',
-  'totalOfTotals'
+  'totalOfTotals',
+  'memAlloc'
 ]
 
 /** The one-off query which retrieves historical task timing statistics */