report: return memory usage as percent

Change-Id: I5a6c123c666baf3b85900a1eaf89ecd13566dc8b

diff --git a/src/json-schema-defs.h b/src/json-schema-defs.h
index ec0fba4..13f0248 100644 (file)
--- a/src/json-schema-defs.h
+++ b/src/json-schema-defs.h
@@ -37,8 +37,6 @@
 #define SCHEMA_RESULT_DATA_TOP "top_data"
 
 #define SCHEMA_RESULT_TIME "time"
-#define SCHEMA_RESULT_MEMORY_TOTAL "total"
-#define SCHEMA_RESULT_MEMORY_USED "used"
 #define SCHEMA_RESULT_USAGE "usage"
 #define SCHEMA_RESULT_AVG_ONE "one_min_avg"
 #define SCHEMA_RESULT_AVG_FIVE "five_min_avg"

diff --git a/src/report-generator.c b/src/report-generator.c
index bf1881d..b6069bf 100644 (file)
--- a/src/report-generator.c
+++ b/src/report-generator.c
@@ -190,9 +190,7 @@ int report_generator_generate_system_memory_usage_report(
        }
 
        report->time = clock_get_monotonic().tv_sec;
-       report->total = mem_usage.total;
-       report->used = mem_usage.used;
-       report->free = mem_usage.free;
+       report->usage = (float)mem_usage.used / mem_usage.total;
 
        return 0;
 }

diff --git a/src/report-json-serializer.c b/src/report-json-serializer.c
index e912c17..895b314 100644 (file)
--- a/src/report-json-serializer.c
+++ b/src/report-json-serializer.c
@@ -85,10 +85,8 @@ static void system_memory_usage_report_to_json_object(JsonBuilder *builder, stru
        json_builder_set_member_name(builder, SCHEMA_RESULT_TIME);
        json_builder_add_int_value(builder, report->time);
 
-       json_builder_set_member_name(builder, SCHEMA_RESULT_MEMORY_TOTAL);
-       json_builder_add_int_value(builder, report->total);
-       json_builder_set_member_name(builder, SCHEMA_RESULT_MEMORY_USED);
-       json_builder_add_int_value(builder, report->used);
+       json_builder_set_member_name(builder, SCHEMA_RESULT_USAGE);
+       json_builder_add_double_value(builder, report->usage);
 
        json_builder_end_object(builder);
 

diff --git a/src/report.h b/src/report.h
index c27dacb..f338ef1 100644 (file)
--- a/src/report.h
+++ b/src/report.h
@@ -34,9 +34,7 @@ struct system_load_average_report {
  */
 struct system_memory_usage_report {
        time_t time; /** Number of seconds after the Epoch */
-       int total;   /** Total memory available (KiB) */
-       int used;    /** Used memory (KiB) */
-       int free;    /** Free memory (KiB) */
+       float usage; /** Memory utilization (Percent) */
 };
 
 /**