ZP-781 Nicer format for memory usage.

Released under the Affero GNU General Public License (AGPL) version 3.

src/lib/core/zlog.php

@@ -145,8 +145,11 @@ class ZLog {
             else {
                 $time_used = number_format(microtime(true) - $_SERVER["REQUEST_TIME_FLOAT"], 4);
             }
+            $peakUsage = memory_get_peak_usage(false);
+            $truePeakUsage = memory_get_peak_usage(true);
 
-            ZLog::Write(LOGLEVEL_DEBUG, sprintf("Memory usage information: %s/%s - Execution time: %s - HTTP responde code: %s", memory_get_peak_usage(false), memory_get_peak_usage(true), $time_used, http_response_code()));
+            ZLog::Write(LOGLEVEL_DEBUG, sprintf("Memory usage information: %s/%s (%s B/%s B) - Execution time: %s - HTTP responde code: %s",
+                    Utils::FormatBytes($peakUsage), Utils::FormatBytes($truePeakUsage), $peakUsage, $truePeakUsage, $time_used, http_response_code()));
             ZLog::Write(LOGLEVEL_DEBUG, "-------- End");
         }
     }

src/lib/utils/utils.php

@@ -950,6 +950,24 @@ class Utils {
 
         return $res;
     }
+
+    /**
+     * Format bytes to a more human readable value.
+     * @param int $bytes
+     * @param int $precision
+     *
+     * @access public
+     * @return void|string
+     */
+    public static function FormatBytes($bytes, $precision = 2) {
+        if ($bytes <= 0) return '0 B';
+
+        $units = array('B', 'KiB', 'MiB', 'GiB', 'TiB', 'PiB', 'EiB', 'ZiB');
+        $base = log ($bytes, 1024);
+        $fBase = floor($base);
+        $pow = pow(1024, $base - $fBase);
+        return sprintf ("%.{$precision}f %s", $pow, $units[$fBase]);
+    }
 }