X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=lttng-sessiond%2Fust-app.h;h=f369a8a2fcd503b4ea34534bfc972e1e1ccaf298;hb=5b4a0ec04ce1ee5a4cf4c8a5896edab28750da56;hp=7d198ee3ee9f138ca3121fa022861a1d26bdc980;hpb=d974f19715e70847e2e04efb0d7b2167d884851d;p=lttng-tools.git

diff --git a/lttng-sessiond/ust-app.h b/lttng-sessiond/ust-app.h
index 7d198ee3e..f369a8a2f 100644
--- 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;
@@ -95,18 +98,22 @@ 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(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(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);
+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);
@@ -116,9 +123,19 @@ struct ust_app *ust_app_find_by_pid(pid_t pid);
 #else /* HAVE_LIBLTTNG_UST_CTL */
 
 static inline
-int ust_app_start_trace(struct ltt_ust_session *usess)
+int ust_app_start_trace(struct ltt_ust_session *usess, struct ust_app *app)
 {
-	return -ENOSYS;
+	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)
@@ -157,16 +174,16 @@ 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(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)
 {
-	return -ENOSYS;
+	return 0;
 }
 static inline
 struct cds_lfht *ust_app_get_ht(void)
@@ -177,6 +194,10 @@ static inline
 void ust_app_ht_alloc(void)
 {
 }
+static inline
+void ust_app_global_update(struct ltt_ust_session *usess, int sock)
+{
+}
 
 #endif /* HAVE_LIBLTTNG_UST_CTL */