projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
shm-path: remove directory hierarchy on destroy
[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 07af0f1eeb96ac74d57aa87b679989e6570d6572..8be813877410fb129a1b0ff3124693580c89161a 100644
(file)
--- a/
src/bin/lttng-sessiond/trace-ust.h
+++ b/
src/bin/lttng-sessiond/trace-ust.h
@@
-27,7
+27,7
@@
#include <common/defaults.h>
#include "consumer.h"
#include <common/defaults.h>
#include "consumer.h"
-#include "
jul
.h"
+#include "
agent
.h"
#include "ust-ctl.h"
struct ltt_ust_ht_key {
#include "ust-ctl.h"
struct ltt_ust_ht_key {
@@
-49,6
+49,7
@@
struct ltt_ust_event {
unsigned int enabled;
struct lttng_ust_event attr;
struct lttng_ht_node_str node;
unsigned int enabled;
struct lttng_ust_event attr;
struct lttng_ht_node_str node;
+ char *filter_expression;
struct lttng_ust_filter_bytecode *filter;
struct lttng_event_exclusion *exclusion;
};
struct lttng_ust_filter_bytecode *filter;
struct lttng_event_exclusion *exclusion;
};
@@
-76,12
+77,14
@@
struct ltt_ust_domain_global {
/* UST session */
struct ltt_ust_session {
uint64_t id; /* Unique identifier of session */
/* UST session */
struct ltt_ust_session {
uint64_t id; /* Unique identifier of session */
- int start_trace;
struct ltt_ust_domain_global domain_global;
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;
/* 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
/*
* 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
@@
-107,6
+110,15
@@
struct ltt_ust_session {
unsigned int snapshot_mode;
unsigned int has_non_default_channel;
unsigned int live_timer_interval; /* usec */
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;
+
+ /*
+ * Path where to keep the shared memory files.
+ */
+ char root_shm_path[PATH_MAX];
+ char shm_path[PATH_MAX];
};
/*
};
/*
@@
-152,6
+164,8
@@
struct ltt_ust_event *trace_ust_find_event(struct lttng_ht *ht,
struct lttng_event_exclusion *exclusion);
struct ltt_ust_channel *trace_ust_find_channel_by_name(struct lttng_ht *ht,
char *name);
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.
/*
* Create functions malloc() the data structure.
@@
-159,10
+173,13
@@
struct ltt_ust_channel *trace_ust_find_channel_by_name(struct lttng_ht *ht,
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 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_context *trace_ust_create_context(
struct lttng_event_context *ctx);
struct lttng_filter_bytecode *filter,
struct lttng_event_exclusion *exclusion);
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);
void trace_ust_delete_channel(struct lttng_ht *ht,
struct ltt_ust_channel *channel);
@@
-205,6
+222,7
@@
struct ltt_ust_channel *trace_ust_create_channel(struct lttng_channel *attr)
}
static inline
struct ltt_ust_event *trace_ust_create_event(struct lttng_event *ev,
}
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)
{
struct lttng_filter_bytecode *filter,
struct lttng_event_exclusion *exclusion)
{
@@
-230,6
+248,12
@@
struct ltt_ust_context *trace_ust_create_context(
{
return NULL;
}
{
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)
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)
@@
-242,6
+266,12
@@
void trace_ust_delete_channel(struct lttng_ht *ht,
{
return;
}
{
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 */
#endif /* HAVE_LIBLTTNG_UST_CTL */
This page took
0.028032 seconds
and
5
git commands to generate.