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/gui/components/PanelProcess_Information.java |   41 ++++++++++++++++++++---------------------
 1 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/libraries/server/src/art/servers/gui/components/PanelProcess_Information.java b/libraries/server/src/art/servers/gui/components/PanelProcess_Information.java
index 2029686..e977052 100644
--- a/libraries/server/src/art/servers/gui/components/PanelProcess_Information.java
+++ b/libraries/server/src/art/servers/gui/components/PanelProcess_Information.java
@@ -62,22 +62,21 @@
         table2.setValue(Shared.getMessage("Language"), status.runtime.userLanguage);
         
         table3.setValue(Shared.getMessage("Timestamp"), formato1.format(status.memory.timestamp));
-        table3.setValue(Shared.getMessage("Heap memory usage init"), formato2.format(status.memory.heapMemoryUsage_init/1024L));
-        table3.setValue(Shared.getMessage("Heap memory usage used"), formato2.format(status.memory.heapMemoryUsage_used/1024L));
-        table3.setValue(Shared.getMessage("Heap memory usage commited"), formato2.format(status.memory.heapMemoryUsage_committed/1024L));
-        table3.setValue(Shared.getMessage("Heap memory usage max"), formato2.format(status.memory.heapMemoryUsage_max/1024L));
-        table3.setValue(Shared.getMessage("Non heap memory usage init"), formato2.format(status.memory.nonheapMemoryUsage_init/1024L));
-        table3.setValue(Shared.getMessage("Non heap memory usage used"), formato2.format(status.memory.nonheapMemoryUsage_used/1024L));
-        table3.setValue(Shared.getMessage("Non heap memory usage commited"), formato2.format(status.memory.nonheapMemoryUsage_committed/1024L));
-        table3.setValue(Shared.getMessage("Non heap memory usage max"), formato2.format(status.memory.nonheapMemoryUsage_max/1024L));
+        table3.setValue(Shared.getMessage("Used memory"), formato2.format(status.memory.usedMemory/1048576L));
+        table3.setValue(Shared.getMessage("Heap memory usage init"), formato2.format(status.memory.heapMemoryUsage_init/1048576L));
+        table3.setValue(Shared.getMessage("Heap memory usage used"), formato2.format(status.memory.heapMemoryUsage_used/1048576L));
+        table3.setValue(Shared.getMessage("Heap memory usage commited"), formato2.format(status.memory.heapMemoryUsage_committed/1048576L));
+        table3.setValue(Shared.getMessage("Heap memory usage max"), formato2.format(status.memory.heapMemoryUsage_max/1048576L));
+        table3.setValue(Shared.getMessage("Non heap memory usage init"), formato2.format(status.memory.nonheapMemoryUsage_init/1048576L));
+        table3.setValue(Shared.getMessage("Non heap memory usage used"), formato2.format(status.memory.nonheapMemoryUsage_used/1048576L));
+        table3.setValue(Shared.getMessage("Non heap memory usage commited"), formato2.format(status.memory.nonheapMemoryUsage_committed/1048576L));
+        table3.setValue(Shared.getMessage("Non heap memory usage max"), formato2.format(status.memory.nonheapMemoryUsage_max/1048576L));
         
         table4.setValue(Shared.getMessage("Timestamp"), formato1.format(status.thread.timestamp));
         table4.setValue(Shared.getMessage("Thread count"), formato2.format(status.thread.threadCount));
         table4.setValue(Shared.getMessage("Peak thread count"), formato2.format(status.thread.peakThreadCount));
         table4.setValue(Shared.getMessage("Total started thread count"), formato2.format(status.thread.totalStartedThreadCount));
         table4.setValue(Shared.getMessage("Daemon thread count"), formato2.format(status.thread.daemonThreadCount));
-        table4.setValue(Shared.getMessage("Thread cpu timer"), DateUtils.getTimeddHHMMSS(status.thread.threadCpuTime/1000000L));  // threadCpuTime nanoseconds, getTimeddHHMMSS millis
-        table4.setValue(Shared.getMessage("Thread user time"), DateUtils.getTimeddHHMMSS(status.thread.threadUserTime/1000000L));  // threadUserTime nanoseconds, getTimeddHHMMSS millis
     }
 
 
@@ -151,7 +150,8 @@
                         table2.addTextField(Shared.getMessage("Country"), 22);
                         table2.addTextField(Shared.getMessage("Language"), 22);
                         
