*** empty log message ***

svn path=/trunk/boinc/; revision=4873
This commit is contained in:
David Anderson 2004-12-17 07:27:36 +00:00
parent e171a34623
commit 85ea5d8ced
3 changed files with 12 additions and 5 deletions

View File

@ -21446,4 +21446,9 @@ Rom 16 Dec 2004
BOINC.ism BOINC.ism
win_build/installerv2/redist/windows win_build/installerv2/redist/windows
BOINC.vbs BOINC.vbs
David 16 Dec 2004
- bug fix: resident-set size on Linux was wrong
lib/
mem_usage.C

View File

@ -43,6 +43,7 @@ The founder of a team has some additional capabilities:
<li> Edit the team's attributes. <li> Edit the team's attributes.
<li> View the email addresses of all team members. <li> View the email addresses of all team members.
<li> Remove members from the team. <li> Remove members from the team.
<li> Change the founder (to any current member).
<li> Disband the team. <li> Disband the team.
</ul> </ul>
"; ";

View File

@ -91,12 +91,13 @@ int mem_usage(double& vm_usage, double& resident_set) {
// read virtual memory size in bytes. // read virtual memory size in bytes.
// //
vm_usage = atof(p); vm_usage = atof(p);
p = strchr(p, ' ');
// read resident set size: number of pages the process has in // read resident set size: number of pages the process has in
// real memory, minus 3 for administrative purposes. // real memory, minus 3 for administrative purposes.
// //
tmp = strtol(p, 0, 0); // in pages tmp = strtol(p, 0, 0);
resident_set = (double)(tmp + 3)*getpagesize(); // getpagesize() is bytes/page resident_set = (double)(tmp + 3)*getpagesize();
fclose(f); fclose(f);
return 0; return 0;