Clean-up: sessiond: prepend `the_` to global variable names

[lttng-tools.git] / src / bin / lttng-sessiond / ust-app.h

diff --git a/src/bin/lttng-sessiond/ust-app.h b/src/bin/lttng-sessiond/ust-app.h
index 29024b4de897872dd33637b2f36d78220027e031..3dfb562150fe437f4263000fca9e4cc2fde20eae 100644 (file)
--- a/src/bin/lttng-sessiond/ust-app.h
+++ b/src/bin/lttng-sessiond/ust-app.h
@@ -11,6 +11,7 @@
 
 #include <stdint.h>
 
+#include <common/index-allocator.h>
 #include <common/uuid.h>
 
 #include "trace-ust.h"
@@ -25,7 +26,7 @@
 struct lttng_bytecode;
 struct lttng_ust_filter_bytecode;
 
-extern int ust_consumerd64_fd, ust_consumerd32_fd;
+extern int the_ust_consumerd64_fd, the_ust_consumerd32_fd;
 
 /*
  * Object used to close the notify socket in a call_rcu(). Since the
@@ -40,7 +41,7 @@ struct ust_app_notify_sock_obj {
 struct ust_app_ht_key {
        const char *name;
        const struct lttng_bytecode *filter;
-       enum lttng_ust_loglevel_type loglevel_type;
+       enum lttng_ust_abi_loglevel_type loglevel_type;
        const struct lttng_event_exclusion *exclusion;
 };
 
@@ -96,7 +97,7 @@ struct ust_app_stream_list {
 struct ust_app_ctx {
        int handle;
        struct lttng_ust_context_attr ctx;
-       struct lttng_ust_object_data *obj;
+       struct lttng_ust_abi_object_data *obj;
        struct lttng_ht_node_ulong node;
        struct cds_list_head list;
 };
@@ -104,9 +105,9 @@ struct ust_app_ctx {
 struct ust_app_event {
        int enabled;
        int handle;
-       struct lttng_ust_object_data *obj;
-       struct lttng_ust_event attr;
-       char name[LTTNG_UST_SYM_NAME_LEN];
+       struct lttng_ust_abi_object_data *obj;
+       struct lttng_ust_abi_event attr;
+       char name[LTTNG_UST_ABI_SYM_NAME_LEN];
        struct lttng_ht_node_str node;
        struct lttng_bytecode *filter;
        struct lttng_event_exclusion *exclusion;
@@ -114,8 +115,9 @@ struct ust_app_event {
 
 struct ust_app_event_notifier_rule {
        int enabled;
+       uint64_t error_counter_index;
        int handle;
-       struct lttng_ust_object_data *obj;
+       struct lttng_ust_abi_object_data *obj;
        /* Holds a strong reference. */
        struct lttng_trigger *trigger;
        /* Unique ID returned by the tracer to identify this event notifier. */
@@ -134,7 +136,7 @@ struct ust_app_stream {
        char pathname[PATH_MAX];
        /* Format is %s_%d respectively channel name and CPU number. */
        char name[DEFAULT_STREAM_NAME_LEN];
-       struct lttng_ust_object_data *obj;
+       struct lttng_ust_abi_object_data *obj;
        /* Using a list of streams to keep order. */
        struct cds_list_head list;
 };
@@ -154,8 +156,8 @@ struct ust_app_channel {
        uint64_t tracing_channel_id;
        /* Number of stream that this channel is expected to receive. */
        unsigned int expected_stream_count;
-       char name[LTTNG_UST_SYM_NAME_LEN];
-       struct lttng_ust_object_data *obj;
+       char name[LTTNG_UST_ABI_SYM_NAME_LEN];
+       struct lttng_ust_abi_object_data *obj;
        struct ustctl_consumer_channel_attr attr;
        struct ust_app_stream_list streams;
        /* Session pointer that owns this object. */
@@ -267,7 +269,7 @@ struct ust_app {
        int compatible; /* If the lttng-ust tracer version does not match the
                                           supported version of the session daemon, this flag is
                                           set to 0 (NOT compatible) else 1. */
-       struct lttng_ust_tracer_version version;
+       struct lttng_ust_abi_tracer_version version;
        uint32_t v_major;    /* Version major number */
        uint32_t v_minor;    /* Version minor number */
        /* Extra for the NULL byte. */
@@ -317,8 +319,11 @@ struct ust_app {
                 * Handle to the lttng_ust object representing the event
                 * notifier group.
                 */
-               struct lttng_ust_object_data *object;
+               struct lttng_ust_abi_object_data *object;
                struct lttng_pipe *event_pipe;
+               struct lttng_ust_abi_object_data *counter;
+               struct lttng_ust_abi_object_data **counter_cpu;
+               int nr_counter_cpu;
        } event_notifier_group;
        /*
         * Hashtable indexing the application's event notifier rule's
@@ -355,6 +360,8 @@ void ust_app_global_update_all(struct ltt_ust_session *usess);
 void ust_app_global_update_event_notifier_rules(struct ust_app *app);
 void ust_app_global_update_all_event_notifier_rules(void);
 
+void ust_app_update_event_notifier_error_count(struct lttng_trigger *trigger);
+
 void ust_app_clean_list(void);
 int ust_app_ht_alloc(void);
 struct ust_app *ust_app_find_by_pid(pid_t pid);
@@ -387,7 +394,7 @@ enum lttng_error_code ust_app_rotate_session(struct ltt_session *session);
 enum lttng_error_code ust_app_create_channel_subdirectories(
                const struct ltt_ust_session *session);
 int ust_app_release_object(struct ust_app *app,
-               struct lttng_ust_object_data *data);
+               struct lttng_ust_abi_object_data *data);
 enum lttng_error_code ust_app_clear_session(struct ltt_session *session);
 enum lttng_error_code ust_app_open_packets(struct ltt_session *session);
 
@@ -579,7 +586,12 @@ unsigned int ust_app_get_nb_stream(struct ltt_ust_session *usess)
 {
        return 0;
 }
-
+static inline
+void ust_app_update_event_notifier_error_count(
+               struct lttng_trigger *lttng_trigger)
+{
+       return;
+}
 static inline
 int ust_app_supported(void)
 {
@@ -638,7 +650,7 @@ enum lttng_error_code ust_app_create_channel_subdirectories(
 }
 
 static inline
-int ust_app_release_object(struct ust_app *app, struct lttng_ust_object_data *data)
+int ust_app_release_object(struct ust_app *app, struct lttng_ust_abi_object_data *data)
 {
        return 0;
 }