From 85ea5d8ced2a33f51674062064f0bf06773e089b Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Fri, 17 Dec 2004 07:27:36 +0000
Subject: [PATCH] *** empty log message ***

svn path=/trunk/boinc/; revision=4873
---
 checkin_notes   | 7 ++++++-
 doc/teams.php   | 1 +
 lib/mem_usage.C | 9 +++++----
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index 733cd2a9bc..85c3ba9653 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -21446,4 +21446,9 @@ Rom    16 Dec 2004
         BOINC.ism
     win_build/installerv2/redist/windows
         BOINC.vbs
- 
\ No newline at end of file
+ 
+David  16 Dec 2004
+    - bug fix: resident-set size on Linux was wrong
+
+    lib/
+        mem_usage.C
diff --git a/doc/teams.php b/doc/teams.php
index 3c9e279b84..6cd2b30949 100644
--- a/doc/teams.php
+++ b/doc/teams.php
@@ -43,6 +43,7 @@ The founder of a team has some additional capabilities:
 <li> Edit the team's attributes.
 <li> View the email addresses of all team members.
 <li> Remove members from the team.
+<li> Change the founder (to any current member).
 <li> Disband the team.
 </ul>
 ";
diff --git a/lib/mem_usage.C b/lib/mem_usage.C
index c7e142ced8..e4317382b1 100644
--- a/lib/mem_usage.C
+++ b/lib/mem_usage.C
@@ -91,12 +91,13 @@ int mem_usage(double& vm_usage, double& resident_set) {
         // read virtual memory size in bytes.
         //
         vm_usage = atof(p);
+        p = strchr(p, ' ');
 
-        // read resident set size: number of  pages  the  process has in
-        // real  memory, minus 3 for administrative purposes.
+        // read resident set size: number of pages the process has in
+        // real memory, minus 3 for administrative purposes.
         //
-        tmp = strtol(p, 0, 0); // in pages
-        resident_set = (double)(tmp + 3)*getpagesize(); // getpagesize() is bytes/page
+        tmp = strtol(p, 0, 0);
+        resident_set = (double)(tmp + 3)*getpagesize();
 
         fclose(f);
         return 0;