Merge pull request #186 from powerapi-ng/feat/ticker-actor

feat: Decouple perf sampling ticks from cgroup discovery

Author: gfieni

CMakeLists.txt

@@ -40,6 +40,7 @@ set(SENSOR_SOURCES
     src/storage_csv.c
     src/storage_socket.c
     src/rlimits.c
+    src/ticker.c
     src/sensor.c
 )
 

src/config.c

@@ -53,7 +53,8 @@ config_create(void)
 
     /* sensor default config */
     config->sensor.verbose = 0;
-    config->sensor.frequency = 1000;
+    config->sensor.perf_sampling_interval_ms = 1000;
+    config->sensor.cgroup_discovery_interval_ms = 5000;
     snprintf(config->sensor.cgroup_basepath, PATH_MAX, "%s", "/sys/fs/cgroup");
     gethostname(config->sensor.name, HOST_NAME_MAX);
 
@@ -135,6 +136,16 @@ config_validate(struct config *config)
         return -1;
     }
 
+    if (sensor->perf_sampling_interval_ms == 0) {
+        zsys_error("config: Perf sampling interval must be greater than 0");
+        return -1;
+    }
+
+    if (sensor->cgroup_discovery_interval_ms == 0) {
+        zsys_error("config: Cgroup discovery interval must be greater than 0");
+        return -1;
+    }
+
     if (zhashx_size(events->system) == 0 && zhashx_size(events->containers) == 0) {
 	    zsys_error("config: You must provide event(s) to monitor");
 	    return -1;

src/config.h

@@ -45,7 +45,8 @@
 struct config_sensor
 {
     unsigned int verbose;
-    unsigned int frequency;
+    unsigned int perf_sampling_interval_ms;
+    unsigned int cgroup_discovery_interval_ms;
     char cgroup_basepath[PATH_MAX];
     char name[HOST_NAME_MAX];
 };

src/config_cli.c

@@ -40,9 +40,15 @@
 #include "util.h"
 
 
+enum {
+    OPT_CGROUP_DISCOVERY_INTERVAL = 256,
+};
+
 const char short_opts[] = "x:vf:p:n:s:c:e:or:U:D:C:P:";
 static struct option long_opts[] = {
     {"config-file", required_argument, 0, 'x'},
+    {"perf-sampling-interval", required_argument, 0, 'f'},
+    {"cgroup-discovery-interval", required_argument, 0, OPT_CGROUP_DISCOVERY_INTERVAL},
     {NULL, 0, NULL, 0}
 };
 
@@ -94,16 +100,30 @@ setup_sensor_name(struct config *config, const char *sensor_name)
 }
 
 static int
-setup_frequency(struct config *config, const char *value_str)
+setup_perf_sampling_interval(struct config *config, const char *value_str)
 {
-    unsigned int frequency;
+    unsigned int perf_sampling_interval;
 
-    if (str_to_uint(value_str, &frequency)) {
-        zsys_error("config: cli: Frequency value is invalid");
+    if (str_to_uint(value_str, &perf_sampling_interval)) {
+        zsys_error("config: cli: Perf sampling interval value is invalid");
         return -1;
     }
 
-    config->sensor.frequency = frequency;
+    config->sensor.perf_sampling_interval_ms = perf_sampling_interval;
+    return 0;
+}
+
+static int
+setup_cgroup_discovery_interval(struct config *config, const char *value_str)
+{
+    unsigned int cgroup_discovery_interval;
+
+    if (str_to_uint(value_str, &cgroup_discovery_interval)) {
+        zsys_error("config: cli: Cgroup discovery interval value is invalid");
+        return -1;
+    }
+
+    config->sensor.cgroup_discovery_interval_ms = cgroup_discovery_interval;
     return 0;
 }
 
@@ -320,7 +340,13 @@ config_setup_from_cli(int argc, char **argv, struct config *config)
             break;
 
             case 'f':
-            if (setup_frequency(config, optarg)) {
+            if (setup_perf_sampling_interval(config, optarg)) {
+                return -1;
+            }
+            break;
+
+            case OPT_CGROUP_DISCOVERY_INTERVAL:
+            if (setup_cgroup_discovery_interval(config, optarg)) {
                 return -1;
             }
             break;

src/config_json.c

@@ -88,18 +88,34 @@ setup_sensor_name(struct config *config, json_object *sensor_name_obj)
 }
 
 static int
-setup_frequency(struct config *config, json_object *frequency_obj)
+setup_perf_sampling_interval(struct config *config, json_object *frequency_obj)
 {
-    int frequency;
+    int perf_sampling_interval = -1;
 
     errno = 0;
-    frequency = json_object_get_int(frequency_obj);
-    if (errno != 0 || frequency < 0) {
-        zsys_error("config: json: Frequency value is invalid (positive integer expected)");
+    perf_sampling_interval = json_object_get_int(frequency_obj);
+    if (errno != 0 || perf_sampling_interval <= 0) {
+        zsys_error("config: json: Perf sampling interval value is invalid (positive integer expected)");
         return -1;
     }
 
-    config->sensor.frequency = (unsigned int) frequency;
+    config->sensor.perf_sampling_interval_ms = (unsigned int) perf_sampling_interval;
+    return 0;
+}
+
+static int
+setup_cgroup_discovery_interval(struct config *config, json_object *frequency_obj)
+{
+    int cgroup_discovery_interval = -1;
+
+    errno = 0;
+    cgroup_discovery_interval = json_object_get_int(frequency_obj);
+    if (errno != 0 || cgroup_discovery_interval <= 0) {
+        zsys_error("config: json: Cgroup discovery interval value is invalid (positive integer expected)");
+        return -1;
+    }
+
+    config->sensor.cgroup_discovery_interval_ms = (unsigned int) cgroup_discovery_interval;
     return 0;
 }
 
@@ -385,8 +401,13 @@ process_json_fields(struct config *config, json_object *root)
                 return -1;
             }
         }
