report-generator: reafactor process generator
[apps/native/ttsd-worker-task.git] / src / report-generator.c
index c6e761f..9869bcb 100644 (file)
@@ -28,6 +28,7 @@
 #include "clock.h"
 #include "proc-scanner.h"
 #include "process.h"
+#include "json-schema-defs.h"
 
 struct report_generator_system {
        /** system cpu usage statistics */
@@ -36,18 +37,10 @@ struct report_generator_system {
 
 struct report_generator_process
 {
-       /** process pid */
-       int pid;
-       /** process statistics */
-       struct process proc;
-       /** update time */
-       float proc_update_time;
-};
-
-struct report_generator_app
-{
-       char *app_id;
-       report_generator_process_t *process_gen;
+       proc_scanner_t *scanner;
+       report_generator_filter_cb filter;
+       void *user_data;
+       JsonBuilder *current_builder;
 };
 
 struct report_generator_top
@@ -60,12 +53,10 @@ struct report_generator_top
 
 struct report_generator_top_closure {
        struct sys_stats sys_stats;
-       int current_index;
-       int max_index;
+       int current_index; int max_index;
        struct process_usage_report *usage_report;
 };
 
-int _app_report_generator_setup_process_generator(report_generator_app_t *generator);
 static int _report_generator_top_report_generator_scan(report_generator_top_t *generator);
 
 report_generator_system_t *report_generator_new_system_report_generator()
@@ -91,216 +82,115 @@ void report_generator_free_system_generator(report_generator_system_t *generator
        free(generator);
 }
 
-report_generator_process_t *report_generator_new_process_report_generator(int pid)
+report_generator_process_t *report_generator_new_process_report_generator()
 {
-       ON_TRUE_RETURN_VAL(pid <= 0, NULL);
-
        report_generator_process_t *ret = calloc(1, sizeof(struct report_generator_process));
        if (!ret)
                return NULL;
 
-       process_init(pid, &ret->proc);
+       ret->scanner = proc_scanner_new();
+       if (!ret->scanner) goto err;
 
-       if (process_update(&ret->proc) != 0) {
-               ERR("process_update failed.");
-               free(ret);
-               return NULL;
-       };
-
-       ret->proc_update_time = clock_monotonic_get();
-       ret->pid = pid;
-
-       return ret;
-}
-
-void report_generator_free_process_generator(report_generator_process_t *generator)
-{
-       if (!generator)
-               return;
-
-       free(generator);
-}
-
-report_generator_app_t *report_generator_new_app_report_generator(const char *app_id)
-{
-       ON_NULL_RETURN_VAL(app_id, NULL);
-
-       report_generator_app_t *ret = calloc(1, sizeof(struct report_generator_app));
-       if (!ret) {
-               ERR("malloc failed");
-               return NULL;
+       if (proc_scanner_scan(ret->scanner) != 0) {
+               ERR("proc_scanner_scan failed");
+               goto err;
        }
 
-       ret->app_id = strdup(app_id);
-       _app_report_generator_setup_process_generator(ret);
        return ret;
+
+err:
+       proc_scanner_free(ret->scanner);
+       free(ret);
+       return NULL;
 }
 
-void report_generator_free_app_generator(report_generator_app_t *generator)
+void report_generator_free_process_generator(report_generator_process_t *generator)
 {
        if (!generator) return;
-       report_generator_free_process_generator(generator->process_gen);
-       free(generator->app_id);
+       proc_scanner_free(generator->scanner);
        free(generator);
 }
 
-int report_generator_generate_system_cpu_usage_report(
-               report_generator_system_t *generator,
-               struct system_usage_report *report)
+static bool _match_proc_and_append(struct process *proc, void *data)
 {
-       ON_NULL_RETURN_VAL(generator, -1);
-       ON_NULL_RETURN_VAL(report, -1);
+       report_generator_process_t *gen = data;
 
-       float usage;
-
-       if (sys_stats_update(&generator->stats) != 0) {
-               ERR("stats_update_system_stats failed.");
-               return -1;
-       }
-
-       if (sys_stats_get_cpu_usage_percentage(&generator->stats, &usage))
-       {
-               ERR("stats_get_system_cpu_usage_average failed");
-               return -1;
+       if (gen->filter && gen->filter(proc, gen->user_data)) {
+               process_serialize(proc, gen->current_builder);
        }
 
-       report->usage = usage;
-       report->time = clock_realtime_get();
-
-       return 0;
-}
-
-int report_generator_generate_system_memory_usage_report(
-               report_generator_system_t *generator,
-               struct system_usage_report *report) {
-       ON_NULL_RETURN_VAL(generator, -1);
-       ON_NULL_RETURN_VAL(report, -1);
-
-       float usage;
-
-       if (sys_stats_update(&generator->stats) != 0) {
-               ERR("stats_update_system_stats failed.");
-               return -1;
-       }
-
-       if (sys_stats_get_memory_usage_percentage(&generator->stats, &usage) != 0) {
-               ERR("stats_get_system_memory_usage failed.");
-               return -1;
-       }
-
-       report->time = clock_realtime_get();
-       report->usage = usage;
-
-       return 0;
+       return true;
 }
 
-int report_generator_generate_process_cpu_usage_report(
+int report_generator_generate_process_report(
                report_generator_process_t *generator,
-               struct process_usage_report *report)
+               JsonBuilder *builder)
 {
        ON_NULL_RETURN_VAL(generator, -1);
-       ON_NULL_RETURN_VAL(report, -1);
-
-       float usage;
+       ON_NULL_RETURN_VAL(builder, -1);
 
-       if (process_update(&generator->proc) != 0) {
-               ERR("process_update failed.");
+       // refresh data
+       if (proc_scanner_scan(generator->scanner) != 0) {
+               ERR("proc_scanner_scan failed");
                return -1;
        }
 
-       if (process_get_cpu_usage_percentage(&generator->proc, &usage) != 0) {
-               ERR("process_get_cpu_usage_percentage failed.");
-               return -1;
-       }
+       generator->current_builder = builder;
+       json_builder_begin_object(builder);
 
-       report->time = clock_realtime_get();
-       report->pid = generator->pid;
-       report->usage = usage;
+       json_builder_set_member_name(builder, SCHEMA_TYPE);
+       json_builder_add_string_value(builder, SCHEMA_TYPE_PROCESS);
 
-       return 0;
-}
+       json_builder_set_member_name(builder, "time");
+       json_builder_add_int_value(builder, clock_realtime_get());
 
-int report_generator_generate_process_memory_usage_report(
-               report_generator_process_t *generator,
-               struct process_usage_report *report)
-{
-       ON_NULL_RETURN_VAL(generator, -1);
-       ON_NULL_RETURN_VAL(report, -1);
+       json_builder_set_member_name(builder, SCHEMA_RESULT_DATA_PROCESS);
+       json_builder_begin_array(builder);
 
-       float usage;
+       proc_scanner_foreach_process(generator->scanner, _match_proc_and_append, generator);
+       json_builder_end_array(builder);
 
-       if (process_get_memory_usage_percentage(&generator->proc, &usage) != 0) {
-               ERR("process_get_memory_usage_percentage failed.");
-               return -1;
-       }
-
-       report->time = clock_realtime_get();
-       report->usage = usage;
+       json_builder_end_object(builder); // end report
 
+       generator->current_builder = NULL;
        return 0;
 }
 
-int _app_report_generator_setup_process_generator(report_generator_app_t *generator)
+void report_generator_set_filter(
+               report_generator_process_t *generator,
+               report_generator_filter_cb cb, const void *user_data)
 {
-       int pid = app_info_provider_find_main_pid(generator->app_id);
-       if (pid < 0) {
-               return -1;
-       }
+       ON_NULL_RETURN(generator);
+       ON_NULL_RETURN(cb);
 
-       if (!generator->process_gen || generator->process_gen->pid != pid) {
-               if (generator->process_gen)
-                       report_generator_free_process_generator(generator->process_gen);
-               generator->process_gen = report_generator_new_process_report_generator(pid);
-       }
-       return 0;
+       generator->filter = cb;
+       generator->user_data = (void*)user_data;
 }
 
-int report_generator_generate_app_cpu_usage_report(
-               report_generator_app_t *generator,
-               struct process_usage_report *report)
+int report_generator_generate_system_report(
+               report_generator_system_t *generator,
+               struct system_report *report)
 {
        ON_NULL_RETURN_VAL(generator, -1);
        ON_NULL_RETURN_VAL(report, -1);
 
-       if (_app_report_generator_setup_process_generator(generator) != 0) {
-               ERR("_app_report_generator_setup_process_generator failed.");
+       if (sys_stats_update(&generator->stats) != 0) {
+               ERR("stats_update_system_stats failed.");
                return -1;
        }
 
-       if (report_generator_generate_process_cpu_usage_report(
-                               generator->process_gen, report) != 0)
+       if (sys_stats_get_cpu_usage_percentage(&generator->stats, &report->cpu))
        {
-               ERR("report_generator_generate_process_cpu_usage_report failed.");
-               return 0;
-       }
-
-       strncpy(report->app_id, generator->app_id, sizeof(report->app_id));
-       report->pid = generator->process_gen->pid;
-
-       return 0;
-}
-
-int report_generator_generate_app_memory_usage_report(
-               report_generator_app_t *generator,
-               struct process_usage_report *report)
-{
-       ON_NULL_RETURN_VAL(generator, -1);
-       ON_NULL_RETURN_VAL(report, -1);
-
-       if (_app_report_generator_setup_process_generator(generator)) {
-               ERR("_app_report_generator_setup_process_generator failed.");
+               ERR("stats_get_system_cpu_usage_average failed");
                return -1;
        }
 
-       if (report_generator_generate_process_memory_usage_report(
-                               generator->process_gen, report) != 0)
-       {
-               ERR("report_generator_generate_process_memory_usage_report failed.");
-               return 0;
+       if (sys_stats_get_memory_usage_percentage(&generator->stats, &report->memory) != 0) {
+               ERR("stats_get_system_memory_usage failed.");
+               return -1;
        }
 
-       strncpy(report->app_id, generator->app_id, sizeof(report->app_id));
-       report->pid = generator->process_gen->pid;
+       report->time = clock_realtime_get();
 
        return 0;
 }