#include <common/defaults.h>
#include "consumer.h"
-#include "jul.h"
+#include "agent.h"
#include "ust-ctl.h"
struct ltt_ust_ht_key {
unsigned int enabled;
struct lttng_ust_event attr;
struct lttng_ht_node_str node;
+ char *filter_expression;
struct lttng_ust_filter_bytecode *filter;
- const struct lttng_event_exclusion *exclusion;
+ struct lttng_event_exclusion *exclusion;
};
/* UST channel */
uint64_t tracefile_count;
};
-/* 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;
-};
-
/* UST domain global (LTTNG_DOMAIN_UST) */
struct ltt_ust_domain_global {
struct lttng_ht *channels;
/* UST session */
struct ltt_ust_session {
uint64_t id; /* Unique identifier of session */
- int start_trace;
struct ltt_ust_domain_global domain_global;
- struct jul_domain domain_jul;
+ /* Hash table of agent indexed by agent domain. */
+ struct lttng_ht *agents;
/* UID/GID of the user owning the session */
uid_t uid;
gid_t gid;
+ /* Is the session active meaning has is been started or stopped. */
+ unsigned int active:1;
/*
* Two consumer_output object are needed where one is for the current
* output object and the second one is the temporary object used to store
unsigned int snapshot_mode;
unsigned int has_non_default_channel;
unsigned int live_timer_interval; /* usec */
+
+ /* Metadata channel attributes. */
+ struct lttng_ust_channel_attr metadata_attr;
};
/*
struct lttng_event_exclusion *exclusion);
struct ltt_ust_channel *trace_ust_find_channel_by_name(struct lttng_ht *ht,
char *name);
+struct agent *trace_ust_find_agent(struct ltt_ust_session *session,
+ enum lttng_domain_type domain_type);
/*
* Create functions malloc() the data structure.
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,
+ char *filter_expression,
struct lttng_filter_bytecode *filter,
struct lttng_event_exclusion *exclusion);
-struct ltt_ust_metadata *trace_ust_create_metadata(char *path);
struct ltt_ust_context *trace_ust_create_context(
struct lttng_event_context *ctx);
+int trace_ust_match_context(struct ltt_ust_context *uctx,
+ struct lttng_event_context *ctx);
void trace_ust_delete_channel(struct lttng_ht *ht,
struct ltt_ust_channel *channel);
* 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);
}
static inline
struct ltt_ust_event *trace_ust_create_event(struct lttng_event *ev,
+ const char *filter_expression,
struct lttng_filter_bytecode *filter,
struct lttng_event_exclusion *exclusion)
{
return NULL;
}
-static inline
-struct ltt_ust_metadata *trace_ust_create_metadata(char *path)
-{
- 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)
{
{
return NULL;
}
+static inline
+int trace_ust_match_context(struct ltt_ust_context *uctx,
+ struct lttng_event_context *ctx)
+{
+ return 0;
+}
static inline struct ltt_ust_event *trace_ust_find_event(struct lttng_ht *ht,
char *name, struct lttng_filter_bytecode *filter, int loglevel,
struct lttng_event_exclusion *exclusion)
{
return;
}
+static inline
+struct agent *trace_ust_find_agent(struct ltt_ust_session *session,
+ enum lttng_domain_type domain_type)
+{
+ return NULL;
+}
#endif /* HAVE_LIBLTTNG_UST_CTL */