Fix: sessiond: rotation thread: fatal error when not finding a session

[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 9b42d518d30f2e619ea7f89c5e4dc307454b37b7..8d2d289864ed1a3114bf846f7a67d5baa1538dc8 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
@@ -48,7 +49,7 @@ struct ust_app_ht_key {
  * Application registration data structure.
  */
 struct ust_register_msg {
-       enum ustctl_socket_type type;
+       enum lttng_ust_ctl_socket_type type;
        uint32_t major;
        uint32_t minor;
        uint32_t abi_major;
@@ -114,6 +115,7 @@ struct ust_app_event {
 
 struct ust_app_event_notifier_rule {
        int enabled;
+       uint64_t error_counter_index;
        int handle;
        struct lttng_ust_abi_object_data *obj;
        /* Holds a strong reference. */
@@ -156,7 +158,7 @@ struct ust_app_channel {
        unsigned int expected_stream_count;
        char name[LTTNG_UST_ABI_SYM_NAME_LEN];
        struct lttng_ust_abi_object_data *obj;
-       struct ustctl_consumer_channel_attr attr;
+       struct lttng_ust_ctl_consumer_channel_attr attr;
        struct ust_app_stream_list streams;
        /* Session pointer that owns this object. */
        struct ust_app_session *session;
@@ -235,7 +237,7 @@ struct ust_app_session {
        unsigned int live_timer_interval;       /* usec */
 
        /* Metadata channel attributes. */
-       struct ustctl_consumer_channel_attr metadata_attr;
+       struct lttng_ust_ctl_consumer_channel_attr metadata_attr;
 
        char root_shm_path[PATH_MAX];
        char shm_path[PATH_MAX];
@@ -319,6 +321,9 @@ struct ust_app {
                 */
                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
@@ -399,6 +404,9 @@ int ust_app_supported(void)
        return 1;
 }
 
+bool ust_app_supports_notifiers(const struct ust_app *app);
+bool ust_app_supports_counters(const struct ust_app *app);
+
 #else /* HAVE_LIBLTTNG_UST_CTL */
 
 static inline
@@ -451,14 +459,6 @@ void ust_app_unregister(int sock)
 {
 }
 static inline
-void ust_app_lock_list(void)
-{
-}
-static inline
-void ust_app_unlock_list(void)
-{
-}
-static inline
 void ust_app_clean_list(void)
 {
 }
@@ -572,20 +572,35 @@ static inline
 enum lttng_error_code ust_app_snapshot_record(struct ltt_ust_session *usess,
                const struct consumer_output *output, int wait, uint64_t max_stream_size)
 {
-       return 0;
+       return LTTNG_ERR_UNK;
 }
 static inline
 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)
 {
        return 0;
 }
 static inline
+bool ust_app_supports_notifiers(const struct ust_app *app)
+{
+       return false;
+}
+static inline
+bool ust_app_supports_counters(const struct ust_app *app)
+{
+       return false;
+}
+static inline
 struct ust_app *ust_app_find_by_sock(int sock)
 {
        return NULL;
@@ -627,14 +642,14 @@ int ust_app_regenerate_statedump_all(struct ltt_ust_session *usess)
 static inline
 enum lttng_error_code ust_app_rotate_session(struct ltt_session *session)
 {
-       return 0;
+       return LTTNG_ERR_UNK;
 }
 
 static inline
 enum lttng_error_code ust_app_create_channel_subdirectories(
                const struct ltt_ust_session *session)
 {
-       return 0;
+       return LTTNG_ERR_UNK;
 }
 
 static inline
@@ -646,13 +661,13 @@ int ust_app_release_object(struct ust_app *app, struct lttng_ust_abi_object_data
 static inline
 enum lttng_error_code ust_app_clear_session(struct ltt_session *session)
 {
-       return 0;
+       return LTTNG_ERR_UNK;
 }
 
 static inline
 enum lttng_error_code ust_app_open_packets(struct ltt_session *session)
 {
-       return 0;
+       return LTTNG_ERR_UNK;
 }
 
 #endif /* HAVE_LIBLTTNG_UST_CTL */