Skip to content

Improve memory stats #85

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
haarp wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Improve memory stats #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions common/colors.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,6 +310,7 @@ const MultiloadColorScheme multiload_builtin_color_schemes[] = {
HEX_TO_RGBA(000000, FF) // Background (bottom)
}, { // MEM - hue: 151
HEX_TO_RGBA(03964F, FF), // User
HEX_TO_RGBA(03964F, FF), // Shared
HEX_TO_RGBA(43D18D, FF), // Buffers
HEX_TO_RGBA(BFFFE0, FF), // Cached
HEX_TO_RGBA(008042, FF), // Border
Expand Down Expand Up @@ -374,6 +375,7 @@ const MultiloadColorScheme multiload_builtin_color_schemes[] = {
HEX_TO_RGBA(555753, FF) // Background (bottom)
}, { // MEM - Tango Chameleon
HEX_TO_RGBA(3E6618, FF), // User
HEX_TO_RGBA(3E6618, FF), // Shared
HEX_TO_RGBA(73D216, FF), // Buffers
HEX_TO_RGBA(ACFF5C, FF), // Cached
HEX_TO_RGBA(2E3436, FF), // Border
Expand Down Expand Up @@ -438,6 +440,7 @@ const MultiloadColorScheme multiload_builtin_color_schemes[] = {
HEX_TO_RGBA(002B36, FF) // Background (bottom)
}, { // MEM - Solarized Green
HEX_TO_RGBA(859900, FF), // User
HEX_TO_RGBA(859900, FF), // Shared
HEX_TO_RGBA(657B83, FF), // Buffers
HEX_TO_RGBA(839496, FF), // Cached
HEX_TO_RGBA(586E75, FF), // Border
Expand Down Expand Up @@ -502,6 +505,7 @@ const MultiloadColorScheme multiload_builtin_color_schemes[] = {
HEX_TO_RGBA(EEE8D5, FF) // Background (bottom)
}, { // MEM - Solarized Green
HEX_TO_RGBA(859900, FF), // User
HEX_TO_RGBA(859900, FF), // Shared
HEX_TO_RGBA(657B83, FF), // Buffers
HEX_TO_RGBA(839496, FF), // Cached
HEX_TO_RGBA(586E75, FF), // Border
Expand Down Expand Up @@ -568,6 +572,7 @@ const MultiloadColorScheme multiload_builtin_color_schemes[] = {
HEX_TO_RGBA(B4B4C2, FF) // Background (bottom)
}, { // MEM - Kiwi
HEX_TO_RGBA(55641F, FF), // User
HEX_TO_RGBA(55641F, FF), // Shared
HEX_TO_RGBA(789236, FF), // Buffers
HEX_TO_RGBA(9AB452, FF), // Cached
HEX_TO_RGBA(404040, FF), // Border
Expand Down Expand Up @@ -632,6 +637,7 @@ const MultiloadColorScheme multiload_builtin_color_schemes[] = {
HEX_TO_RGBA(48BDE6, FF) // Background (bottom)
}, { // MEM
HEX_TO_RGBA(FFFFFF, D8), // User
HEX_TO_RGBA(FFFFFF, D8), // Shared
HEX_TO_RGBA(FFFFFF, A5), // Buffers
HEX_TO_RGBA(FFFFFF, 72), // Cached
HEX_TO_RGBA(FFFFFF, FF), // Border
Expand Down Expand Up @@ -698,6 +704,7 @@ const MultiloadColorScheme multiload_builtin_color_schemes[] = {
HEX_TO_RGBA(300A24, FF) // Background (bottom)
}, { // MEM
HEX_TO_RGBA(E96F20, FF), // User
HEX_TO_RGBA(E96F20, FF), // Shared
HEX_TO_RGBA(E96F20, FF), // Buffers
HEX_TO_RGBA(E96F20, FF), // Cached
HEX_TO_RGBA(373737, FF), // Border
Expand Down Expand Up @@ -762,6 +769,7 @@ const MultiloadColorScheme multiload_builtin_color_schemes[] = {
HEX_TO_RGBA(E8E8E8, FF) // Background (bottom)
}, { // MEM
HEX_TO_RGBA(E96F20, FF), // User
HEX_TO_RGBA(E96F20, FF), // Shared
HEX_TO_RGBA(E96F20, FF), // Buffers
HEX_TO_RGBA(E96F20, FF), // Cached
HEX_TO_RGBA(D6D6D6, FF), // Border
Expand Down Expand Up @@ -826,6 +834,7 @@ const MultiloadColorScheme multiload_builtin_color_schemes[] = {
HEX_TO_RGBA(393939, FF) // Background (bottom)
}, { // MEM
HEX_TO_RGBA(97BF60, FF), // User
HEX_TO_RGBA(97BF60, FF), // Shared
HEX_TO_RGBA(97BF60, FF), // Buffers
HEX_TO_RGBA(97BF60, FF), // Cached
HEX_TO_RGBA(3C3C3C, FF), // Border
Expand Down Expand Up @@ -890,6 +899,7 @@ const MultiloadColorScheme multiload_builtin_color_schemes[] = {
HEX_TO_RGBA(001940, FF) // Background (bottom)
}, { // MEM
HEX_TO_RGBA(199900, FF), // User
HEX_TO_RGBA(199900, FF), // Shared
HEX_TO_RGBA(2D652B, FF), // Buffers
HEX_TO_RGBA(2D652B, FF), // Cached
HEX_TO_RGBA(004A00, FF), // Border
Expand Down Expand Up @@ -956,6 +966,7 @@ const MultiloadColorScheme multiload_builtin_color_schemes[] = {
HEX_TO_RGBA(383C4A, FF) // Background (bottom)
}, { // MEM
HEX_TO_RGBA(5924E2, FF), // User
HEX_TO_RGBA(5924E2, FF), // Shared
HEX_TO_RGBA(5924E2, FF), // Buffers
HEX_TO_RGBA(5924E2, FF), // Cached
HEX_TO_RGBA(1B1E24, FF), // Border
Expand Down Expand Up @@ -1020,6 +1031,7 @@ const MultiloadColorScheme multiload_builtin_color_schemes[] = {
HEX_TO_RGBA(333333, FF) // Background (bottom)
}, { // MEM
HEX_TO_RGBA(D64937, FF), // User
HEX_TO_RGBA(D64937, FF), // Shared
HEX_TO_RGBA(D64937, FF), // Buffers
HEX_TO_RGBA(D64937, FF), // Cached
HEX_TO_RGBA(DEDEDE, FF), // Border
Expand Down Expand Up @@ -1084,6 +1096,7 @@ const MultiloadColorScheme multiload_builtin_color_schemes[] = {
HEX_TO_RGBA(DEDEDE, FF) // Background (bottom)
}, { // MEM
HEX_TO_RGBA(D64937, FF), // User
HEX_TO_RGBA(D64937, FF), // Shared
HEX_TO_RGBA(D64937, FF), // Buffers
HEX_TO_RGBA(D64937, FF), // Cached
HEX_TO_RGBA(333333, FF), // Border
Expand Down Expand Up @@ -1150,6 +1163,7 @@ const MultiloadColorScheme multiload_builtin_color_schemes[] = {
HEX_TO_RGBA(6385FB, FF) // Background (bottom)
}, { // MEM - Mario
HEX_TO_RGBA(DA0000, FF), // User
HEX_TO_RGBA(DA0000, FF), // Shared
HEX_TO_RGBA(716800, FF), // Buffers
HEX_TO_RGBA(FAB100, FF), // Cached
HEX_TO_RGBA(030000, FF), // Border
Expand Down Expand Up @@ -1214,6 +1228,7 @@ const MultiloadColorScheme multiload_builtin_color_schemes[] = {
HEX_TO_RGBA(FCA400, FF) // Background (bottom)
}, { // MEM - Goku
HEX_TO_RGBA(333098, FF), // User
HEX_TO_RGBA(333098, FF), // Shared
HEX_TO_RGBA(FDC9AB, FF), // Buffers
HEX_TO_RGBA(11141B, FF), // Cached
HEX_TO_RGBA(11141B, FF), // Border
Expand Down Expand Up @@ -1278,6 +1293,7 @@ const MultiloadColorScheme multiload_builtin_color_schemes[] = {
HEX_TO_RGBA(657A7D, FF) // Background (bottom)
}, { // MEM - Bart
HEX_TO_RGBA(0F9BE0, FF), // User
HEX_TO_RGBA(0F9BE0, FF), // Shared
HEX_TO_RGBA(F15B30, FF), // Buffers
HEX_TO_RGBA(FED420, FF), // Cached
HEX_TO_RGBA(84C55F, FF), // Border
Expand Down Expand Up @@ -1344,6 +1360,7 @@ const MultiloadColorScheme multiload_builtin_color_schemes[] = {
HEX_TO_RGBA(B5B5B5, FF) // Background (bottom)
}, { // MEM
HEX_TO_RGBA(777777, FF), // User
HEX_TO_RGBA(777777, FF), // Shared
HEX_TO_RGBA(777777, FF), // Buffers
HEX_TO_RGBA(777777, FF), // Cached
HEX_TO_RGBA(142339, FF), // Border
Expand Down Expand Up @@ -1408,6 +1425,7 @@ const MultiloadColorScheme multiload_builtin_color_schemes[] = {
HEX_TO_RGBA(A57C1B, FF) // Background (bottom)
}, { // MEM
HEX_TO_RGBA(E7D520, FF), // User
HEX_TO_RGBA(E7D520, FF), // Shared
HEX_TO_RGBA(E7D520, FF), // Buffers
HEX_TO_RGBA(E7D520, FF), // Cached
HEX_TO_RGBA(E39E1C, FF), // Border
Expand Down Expand Up @@ -1472,6 +1490,7 @@ const MultiloadColorScheme multiload_builtin_color_schemes[] = {
HEX_TO_RGBA(006287, FF) // Background (bottom)
}, { // MEM
HEX_TO_RGBA(73591C, FF), // User
HEX_TO_RGBA(73591C, FF), // Shared
HEX_TO_RGBA(B6974F, FF), // Buffers
HEX_TO_RGBA(E1C584, FF), // Cached
HEX_TO_RGBA(24313A, FF), // Border
Expand Down Expand Up @@ -1536,6 +1555,7 @@ const MultiloadColorScheme multiload_builtin_color_schemes[] = {
HEX_TO_RGBA(45413F, FF) // Background (bottom)
}, { // MEM
HEX_TO_RGBA(D66456, FF), // User
HEX_TO_RGBA(D66456, FF), // Shared
HEX_TO_RGBA(D66456, FF), // Buffers
HEX_TO_RGBA(D66456, FF), // Cached
HEX_TO_RGBA(733E34, FF), // Border
Expand Down Expand Up @@ -1600,6 +1620,7 @@ const MultiloadColorScheme multiload_builtin_color_schemes[] = {
HEX_TO_RGBA(063D06, FF) // Background (bottom)
}, { // MEM
HEX_TO_RGBA(1A8A14, FF), // User
HEX_TO_RGBA(1A8A14, FF), // Shared
HEX_TO_RGBA(1A8A14, FF), // Buffers
HEX_TO_RGBA(1A8A14, FF), // Cached
HEX_TO_RGBA(3B763B, FF), // Border
Expand Down Expand Up @@ -1664,6 +1685,7 @@ const MultiloadColorScheme multiload_builtin_color_schemes[] = {
HEX_TO_RGBA(03444A, FF) // Background (bottom)
}, { // MEM
HEX_TO_RGBA(30ABC0, FF), // User
HEX_TO_RGBA(30ABC0, FF), // Shared
HEX_TO_RGBA(30ABC0, FF), // Buffers
HEX_TO_RGBA(30ABC0, FF), // Cached
HEX_TO_RGBA(101010, FF), // Border
Expand Down Expand Up @@ -1728,6 +1750,7 @@ const MultiloadColorScheme multiload_builtin_color_schemes[] = {
HEX_TO_RGBA(3D2B67, FF) // Background (bottom)
}, { // MEM
HEX_TO_RGBA(5A7BE4, FF), // User
HEX_TO_RGBA(5A7BE4, FF), // Shared
HEX_TO_RGBA(5A7BE4, FF), // Buffers
HEX_TO_RGBA(5A7BE4, FF), // Cached
HEX_TO_RGBA(142339, FF), // Border
Expand Down
3 changes: 2 additions & 1 deletion common/graph-data.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ typedef struct _CpuData {

typedef struct _MemoryData {
guint64 user;
guint64 shared;
guint64 buffers;
guint64 cache;
guint64 total;
Expand Down Expand Up @@ -124,7 +125,7 @@ G_GNUC_INTERNAL void
multiload_graph_cpu_tooltip_update (char *buf_title, size_t len_title, char *buf_text, size_t len_text, LoadGraph *g, CpuData *xd, gint style);

G_GNUC_INTERNAL void
multiload_graph_mem_get_data (int Maximum, int data [4], LoadGraph *g, MemoryData *xd, gboolean first_call);
multiload_graph_mem_get_data (int Maximum, int data [5], LoadGraph *g, MemoryData *xd, gboolean first_call);
G_GNUC_INTERNAL void
multiload_graph_mem_cmdline_output (LoadGraph *g, MemoryData *xd);
G_GNUC_INTERNAL void
Expand Down
38 changes: 25 additions & 13 deletions common/graph-mem.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,55 +34,60 @@
#define PATH_MEMINFO "/proc/meminfo"

void
multiload_graph_mem_get_data (int Maximum, int data [4], LoadGraph *g, MemoryData *xd, gboolean first_call)
multiload_graph_mem_get_data (int Maximum, int data [5], LoadGraph *g, MemoryData *xd, gboolean first_call)
{
// displayed keys
static guint64 kb_main_total = 0;
static guint64 kb_main_shared = 0;
static guint64 kb_main_buffers = 0;
static guint64 kb_main_cached = 0;
static guint64 kb_main_used = 0;

// auxiliary keys
static guint64 kb_main_free = 0;
static guint64 kb_page_cache = 0;
static guint64 kb_slab = 0;
static guint64 kb_reclaimable = 0;

static const InfoFileMappingEntry table[] = {
{ "MemTotal", 'u', &kb_main_total },
{ "MemFree", 'u', &kb_main_free},
{ "Buffers", 'u', &kb_main_buffers },
{ "Shmem:", 'u', &kb_main_shared},
{ "Cached", 'u', &kb_page_cache },
{ "Slab", 'u', &kb_slab }
{ "SReclaimable", 'u', &kb_reclaimable }
};

gint r = info_file_read_keys (PATH_MEMINFO, table, 5);
g_assert_cmpint(r, ==, 5);
gint r = info_file_read_keys (PATH_MEMINFO, table, 6);
g_assert_cmpint(r, ==, 6);

kb_main_cached = kb_page_cache;
if (xd->procps_compliant)
kb_main_cached += kb_slab;
// https://stackoverflow.com/a/41251290
// https://github.com/htop-dev/htop/blob/3.3.0/linux/LinuxMachine.c#L199-L218
kb_main_cached = kb_page_cache + kb_reclaimable - kb_main_shared;

kb_main_used = kb_main_total - kb_main_free - kb_main_cached - kb_main_buffers;
kb_main_used = kb_main_total - kb_main_free - kb_page_cache - kb_main_buffers - kb_reclaimable;
if (kb_main_used < 0)
kb_main_used = kb_main_total - kb_main_free;

xd->user = kb_main_used * 1024;
xd->shared = kb_main_shared * 1024;
xd->buffers = kb_main_buffers * 1024;
xd->cache = kb_main_cached * 1024;
xd->total = kb_main_total * 1024;

data [0] = rint (Maximum * (float)kb_main_used / (float)kb_main_total);
data [1] = rint (Maximum * (float)kb_main_buffers / (float)kb_main_total);
data [2] = rint (Maximum * (float)kb_main_cached / (float)kb_main_total);
data [1] = rint (Maximum * (float)kb_main_shared / (float)kb_main_total);
data [2] = rint (Maximum * (float)kb_main_buffers / (float)kb_main_total);
data [3] = rint (Maximum * (float)kb_main_cached / (float)kb_main_total);
}


void
multiload_graph_mem_cmdline_output (LoadGraph *g, MemoryData *xd)
{
g_snprintf(g->output_str[0], sizeof(g->output_str[0]), "%"G_GUINT64_FORMAT, xd->user);
g_snprintf(g->output_str[1], sizeof(g->output_str[1]), "%"G_GUINT64_FORMAT, xd->buffers);
g_snprintf(g->output_str[2], sizeof(g->output_str[2]), "%"G_GUINT64_FORMAT, xd->cache);
g_snprintf(g->output_str[1], sizeof(g->output_str[1]), "%"G_GUINT64_FORMAT, xd->shared);
g_snprintf(g->output_str[2], sizeof(g->output_str[2]), "%"G_GUINT64_FORMAT, xd->buffers);
g_snprintf(g->output_str[3], sizeof(g->output_str[3]), "%"G_GUINT64_FORMAT, xd->cache);
}

void
Expand All @@ -94,6 +99,9 @@ multiload_graph_mem_tooltip_update (char *buf_title, size_t len_title, char *buf
gchar *user = format_size_for_display(xd->user, g->multiload->size_format_iec);
gchar *user_percent = format_percent(xd->user, xd->total, 1);

gchar *shared = format_size_for_display(xd->shared, g->multiload->size_format_iec);
gchar *shared_percent = format_percent(xd->shared, xd->total, 1);

gchar *buffers = format_size_for_display(xd->buffers, g->multiload->size_format_iec);
gchar *buffers_percent = format_percent(xd->buffers, xd->total, 1);

Expand All @@ -102,14 +110,18 @@ multiload_graph_mem_tooltip_update (char *buf_title, size_t len_title, char *buf

g_snprintf(buf_title, len_title, _("%s of RAM"), total);
g_snprintf(buf_text, len_text, _( "%s (%s) used by programs\n"
"%s (%s) shared among programs/tmpfs\n"
"%s (%s) used for buffers\n"
"%s (%s) used as cache"),
user_percent, user,
shared_percent, shared,
buffers_percent, buffers,
cache_percent, cache);
g_free(total);
g_free(user);
g_free(user_percent);
g_free(shared);
g_free(shared_percent);
g_free(buffers);
g_free(buffers_percent);
g_free(cache);
Expand Down
2 changes: 1 addition & 1 deletion common/multiload-config.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ void multiload_config_init()
(GraphCmdlineOutputFunc) multiload_graph_cpu_cmdline_output,
(GraphGetFilterFunc) NULL
},
{ "mem", _("Memory"), 6, -1, -1, "byte",
{ "mem", _("Memory"), 7, -1, -1, "byte",
(GraphInitFunc) NULL,
(GraphGetDataFunc) multiload_graph_mem_get_data,
(GraphTooltipUpdateFunc) multiload_graph_mem_tooltip_update,
Expand Down
11 changes: 7 additions & 4 deletions common/preferences.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ static const gchar* color_button_names[GRAPH_MAX][MAX_COLORS] = {
"cb_color_mem1",
"cb_color_mem2",
"cb_color_mem3",
"cb_color_mem4",
"cb_color_mem_border",
"cb_color_mem_bg1",
"cb_color_mem_bg2"
Expand Down Expand Up @@ -857,14 +858,16 @@ multiload_preferences_dev_colorscheme_generate_clicked_cb (GtkToolButton *btn, M
_CPRINT(ma->graph_config[GRAPH_MEMLOAD].colors[0], buf);
printf("\t\t\t\t%s,\t\t// User\n", buf);
_CPRINT(ma->graph_config[GRAPH_MEMLOAD].colors[1], buf);
printf("\t\t\t\t%s,\t\t// Buffers\n", buf);
printf("\t\t\t\t%s,\t\t// Shared\n", buf);
_CPRINT(ma->graph_config[GRAPH_MEMLOAD].colors[2], buf);
printf("\t\t\t\t%s,\t\t// Cached\n", buf);
printf("\t\t\t\t%s,\t\t// Buffers\n", buf);
_CPRINT(ma->graph_config[GRAPH_MEMLOAD].colors[3], buf);
printf("\t\t\t\t%s,\t\t// Border\n", buf);
printf("\t\t\t\t%s,\t\t// Cached\n", buf);
_CPRINT(ma->graph_config[GRAPH_MEMLOAD].colors[4], buf);
printf("\t\t\t\t%s,\t\t// Background (top)\n", buf);
printf("\t\t\t\t%s,\t\t// Border\n", buf);
_CPRINT(ma->graph_config[GRAPH_MEMLOAD].colors[5], buf);
printf("\t\t\t\t%s,\t\t// Background (top)\n", buf);
_CPRINT(ma->graph_config[GRAPH_MEMLOAD].colors[6], buf);
printf("\t\t\t\t%s\t\t\t// Background (bottom)\n", buf);

printf("\t\t\t}, { // NET\n");
Expand Down
Loading