-        else if (!strcasecmp(key, "frequency")) {
-            if (setup_frequency(config, value)) {
+        else if (!strcasecmp(key, "frequency") || !strcasecmp(key, "perf-sampling-interval")) {
+            if (setup_perf_sampling_interval(config, value)) {
+                return -1;
+            }
+        }
+        else if (!strcasecmp(key, "cgroup-discovery-interval")) {
+            if (setup_cgroup_discovery_interval(config, value)) {
                 return -1;
             }
         }

src/sensor.c

@@ -47,6 +47,7 @@
 #include "hwinfo.h"
 #include "perf.h"
 #include "report.h"
+#include "ticker.h"
 #include "target.h"
 #include "storage.h"
 #include "storage_null.h"
@@ -139,7 +140,8 @@ main(int argc, char **argv)
     zactor_t *reporting = NULL;
     zhashx_t *cgroups_running = NULL; /* char *cgroup_name -> char *cgroup_absolute_path */
     zhashx_t *container_monitoring_actors = NULL; /* char *actor_name -> zactor_t *actor */
-    zsock_t *ticker = NULL;
+    struct ticker_config *ticker_conf = NULL;
+    zactor_t *ticker = NULL;
     struct target *system_target = NULL;
     struct perf_config *system_monitor_config = NULL;
     zactor_t *system_perf_monitor = NULL;
@@ -258,8 +260,9 @@ main(int argc, char **argv)
     };
     reporting = zactor_new(reporting_actor, &reporting_conf);
 
-    /* create ticker publisher socket */
-    ticker = zsock_new_pub("inproc://ticker");
+    /* start ticker actor */
+    ticker_conf = ticker_config_create(config->sensor.perf_sampling_interval_ms);
+    ticker = zactor_new(ticker_actor, ticker_conf);
 
     /* start system monitoring actor only when needed */
     if (zhashx_size(config->events.system)) {
@@ -277,24 +280,18 @@ main(int argc, char **argv)
             sync_cgroups_running_monitored(hwinfo, config->events.containers, config->sensor.cgroup_basepath, container_monitoring_actors);
         }
 
-        /* send clock tick to monitoring actors */
-        zsock_send(ticker, "s8", "CLOCK_TICK", zclock_time());
-
-        zclock_sleep((int)config->sensor.frequency);
+        zclock_sleep((int)config->sensor.cgroup_discovery_interval_ms);
     }
 
-    /* clean storage module ressources */
-    storage_module_deinitialize(storage);
-
     ret = 0;
 
 cleanup:
+    zactor_destroy(&ticker);
     zhashx_destroy(&cgroups_running);
     zhashx_destroy(&container_monitoring_actors);
     zactor_destroy(&system_perf_monitor);
     zactor_destroy(&reporting);
     storage_module_destroy(storage);
-    zsock_destroy(&ticker);
     config_destroy(config);
     pmu_topology_destroy(sys_pmu_topology);
     pmu_deinitialize();

src/storage.c

@@ -98,6 +98,7 @@ storage_module_destroy(struct storage_module *module)
     if (!module)
         return;
 
+    (*module->deinitialize)(module);
     (*module->destroy)(module);
     free(module);
 }

src/storage_mongodb.c

@@ -201,12 +201,12 @@ mongodb_store_report(struct storage_module *module, struct payload *payload)
 }
 
 static int
-mongodb_deinitialize(struct storage_module *module __attribute__ ((unused)))
+mongodb_deinitialize(struct storage_module *module)
 {
     struct mongodb_context *ctx = (struct mongodb_context *) module->context;
 
     if (!module->is_initialized)
-        return -1;
+        return 0;
 
     mongoc_collection_destroy(ctx->collection);
     mongoc_client_destroy(ctx->client);

src/storage_socket.c

@@ -307,11 +307,12 @@ socket_deinitialize(struct storage_module *module)
     struct socket_context *ctx = (struct socket_context *) module->context;
 
     if (!module->is_initialized)
-        return -1;
+        return 0;
 
     if (ctx->socket_fd != -1)
         close(ctx->socket_fd);
 
+    module->is_initialized = false;
     return 0;
 }