report-generator: remove interval param

The interval parameter was unused in fact, so remove it
to simplify code.

Change-Id: Ic527f753773f2a0f482398a5a43c26859aadfae3

diff --git a/src/report-generator.c b/src/report-generator.c
index a65ab6b..3901899 100644 (file)
--- a/src/report-generator.c
+++ b/src/report-generator.c
@@ -140,25 +140,14 @@ void report_generator_free_app_generator(report_generator_app_t *generator)
 
 int report_generator_generate_system_cpu_usage_report(
                report_generator_system_t *generator,
-               int interval,
                struct system_usage_report *report)
 {
        ON_NULL_RETURN_VAL(generator, -1);
-       ON_TRUE_RETURN_VAL(interval < 0, -1);
        ON_NULL_RETURN_VAL(report, -1);
 
        float usage;
-       bool block = interval > 0;
        struct stats_system current;
 
-       if (block) {
-               if (stats_update_system_stats(&generator->previous) != 0) {
-                       ERR("stats_update_system_stats failed.");
-                       return -1;
-               }
-               sleep(interval);
-       }
-
        if (stats_update_system_stats(&current) != 0) {
                ERR("stats_update_system_stats failed.");
                return -1;
@@ -204,25 +193,14 @@ int report_generator_generate_system_memory_usage_report(
 
 int report_generator_generate_process_cpu_usage_report(
                report_generator_process_t *generator,
-               int interval,
                struct process_usage_report *report)
 {
        ON_NULL_RETURN_VAL(generator, -1);
-       ON_TRUE_RETURN_VAL(interval < 0, -1);
        ON_NULL_RETURN_VAL(report, -1);
 
        struct stats_process current = {0,};
-       bool block = interval > 0;
        float usage;
 
-       if (block) {
-               if (stats_update_process_stats(generator->pid, &generator->previous) != 0) {
-                       ERR("stats_update_process_stats failed.");
-                       return -1;
-               }
-               sleep(interval);
-       }
-
        if (stats_update_process_stats(generator->pid, &current) != 0) {
                ERR("stats_update_process_stats failed.");
                return -1;
@@ -279,11 +257,9 @@ int _app_report_generator_setup_process_generator(report_generator_app_t *genera
 
 int report_generator_generate_app_cpu_usage_report(
                report_generator_app_t *generator,
-               int interval,
                struct process_usage_report *report)
 {
        ON_NULL_RETURN_VAL(generator, -1);
-       ON_TRUE_RETURN_VAL(interval < 0, -1);
        ON_NULL_RETURN_VAL(report, -1);
 
        if (_app_report_generator_setup_process_generator(generator) != 0) {
@@ -292,7 +268,7 @@ int report_generator_generate_app_cpu_usage_report(
        }
 
        if (report_generator_generate_process_cpu_usage_report(
-                               generator->process_gen, interval, report) != 0)
+                               generator->process_gen, report) != 0)
        {
                ERR("report_generator_generate_process_cpu_usage_report failed.");
                return 0;

diff --git a/src/report-generator.h b/src/report-generator.h
index 836a393..8f36faa 100644 (file)
--- a/src/report-generator.h
+++ b/src/report-generator.h
@@ -109,20 +109,17 @@ void report_generator_free_top_generator(report_generator_top_t *generator);
 /**
  * @brief Fills system_usage_report.
  *
- * When interval > 0 the function will block for interval seconds and return report with
- * system cpu usage calculated as average during interval period.
- * When interval == 0 the function will not block and return report with cpu
- * system usage calculated as average between current time and last call to
- * report_generator_generate_system_cpu_usage_report for generator
+ * return report with cpu system usage calculated as average between current
+ * time and last call to report_generator_generate_system_cpu_usage_report for
+ * generator
  *
  * @param[in] generator system generator
- * @param[in] interval in seconds, Should be >= 0
  * @param[out] report
+ *
  * @return 0 on success, other value on failure
  */
 int report_generator_generate_system_cpu_usage_report(
                report_generator_system_t *generator,
-               int interval,
                struct system_usage_report *report);
 
 /**
@@ -139,20 +136,17 @@ int report_generator_generate_system_memory_usage_report(
 /**
  * @brief Fills process_usage_report.
  *
- * When interval > 0 the function will block for interval seconds and return report with
- * process cpu usage calculated as average during interval period.
- * When interval == 0 the function will not block and return report with process
- * cpu usage calculated as average between current time and last call to
- * report_generator_generate_process_cpu_usage_report for generator
+ * return report with process cpu usage calculated as average between current
+ * time and last call to report_generator_generate_process_cpu_usage_report for
+ * generator
  *
  * @param[in] generator process generator
- * @param[in] interval in seconds, Should be >= 0
  * @param[out] report
+ *
  * @return 0 on success, other value on failure
  */
 int report_generator_generate_process_cpu_usage_report(
                report_generator_process_t *generator,
-               int interval,
                struct process_usage_report *report);
 
 /**
@@ -169,21 +163,18 @@ int report_generator_generate_proccess_memory_usage_report(
 /**
  * @brief Fills apps_cpu_usage_report.
  *
- * When interval > 0 the function will block for interval seconds and return report with
- * apps cpu usage calculated as average during interval period.
- * When interval == 0 the function will not block and return report with apps
- * cpu usage calculated as average between current time and last call to
- * report_generator_generate_process_cpu_usage_report for generator
+ * return report with apps cpu usage calculated as average between current time
+ * and last call to report_generator_generate_process_cpu_usage_report for
+ * generator
  *
  * @param[in] generator apps generator
- * @param[in] interval in seconds, Should be >= 0
  * @param[out] report
+ *
  * @return 0 on success, other value on failure
  * @remarks Returned value should be freed.
  */
 int report_generator_generate_app_cpu_usage_report(
                report_generator_app_t *generator,
-               int interval,
                struct process_usage_report *report);
 
 /**

diff --git a/src/task-factory.c b/src/task-factory.c
index 53a1a5c..782b9c9 100644 (file)
--- a/src/task-factory.c
+++ b/src/task-factory.c
@@ -141,7 +141,7 @@ static void execute_scan_system_cpu(task_t *task)
 
     struct system_usage_report report;
 
-    int ret = report_generator_generate_system_cpu_usage_report(_system_task->report_generator, 0, &report);
+    int ret = report_generator_generate_system_cpu_usage_report(_system_task->report_generator, &report);
     ON_TRUE_RETURN(ret != 0);
 
     char *json_report = report_json_serializer_serialize_system_cpu_usage_report(&report);
@@ -186,7 +186,7 @@ static void execute_scan_apps_cpu(task_t *task)
 
     struct process_usage_report reports;
 
-    report_generator_generate_app_cpu_usage_report(_app_task->report_generator, 0, &reports);
+    report_generator_generate_app_cpu_usage_report(_app_task->report_generator, &reports);
 
     char *json_report = report_json_serializer_serialize_apps_cpu_usage_report(&reports);
     ipc_send_report(json_report);