X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-app.h;h=8d2d289864ed1a3114bf846f7a67d5baa1538dc8;hp=6cdb261ae5610147c9fd8068d2aec8df3a9ff8be;hb=eb2827a4f0ccc637bf1d42edebf2607dbea80428;hpb=b006f85d9d07af970f24cfa5ab077bfe599d75c9

diff --git a/src/bin/lttng-sessiond/ust-app.h b/src/bin/lttng-sessiond/ust-app.h
index 6cdb261ae..8d2d28986 100644
--- a/src/bin/lttng-sessiond/ust-app.h
+++ b/src/bin/lttng-sessiond/ust-app.h
@@ -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];
@@ -404,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
@@ -456,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)
 {
 }
@@ -577,7 +572,7 @@ 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)
@@ -596,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;
@@ -637,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
@@ -656,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 */