X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-app.h;h=77a365409780a36c6bcd35ca8bef6bf15632b38c;hb=acfb63a8ba86cb7d89cfeea515abceb89f2907e9;hp=7a4cf1537c9c577df02f13cd62e12f9bbbdac679;hpb=533a90fb2d8d6892b86261951658cab6150a8ed6;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/ust-app.h b/src/bin/lttng-sessiond/ust-app.h
index 7a4cf1537..77a365409 100644
--- a/src/bin/lttng-sessiond/ust-app.h
+++ b/src/bin/lttng-sessiond/ust-app.h
@@ -26,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
@@ -49,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;
@@ -158,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;
@@ -237,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];
@@ -360,8 +360,6 @@ 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);
@@ -406,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
@@ -458,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)
 {
 }
@@ -598,6 +591,16 @@ 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;