From: Greg Burri <greg.burri@gmail.com>
Date: Fri, 8 Apr 2022 15:23:05 +0000 (+0200)
Subject: Merge branch 'master' of gburri.org:minecraft_web into master
X-Git-Url: https://git.euphorik.ch/?a=commitdiff_plain;h=c849abb7645a38c4fcb91222b399f0914287527a;p=minecraft_web.git

Merge branch 'master' of gburri.org:minecraft_web into master
---

c849abb7645a38c4fcb91222b399f0914287527a
diff --cc backend/src/minecraft_controller.rs
index 8f67d20,dfba3ee..54143e8
--- a/backend/src/minecraft_controller.rs
+++ b/backend/src/minecraft_controller.rs
@@@ -142,8 -142,8 +140,8 @@@ pub fn get_minecraft_executable_informa
  
          Some(
              MinecraftExe {
-                 memory: process.memory(),
+                 memory: process.memory() / 3, // Because the Java garbage collector ZGC reports three times more the real memory usage: https://stackoverflow.com/a/62934057/212675
 -                load_average_5min: system.get_load_average().five / system.get_processors().len() as f64 * 100.,
 +                load_average_5min: system.load_average().five / system.processors().len() as f64 * 100.,
                  uptime: std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap().as_secs() - process.start_time(),
                  world_size,
                  active_players: status_from_rcon.players,