Change the UST event hash table match function

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

diff --git a/src/bin/lttng-sessiond/ust-app.h b/src/bin/lttng-sessiond/ust-app.h
index 29eaea7ec4141706a7ebc75ddfa770bc773614b3..72adf50aa42d50970511ebbae357f5bc8778c492 100644 (file)
--- a/src/bin/lttng-sessiond/ust-app.h
+++ b/src/bin/lttng-sessiond/ust-app.h
@@ -24,12 +24,21 @@
 
 /* lttng-ust supported version. */
 #define LTTNG_UST_COMM_MAJOR          2        /* comm protocol major version */
-#define UST_APP_MAJOR_VERSION         2 /* UST version supported */
+#define UST_APP_MAJOR_VERSION         3 /* Internal UST version supported */
 
 #define UST_APP_EVENT_LIST_SIZE 32
 
+struct lttng_filter_bytecode;
+struct lttng_ust_filter_bytecode;
+
 extern int ust_consumerd64_fd, ust_consumerd32_fd;
 
+struct ust_app_ht_key {
+       const char *name;
+       const struct lttng_ust_filter_bytecode *filter;
+       enum lttng_ust_loglevel_type loglevel;
+};
+
 /*
  * Application registration data structure.
  */
@@ -69,8 +78,8 @@ struct ust_app_event {
        struct lttng_ust_object_data *obj;
        struct lttng_ust_event attr;
        char name[LTTNG_UST_SYM_NAME_LEN];
-       struct lttng_ht *ctx;
        struct lttng_ht_node_str node;
+       struct lttng_ust_filter_bytecode *filter;
 };
 
 struct ust_app_channel {
@@ -163,11 +172,11 @@ int ust_app_enable_all_event_glb(struct ltt_ust_session *usess,
                struct ltt_ust_channel *uchan);
 int ust_app_disable_event_glb(struct ltt_ust_session *usess,
                struct ltt_ust_channel *uchan, struct ltt_ust_event *uevent);
-int ust_app_add_ctx_event_glb(struct ltt_ust_session *usess,
-               struct ltt_ust_channel *uchan, struct ltt_ust_event *uevent,
-               struct ltt_ust_context *uctx);
 int ust_app_add_ctx_channel_glb(struct ltt_ust_session *usess,
                struct ltt_ust_channel *uchan, struct ltt_ust_context *uctx);
+int ust_app_set_filter_event_glb(struct ltt_ust_session *usess,
+                struct ltt_ust_channel *uchan, struct ltt_ust_event *uevent,
+               struct lttng_filter_bytecode *bytecode);
 void ust_app_global_update(struct ltt_ust_session *usess, int sock);
 
 void ust_app_clean_list(void);
@@ -310,13 +319,6 @@ int ust_app_enable_event_glb(struct ltt_ust_session *usess,
        return 0;
 }
 static inline
-int ust_app_add_ctx_event_glb(struct ltt_ust_session *usess,
-               struct ltt_ust_channel *uchan, struct ltt_ust_event *uevent,
-               struct ltt_ust_context *uctx)
-{
-       return 0;
-}
-static inline
 int ust_app_add_ctx_channel_glb(struct ltt_ust_session *usess,
                struct ltt_ust_channel *uchan, struct ltt_ust_context *uctx)
 {
@@ -346,6 +348,13 @@ int ust_app_calibrate_glb(struct lttng_ust_calibrate *calibrate)
 {
        return 0;
 }
+static inline
+int ust_app_set_filter_event_glb(struct ltt_ust_session *usess,
+               struct ltt_ust_channel *uchan, struct ltt_ust_event *uevent,
+               struct lttng_filter_bytecode *bytecode)
+{
+       return 0;
+}
 
 #endif /* HAVE_LIBLTTNG_UST_CTL */