Ensure sockets are kept open across all their hash table life-span

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

diff --git a/lttng-sessiond/ust-app.h b/lttng-sessiond/ust-app.h
index a69ed845162ac71adb7ca88f1aee70e9a9b1f35b..f8b0c6c6db604ff12d07e3b1307e3a901057130b 100644 (file)
--- a/lttng-sessiond/ust-app.h
+++ b/lttng-sessiond/ust-app.h
@@ -26,6 +26,8 @@
 
 #define UST_APP_EVENT_LIST_SIZE 32
 
+extern int ust_consumer_fd;
+
 /*
  * Application registration data structure.
  */
@@ -56,6 +58,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;
@@ -81,6 +84,7 @@ struct ust_app_session {
        struct lttng_ust_object_data *obj;
        struct cds_lfht *channels; /* Registered channels */
        struct cds_lfht_node node;
+       char path[PATH_MAX];
 };
 
 /*
@@ -97,16 +101,15 @@ struct ust_app {
        struct cds_lfht *sessions;
        struct cds_lfht_node node;
        struct ust_app_key key;
-       int sock_closed;
 };
 
 #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_all(struct ltt_ust_session *usess,
+int ust_app_create_channel_all(struct ltt_ust_session *usess,
                struct ltt_ust_channel *uchan);
-int ust_app_add_event_all(struct ltt_ust_session *usess,
+int ust_app_create_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, struct ust_app *app);