From f1cb4443aede6d4657bdc3396c8914d3a9f4fa93 Mon Sep 17 00:00:00 2001
From: Alejandro Acuña <alejandro.acuna@aluvisagrupo.com>
Date: Mon, 11 Nov 2024 13:09:35 +0000
Subject: [PATCH] bck

---
 libraries/server/src/art/servers/controller/ControllerProcessInformation.java |   27 ++++-----------------------
 1 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/libraries/server/src/art/servers/controller/ControllerProcessInformation.java b/libraries/server/src/art/servers/controller/ControllerProcessInformation.java
index 1706b2a..358de31 100644
--- a/libraries/server/src/art/servers/controller/ControllerProcessInformation.java
+++ b/libraries/server/src/art/servers/controller/ControllerProcessInformation.java
@@ -169,6 +169,8 @@
             status.memory.nonheapMemoryUsage_used = nonheapMemoryUsage.getUsed();
             status.memory.nonheapMemoryUsage_committed = nonheapMemoryUsage.getCommitted();
             
+            status.memory.usedMemory = status.memory.heapMemoryUsage_committed +  status.memory.nonheapMemoryUsage_used; // status.memory.heapMemoryUsage_init
+            
          }
         catch (Exception e)
         {
@@ -185,27 +187,6 @@
             ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
             if (status.thread == null) status.thread = new ApplicationStatusThread();
             status.thread.timestamp = timestamp;
-            
-            long[] threadsid = threadMXBean.getAllThreadIds();
-            long threadCpuTime = 0;
-            long threadUserTime = 0;
-
-            for (long threadid : threadsid)
-            {
-                try
-                {   
-                    long currentThreadCpuTime = threadMXBean.getThreadCpuTime(threadid);
-                    long currentThreadUserTime = threadMXBean.getThreadUserTime(threadid);
-                    if (currentThreadCpuTime > 0) threadCpuTime = threadCpuTime + currentThreadCpuTime;
-                    if (currentThreadUserTime > 0) threadUserTime = threadUserTime + currentThreadUserTime;
-                }
-                catch (Exception e)
-                {
-                }
-            }
-            
-            status.thread.threadCpuTime = threadCpuTime;
-            status.thread.threadUserTime = threadUserTime;
             status.thread.totalStartedThreadCount = threadMXBean.getTotalStartedThreadCount();
             status.thread.threadCount = threadMXBean.getThreadCount();
             status.thread.peakThreadCount = threadMXBean.getPeakThreadCount();
@@ -259,11 +240,11 @@
             status.system.freePhysicalMemorySize = operatingSystemMXBean.getFreePhysicalMemorySize();
             status.system.freeSwapSpaceSize = operatingSystemMXBean.getFreeSwapSpaceSize();
             status.system.processCpuLoad = operatingSystemMXBean.getProcessCpuLoad();
-            status.system.processCpuTime = operatingSystemMXBean.getProcessCpuTime();
+            status.system.processCpuTime = operatingSystemMXBean.getProcessCpuTime() / operatingSystemMXBean.getAvailableProcessors();
             status.system.systemCpuLoad = operatingSystemMXBean.getSystemCpuLoad();
             status.system.totalPhysicalMemorySize = operatingSystemMXBean.getTotalPhysicalMemorySize();
             status.system.totalSwapSpaceSize = operatingSystemMXBean.getTotalSwapSpaceSize();
-            status.system.systemLoadAverage = operatingSystemMXBean.getSystemLoadAverage();
+            status.system.systemLoadAverage = operatingSystemMXBean.getSystemLoadAverage() / operatingSystemMXBean.getAvailableProcessors();
             status.system.availableProcessors = operatingSystemMXBean.getAvailableProcessors();
             status.system.totalPhysicalMemorySize = operatingSystemMXBean.getTotalPhysicalMemorySize();
             status.system.systemLoadAverage = this.processorPercentage;

--
Gitblit v1.10.0