From 1f15ff3dd15e86cf7c6edbf2d0886dc8b8c87429 Mon Sep 17 00:00:00 2001
From: rurban <rurban@96ab9672-09ca-45d6-a79d-3d69d39ca109>
Date: Tue, 25 Jan 2005 07:10:52 +0000
Subject: [PATCH] add getMemoryUsage to stdlib

git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@4429 96ab9672-09ca-45d6-a79d-3d69d39ca109
---
 lib/stdlib.php                      | 36 ++++++++++++++++++++++++++++-
 tests/unit/test.php                 | 27 +++-------------------
 themes/default/templates/debug.tmpl |  6 +++--
 3 files changed, 42 insertions(+), 27 deletions(-)

diff --git a/lib/stdlib.php b/lib/stdlib.php
index 6d3c52f0c..e0734d9da 100644
--- a/lib/stdlib.php
+++ b/lib/stdlib.php
@@ -1,4 +1,4 @@
-<?php //rcs_id('$Id: stdlib.php,v 1.229 2005-01-21 11:51:22 rurban Exp $');
+<?php //rcs_id('$Id: stdlib.php,v 1.230 2005-01-25 07:10:51 rurban Exp $');
 /*
  Copyright 1999,2000,2001,2002,2004,2005 $ThePhpWikiProgrammingTeam
 
@@ -1881,7 +1881,41 @@ function printSimpleTrace($bt) {
     }
 }
 
+/**
+ * Return the used process memory (in byte?)
+ * Enable the section which will work for you. (They are very slow)
+ * Special quirks for Windows: Requires cygwin.
+ */
+function getMemoryUsage() {
+    if (function_exists('memory_get_usage') and memory_get_usage()) {
+        return memory_get_usage();
+//  } elseif (function_exists('getrusage') and ($u = getrusage()) and !empty($u['ru_maxrss'])) {
+//      $mem = $u['ru_maxrss'];
+    } elseif (1 and substr(PHP_OS,0,3) == 'WIN') { // requires a newer cygwin
+        // what we want is the process memory only: apache or php
+        $pid = getmypid();
+        // This works only if it's a cygwin process (apache or php)
+        //$mem = (integer) trim(exec("cat /proc/$pid/statm |cut -f1"));
+        // if it's native windows use something like this: 
+        //   (requires pslist from sysinternals.com)
+        $memstr = exec("pslist $pid|grep -A1 Mem|sed 1d|perl -ane\"print \$"."F[5]\"");
+        return (integer) trim($memstr);
+    } elseif (0) {
+        $pid = getmypid();
+        //%MEM: Percentage of total memory in use by this process
+        //VSZ: Total virtual memory size, in 1K blocks.
+        //RSS: Real Set Size, the actual amount of physical memory allocated to this process.
+        //CPU time used by process since it started.
+        //echo "%",`ps -o%mem,vsz,rss,time -p $pid|sed 1d`,"\n";
+        $memstr = exec("ps -orss -p $pid|sed 1d");
+        return (integer) trim($memstr);
+    }
+}
+
 // $Log: not supported by cvs2svn $
+// Revision 1.229  2005/01/21 11:51:22  rurban
+// changed (c)
+//
 // Revision 1.228  2005/01/17 20:28:30  rurban
 // Allow more pagename chars: Limit only on certain backends.
 // Re-Allow : and ; and control chars on non-file backends.
diff --git a/tests/unit/test.php b/tests/unit/test.php
index 76ec7810a..3f6544cdb 100644
--- a/tests/unit/test.php
+++ b/tests/unit/test.php
@@ -101,32 +101,11 @@ function printMemoryUsage($msg = '') {
     if ((defined('DEBUG') and (DEBUG & 8)) or !defined('DEBUG')) {
         echo "-- MEMORY USAGE: ";
         $oldmem = $mem;
-        if (function_exists('memory_get_usage') and memory_get_usage()) {
-            $mem = memory_get_usage();
-            //        } elseif (function_exists('getrusage') and ($u = getrusage()) and !empty($u['ru_maxrss'])) {
-            //            $mem = $u['ru_maxrss'];
-        } elseif (substr(PHP_OS,0,3)=='WIN') { // requires a newer cygwin
-            // what we want is the process memory only: apache or php
-            $pid = getmypid();
-            // This works only if it's a cygwin process (apache or php)
-            //$mem = (integer) trim(system("cat /proc/$pid/statm |cut -f1"));
-            // if it's native windows use something like this: 
-            //   (requires pslist from sysinternals.com)
-            $memstr = system("pslist $pid|grep -A1 Mem|sed 1d|perl -ane\"print \$"."F[5]\"");
-            $mem = (integer) trim($memstr);
-        } else {
-            $pid = getmypid();
-            //%MEM: Percentage of total memory in use by this process
-            //VSZ: Total virtual memory size, in 1K blocks.
-            //RSS: Real Set Size, the actual amount of physical memory allocated to this process.
-            //CPU time used by process since it started.
-            //echo "%",`ps -o%mem,vsz,rss,time -p $pid|sed 1d`,"\n";
-            $memstr = system("ps -orss -p $pid|sed 1d");
-            $mem = (integer) trim($memstr);
-        }
+        $mem = getMemoryUsage();
         if (!$initmem) $initmem = $mem;
         // old libc on sf.net server doesn't understand "%+4d"
-        echo sprintf("%8d\t[%s%4d]\t[+%4d]\n", $mem, $mem > $oldmem ? "+" : ($mem == $oldmem ? " " : ""), $mem - $oldmem, $mem - $initmem);
+        echo sprintf("%8d\t[%s%4d]\t[+%4d]\n", $mem, $mem > $oldmem ? "+" : ($mem == $oldmem ? " " : ""), 
+                     $mem - $oldmem, $mem - $initmem);
         // TODO: print time
         flush();
     }
diff --git a/themes/default/templates/debug.tmpl b/themes/default/templates/debug.tmpl
index cb0e13662..a55d4c3a3 100644
--- a/themes/default/templates/debug.tmpl
+++ b/themes/default/templates/debug.tmpl
@@ -1,5 +1,5 @@
 <?php // -*-html-*-
-  rcs_id('$Id: debug.tmpl,v 1.14 2004-06-14 11:26:52 rurban Exp $');
+  rcs_id('$Id: debug.tmpl,v 1.15 2005-01-25 07:10:52 rurban Exp $');
 ?>
 <?php global $RUNTIMER; ?>
 <table width="%100" border="0" cellpadding="0" cellspacing="0">
@@ -15,7 +15,9 @@
         alt="Valid CSS!" height="31" width="88" /></a>
 </div>
 </td><td>
-<span class="debug"><?=fmt("Page Execution took %s seconds", $RUNTIMER->getStats())?></span>
+<span class="debug"><?=fmt("Page Execution took %s seconds", $RUNTIMER->getStats())?>
+<?= fmt(", Memory: %s", getMemoryUsage()) ?>
+</span>
 </td></tr></table>
 <?php // This keeps the valid XHTML! icons from "hanging off the bottom of the screen" ?>
 <br clear="all" class="clear-floats" />
-- 
2.45.0