-                        table2.setMeasurementUnits(Shared.getMessage("Process cpu time"), Shared.getMessage("seconds"), 100, SwingConstants.CENTER);
+                        table2.setMeasurementUnits(Shared.getMessage("Up time"), Shared.getMessage("d,HH:mm:ss"), 100, SwingConstants.CENTER);
+                        table2.setMeasurementUnits(Shared.getMessage("Process cpu time"), Shared.getMessage("d, HH:mm:ss"), 100, SwingConstants.CENTER);
                         table2.setMeasurementUnits(Shared.getMessage("Process cpu current"), Shared.getMessage("%"), 100, SwingConstants.CENTER);
                         table2.setMeasurementUnits(Shared.getMessage("Process cpu average"), Shared.getMessage("%"), 100, SwingConstants.CENTER);
                         
@@ -170,6 +170,7 @@
                     table3 = new FlatTableInput(250);
                     {
                         table3.addTextField(Shared.getMessage("Timestamp"), 22);
+                        table3.addTextField(Shared.getMessage("Used memory"), 22);
                         table3.addTextField(Shared.getMessage("Heap memory usage init"), 22);
                         table3.addTextField(Shared.getMessage("Heap memory usage used"), 22);
                         table3.addTextField(Shared.getMessage("Heap memory usage commited"), 22);
@@ -179,14 +180,14 @@
                         table3.addTextField(Shared.getMessage("Non heap memory usage commited"), 22);
                         table3.addTextField(Shared.getMessage("Non heap memory usage max"), 22);
                         
-                        table3.setMeasurementUnits(Shared.getMessage("Heap memory usage init"), Shared.getMessage("KB"), 100, SwingConstants.CENTER);
-                        table3.setMeasurementUnits(Shared.getMessage("Heap memory usage used"), Shared.getMessage("KB"), 100, SwingConstants.CENTER);
-                        table3.setMeasurementUnits(Shared.getMessage("Heap memory usage commited"), Shared.getMessage("KB"), 100, SwingConstants.CENTER);
-                        table3.setMeasurementUnits(Shared.getMessage("Heap memory usage max"), Shared.getMessage("KB"), 100, SwingConstants.CENTER);
-                        table3.setMeasurementUnits(Shared.getMessage("Non heap memory usage init"), Shared.getMessage("KB"), 100, SwingConstants.CENTER);
-                        table3.setMeasurementUnits(Shared.getMessage("Non heap memory usage used"), Shared.getMessage("KB"), 100, SwingConstants.CENTER);
-                        table3.setMeasurementUnits(Shared.getMessage("Non heap memory usage commited"), Shared.getMessage("KB"), 100, SwingConstants.CENTER);
-                        table3.setMeasurementUnits(Shared.getMessage("Non heap memory usage max"), Shared.getMessage("KB"), 100, SwingConstants.CENTER);
+                        table3.setMeasurementUnits(Shared.getMessage("Heap memory usage init"), Shared.getMessage("MB"), 100, SwingConstants.CENTER);
+                        table3.setMeasurementUnits(Shared.getMessage("Heap memory usage used"), Shared.getMessage("MB"), 100, SwingConstants.CENTER);
+                        table3.setMeasurementUnits(Shared.getMessage("Heap memory usage commited"), Shared.getMessage("MB"), 100, SwingConstants.CENTER);
+                        table3.setMeasurementUnits(Shared.getMessage("Heap memory usage max"), Shared.getMessage("MB"), 100, SwingConstants.CENTER);
+                        table3.setMeasurementUnits(Shared.getMessage("Non heap memory usage init"), Shared.getMessage("MB"), 100, SwingConstants.CENTER);
+                        table3.setMeasurementUnits(Shared.getMessage("Non heap memory usage used"), Shared.getMessage("MB"), 100, SwingConstants.CENTER);
+                        table3.setMeasurementUnits(Shared.getMessage("Non heap memory usage commited"), Shared.getMessage("MB"), 100, SwingConstants.CENTER);
+                        table3.setMeasurementUnits(Shared.getMessage("Non heap memory usage max"), Shared.getMessage("MB"), 100, SwingConstants.CENTER);
                                                 
                         table3.setEditable(false);
                         table3.revalidate();
@@ -208,8 +209,6 @@
                         table4.addTextField(Shared.getMessage("Thread count"), 22);
                         table4.addTextField(Shared.getMessage("Peak thread count"), 22);
                         table4.addTextField(Shared.getMessage("Daemon thread count"), 22);
-                        table4.addTextField(Shared.getMessage("Thread cpu timer"), 22);
-                        table4.addTextField(Shared.getMessage("Thread user time"), 22);
                         table4.setEditable(false);
                         table4.revalidate();
                     }

--
Gitblit v1.10.0