Fix: remove unused code in session daemon

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

diff --git a/src/bin/lttng-sessiond/trace-ust.h b/src/bin/lttng-sessiond/trace-ust.h
index 87fe412d6b862ed0c5eed27af988c55affbdabbd..f2f8c7e3654bfe3be456d1e32e3a711bf48c3d7d 100644 (file)
--- a/src/bin/lttng-sessiond/trace-ust.h
+++ b/src/bin/lttng-sessiond/trace-ust.h
@@ -27,18 +27,21 @@
 #include <common/defaults.h>
 
 #include "consumer.h"
+#include "jul.h"
 #include "ust-ctl.h"
 
 struct ltt_ust_ht_key {
        const char *name;
        const struct lttng_filter_bytecode *filter;
        enum lttng_ust_loglevel_type loglevel;
+       const struct lttng_event_exclusion *exclusion;
 };
 
 /* Context hash table nodes */
 struct ltt_ust_context {
        struct lttng_ust_context ctx;
        struct lttng_ht_node_ulong node;
+       struct cds_list_head list;
 };
 
 /* UST event */
@@ -47,6 +50,7 @@ struct ltt_ust_event {
        struct lttng_ust_event attr;
        struct lttng_ht_node_str node;
        struct lttng_ust_filter_bytecode *filter;
+       const struct lttng_event_exclusion *exclusion;
 };
 
 /* UST channel */
@@ -54,20 +58,13 @@ struct ltt_ust_channel {
        uint64_t id;    /* unique id per session. */
        unsigned int enabled;
        char name[LTTNG_UST_SYM_NAME_LEN];
-       char pathname[PATH_MAX];
        struct lttng_ust_channel_attr attr;
        struct lttng_ht *ctx;
+       struct cds_list_head ctx_list;
        struct lttng_ht *events;
        struct lttng_ht_node_str node;
-};
-
-/* UST Metadata */
-struct ltt_ust_metadata {
-       int handle;
-       struct lttng_ust_object_data *obj;
-       char pathname[PATH_MAX];              /* Trace file path name */
-       struct lttng_ust_channel_attr attr;
-       struct lttng_ust_object_data *stream_obj;
+       uint64_t tracefile_size;
+       uint64_t tracefile_count;
 };
 
 /* UST domain global (LTTNG_DOMAIN_UST) */
@@ -78,10 +75,10 @@ struct ltt_ust_domain_global {
 
 /* UST session */
 struct ltt_ust_session {
-       int id;    /* Unique identifier of session */
+       uint64_t id;    /* Unique identifier of session */
        int start_trace;
-       char pathname[PATH_MAX];
        struct ltt_ust_domain_global domain_global;
+       struct jul_domain domain_jul;
        /* UID/GID of the user owning the session */
        uid_t uid;
        gid_t gid;
@@ -105,6 +102,11 @@ struct ltt_ust_session {
        uint64_t next_channel_id;
        /* Once this value reaches UINT32_MAX, no more id can be allocated. */
        uint64_t used_channel_id;
+       /* Tell or not if the session has to output the traces. */
+       unsigned int output_traces;
+       unsigned int snapshot_mode;
+       unsigned int has_non_default_channel;
+       unsigned int live_timer_interval;       /* usec */
 };
 
 /*
@@ -146,29 +148,29 @@ int trace_ust_ht_match_event_by_name(struct cds_lfht_node *node,
  * Lookup functions. NULL is returned if not found.
  */
 struct ltt_ust_event *trace_ust_find_event(struct lttng_ht *ht,
-               char *name, struct lttng_filter_bytecode *filter, int loglevel);
+               char *name, struct lttng_filter_bytecode *filter, int loglevel,
+               struct lttng_event_exclusion *exclusion);
 struct ltt_ust_channel *trace_ust_find_channel_by_name(struct lttng_ht *ht,
                char *name);
 
 /*
  * Create functions malloc() the data structure.
  */
-struct ltt_ust_session *trace_ust_create_session(char *path,
-               unsigned int session_id);
-struct ltt_ust_channel *trace_ust_create_channel(struct lttng_channel *attr,
-               char *path);
+struct ltt_ust_session *trace_ust_create_session(uint64_t session_id);
+struct ltt_ust_channel *trace_ust_create_channel(struct lttng_channel *attr);
 struct ltt_ust_event *trace_ust_create_event(struct lttng_event *ev,
-               struct lttng_filter_bytecode *filter);
-struct ltt_ust_metadata *trace_ust_create_metadata(char *path);
+               struct lttng_filter_bytecode *filter,
+               struct lttng_event_exclusion *exclusion);
 struct ltt_ust_context *trace_ust_create_context(
                struct lttng_event_context *ctx);
+void trace_ust_delete_channel(struct lttng_ht *ht,
+               struct ltt_ust_channel *channel);
 
 /*
  * Destroy functions free() the data structure and remove from linked list if
  * it's applies.
  */
 void trace_ust_destroy_session(struct ltt_ust_session *session);
-void trace_ust_destroy_metadata(struct ltt_ust_metadata *metadata);
 void trace_ust_destroy_channel(struct ltt_ust_channel *channel);
 void trace_ust_destroy_event(struct ltt_ust_event *event);
 
@@ -192,39 +194,27 @@ struct ltt_ust_channel *trace_ust_find_channel_by_name(struct lttng_ht *ht,
 }
 
 static inline
-struct ltt_ust_session *trace_ust_create_session(char *path,
-               unsigned int session_id)
+struct ltt_ust_session *trace_ust_create_session(unsigned int session_id)
 {
        return NULL;
 }
 static inline
-struct ltt_ust_channel *trace_ust_create_channel(struct lttng_channel *attr,
-               char *path)
+struct ltt_ust_channel *trace_ust_create_channel(struct lttng_channel *attr)
 {
        return NULL;
 }
 static inline
 struct ltt_ust_event *trace_ust_create_event(struct lttng_event *ev,
-               struct lttng_filter_bytecode *filter)
-{
-       return NULL;
-}
-static inline
-struct ltt_ust_metadata *trace_ust_create_metadata(char *path)
+               struct lttng_filter_bytecode *filter,
+               struct lttng_event_exclusion *exclusion)
 {
        return NULL;
 }
-
 static inline
 void trace_ust_destroy_session(struct ltt_ust_session *session)
 {
 }
 
-static inline
-void trace_ust_destroy_metadata(struct ltt_ust_metadata *metadata)
-{
-}
-
 static inline
 void trace_ust_destroy_channel(struct ltt_ust_channel *channel)
 {
@@ -241,10 +231,17 @@ struct ltt_ust_context *trace_ust_create_context(
        return NULL;
 }
 static inline struct ltt_ust_event *trace_ust_find_event(struct lttng_ht *ht,
-               char *name, struct lttng_filter_bytecode *filter, int loglevel)
+               char *name, struct lttng_filter_bytecode *filter, int loglevel,
+               struct lttng_event_exclusion *exclusion)
 {
        return NULL;
 }
+static inline
+void trace_ust_delete_channel(struct lttng_ht *ht,
+               struct ltt_ust_channel *channel)
+{
+       return;
+}
 
 #endif /* HAVE_LIBLTTNG_UST_CTL */