Multiple fixes when cleaning app and UST sessions

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

diff --git a/lttng-sessiond/ust-app.h b/lttng-sessiond/ust-app.h
index 46fb65427b140b888360dff31a656a29d37c88be..3fa4d423ccbf69c2dabd499f2cb843275074f2c7 100644 (file)
--- a/lttng-sessiond/ust-app.h
+++ b/lttng-sessiond/ust-app.h
@@ -24,6 +24,8 @@
 
 #include "trace-ust.h"
 
+#define UST_APP_EVENT_LIST_SIZE 32
+
 /*
  * Application registration data structure.
  */
@@ -54,6 +56,7 @@ 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 cds_lfht *ctx;
        struct cds_lfht_node node;
@@ -65,7 +68,7 @@ struct ust_app_channel {
        char name[LTTNG_UST_SYM_NAME_LEN];
        struct lttng_ust_channel attr;
        struct lttng_ust_object_data *obj;
-       struct cds_lfht *streams;
+       struct ltt_ust_stream_list streams;
        struct cds_lfht *ctx;
        struct cds_lfht *events;
        struct cds_lfht_node node;
@@ -95,26 +98,45 @@ struct ust_app {
        struct cds_lfht *sessions;
        struct cds_lfht_node node;
        struct ust_app_key key;
+       int sock_closed;
 };
 
-#ifdef CONFIG_LTTNG_TOOLS_HAVE_UST
+#ifdef HAVE_LIBLTTNG_UST_CTL
 
 int ust_app_register(struct ust_register_msg *msg, int sock);
 void ust_app_unregister(int sock);
-int ust_app_add_channel(struct ltt_ust_session *usess,
+int ust_app_add_channel_all(struct ltt_ust_session *usess,
                struct ltt_ust_channel *uchan);
-int ust_app_add_event(struct ltt_ust_session *usess,
+int ust_app_add_event_all(struct ltt_ust_session *usess,
                struct ltt_ust_channel *uchan, struct ltt_ust_event *uevent);
 unsigned long ust_app_list_count(void);
-int ust_app_start_trace(struct ltt_ust_session *usess);
+int ust_app_start_trace(struct ltt_ust_session *usess, struct ust_app *app);
+int ust_app_start_trace_all(struct ltt_ust_session *usess);
+int ust_app_list_events(struct lttng_event **events);
+void ust_app_global_update(struct ltt_ust_session *usess, int sock);
 
 void ust_app_clean_list(void);
 void ust_app_ht_alloc(void);
 struct cds_lfht *ust_app_get_ht(void);
 struct ust_app *ust_app_find_by_pid(pid_t pid);
 
-#else
+#else /* HAVE_LIBLTTNG_UST_CTL */
 
+static inline
+int ust_app_start_trace(struct ltt_ust_session *usess, struct ust_app *app)
+{
+       return 0;
+}
+static inline
+int ust_app_start_trace_all(struct ltt_ust_session *usess)
+{
+       return 0;
+}
+static inline
+int ust_app_list_events(struct lttng_event **events)
+{
+       return 0;
+}
 static inline
 int ust_app_register(struct ust_register_msg *msg, int sock)
 {
@@ -129,7 +151,6 @@ unsigned int ust_app_list_count(void)
 {
        return 0;
 }
-
 static inline
 void ust_app_lock_list(void)
 {
@@ -152,14 +173,32 @@ struct ust_app *ust_app_get_by_pid(pid_t pid)
 {
        return NULL;
 }
-
 static inline
-int ust_app_add_channel(struct ltt_ust_session *usess,
+int ust_app_add_channel_all(struct ltt_ust_session *usess,
                struct ltt_ust_channel *uchan)
 {
        return 0;
 }
+static inline
+int ust_app_add_event_all(struct ltt_ust_session *usess,
+               struct ltt_ust_channel *uchan, struct ltt_ust_event *uevent)
+{
+       return 0;
+}
+static inline
+struct cds_lfht *ust_app_get_ht(void)
+{
+       return NULL;
+}
+static inline
+void ust_app_ht_alloc(void)
+{
+}
+static inline
+void ust_app_global_update(struct ltt_ust_session *usess, int sock)
+{
+}
 
-#endif /* CONFIG_LTTNG_TOOLS_HAVE_UST */
+#endif /* HAVE_LIBLTTNG_UST_CTL */
 
 #endif /* _LTT_UST_APP_H */