james/fembooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

with 5.2.1, we have an accurate, peak memory use

Browse Source
This commit is contained in:
Shish 2012-03-11 04:33:24 +00:00
parent f0a05164d1
commit cf907237c6
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.txt
View File

@ -26,7 +26,7 @@ because the feature doesn't work yet :P
Requirements Requirements
~~~~~~~~~~~~ ~~~~~~~~~~~~
MySQL 5.1+ (with experimental support for PostgreSQL 8+ and SQLite 3) MySQL 5.1+ (with experimental support for PostgreSQL 8+ and SQLite 3)
PHP 5.2+ PHP 5.2.6+
GD or ImageMagick GD or ImageMagick

7
core/util.inc.php
View File

@ -907,12 +907,7 @@ $_load_start = microtime(true);
function get_debug_info() { function get_debug_info() {
global $config, $_event_count, $database, $_execs, $_load_start; global $config, $_event_count, $database, $_execs, $_load_start;
if(function_exists('memory_get_usage')) { $i_mem = sprintf("%5.2f", ((memory_get_peak_usage(true)+512)/1024)/1024);
$i_mem = sprintf("%5.2f", ((memory_get_usage()+512)/1024)/1024);
}
else {
$i_mem = "???";
}
if($config->get_string("commit_hash", "unknown") == "unknown"){ if($config->get_string("commit_hash", "unknown") == "unknown"){
$commit = ""; $commit = "";