test/exclude line starting with MemAvailable

tested for line starting w/ 'MemAvailable' and exclude from used memory
calculation by simply decrementing the index variable by 1 and
proceeding
This commit is contained in:
Mark Palmeri 2014-05-06 16:00:57 -04:00
parent 4c9c9dde85
commit b12dfc6f29

@ -267,12 +267,21 @@ std::string mem_string( bool use_colors )
for( unsigned int i = 0; i < 3; i++ ) for( unsigned int i = 0; i < 3; i++ )
{ {
getline( meminfo_file, mem_line ); getline( meminfo_file, mem_line );
line_start_pos = mem_line.find_first_of( ':' ); // accomodate MemAvailable potentially being in lines 2-4 of /proc/meminfo
line_start_pos++; // did this in a way to not break the original logic of the loop
line_end_pos = mem_line.find_first_of( 'k' ); if( mem_line.find("MemAvailable") == 0 )
iss.str( mem_line.substr( line_start_pos, line_end_pos - line_start_pos ) ); {
iss >> unused_mem; i--;
used_mem -= unused_mem; }
else
{
line_start_pos = mem_line.find_first_of( ':' );
line_start_pos++;
line_end_pos = mem_line.find_first_of( 'k' );
iss.str( mem_line.substr( line_start_pos, line_end_pos - line_start_pos ) );
iss >> unused_mem;
used_mem -= unused_mem;
}
} }
meminfo_file.close(); meminfo_file.close();