the-btfash-foundation/tmux-mem-cpu-load
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix FreeBSD memory usage

Browse Source 
Total memory would go out of bounds for machines ~ > 3.5gB of
memory due to the limit of what u_int can hold.

Use ``getpagesize()`` and bitshift pagesize so it fits.

See also: https://github.com/thewtex/tmux-mem-cpu-load/issues/29
This commit is contained in:
Tony Narlock 2016-01-09 10:41:28 -06:00
parent f80a026c45
commit c036017db3
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
freebsd/memory.cc
View File

@ -22,6 +22,7 @@
#include <sstream> #include <sstream>
#include <string> #include <string>
#include <sys/types.h> #include <sys/types.h>
#include <unistd.h>
#include "getsysctl.h" #include "getsysctl.h"
#include "memory.h" #include "memory.h"
@ -45,7 +46,7 @@ std::string mem_string( bool use_colors = false )
// instead of using realmem which reports quantity of ram installed on // instead of using realmem which reports quantity of ram installed on
// platform, use physmem which reports ram available to system. // platform, use physmem which reports ram available to system.
//GETSYSCTL( "hw.physmem", total ); //GETSYSCTL( "hw.physmem", total );
GETSYSCTL( "hw.pagesize", page_size ); page_size = getpagesize();
// page count reflects actual size of memory we have available for // page count reflects actual size of memory we have available for
// applications. it will be less than realmem or physmem, since it doesn't // applications. it will be less than realmem or physmem, since it doesn't
// include what's been allocated for kernel, but it will be equal to // include what's been allocated for kernel, but it will be equal to
@ -72,7 +73,7 @@ std::string mem_string( bool use_colors = false )
} }
oss << convert_unit( used, MEGABYTES ) << '/' oss << convert_unit( used, MEGABYTES ) << '/'
<< convert_unit( page_count * page_size, MEGABYTES ) << "MB"; << convert_unit( page_count * (page_size >> 10), MEGABYTES, KILOBYTES) << "MB";
if( use_colors ) if( use_colors )
{ {