diff --git a/src/system.c b/src/system.c index 9808bc2..9a0caf4 100644 --- a/src/system.c +++ b/src/system.c @@ -458,13 +458,14 @@ _memory_usage_get(meminfo_t *memory) fields++; } + if (fields >= 8) break; } memory->cached += tmp_slab; memory->used = memory->total - tmp_free - memory->cached - memory->buffered; - memory->swap_used = memory->swap_total = swap_free; + memory->swap_used = memory->swap_total - swap_free; fclose(f); #elif defined(__FreeBSD__) || defined(__DragonFly__) diff --git a/src/ui.c b/src/ui.c index 99a9e30..2c66ba3 100644 --- a/src/ui.c +++ b/src/ui.c @@ -347,10 +347,10 @@ _memory_view_update(Ui *ui, results_t *results) elm_progressbar_unit_format_set(progress, eina_slstr_printf( "%lu %c / %lu %c", - _mem_adjust(ui->data_unit, results->memory.swap_total - results->memory.swap_used), ui->data_unit, + _mem_adjust(ui->data_unit, results->memory.swap_used), ui->data_unit, _mem_adjust(ui->data_unit, results->memory.swap_total), ui->data_unit)); ratio = results->memory.swap_total / 100.0; - value = (results->memory.swap_total - results->memory.swap_used) / ratio; + value = results->memory.swap_used / ratio; _progressbar_value_force_set(progress, value / 100); }