projects
/
deliverable
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: wrong data structure used in commit df41f83
[deliverable/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 b21d8c2a712bad7e2622b033e2761651905d2182..07af0f1eeb96ac74d57aa87b679989e6570d6572 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 <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;
#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;
};
/* 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 */
};
/* 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;
struct lttng_ust_event attr;
struct lttng_ht_node_str node;
struct lttng_ust_filter_bytecode *filter;
+ struct lttng_event_exclusion *exclusion;
};
/* UST channel */
};
/* UST channel */
@@
-56,21
+60,13
@@
struct ltt_ust_channel {
char name[LTTNG_UST_SYM_NAME_LEN];
struct lttng_ust_channel_attr attr;
struct lttng_ht *ctx;
char name[LTTNG_UST_SYM_NAME_LEN];
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;
uint64_t tracefile_size;
uint64_t tracefile_count;
};
struct lttng_ht *events;
struct lttng_ht_node_str node;
uint64_t tracefile_size;
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 domain global (LTTNG_DOMAIN_UST) */
struct ltt_ust_domain_global {
struct lttng_ht *channels;
@@
-79,9
+75,10
@@
struct ltt_ust_domain_global {
/* UST session */
struct ltt_ust_session {
/* UST session */
struct ltt_ust_session {
-
in
t id; /* Unique identifier of session */
+
uint64_
t id; /* Unique identifier of session */
int start_trace;
struct ltt_ust_domain_global domain_global;
int start_trace;
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;
/* 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;
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,27
+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,
* 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_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(u
nsigned in
t session_id);
+struct ltt_ust_session *trace_ust_create_session(u
int64_
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_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);
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);
/*
* 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);
void trace_ust_destroy_channel(struct ltt_ust_channel *channel);
void trace_ust_destroy_event(struct ltt_ust_event *event);
@@
-201,26
+205,16
@@
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,
- 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;
}
{
return NULL;
}
-
static inline
void trace_ust_destroy_session(struct ltt_ust_session *session)
{
}
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)
{
static inline
void trace_ust_destroy_channel(struct ltt_ust_channel *channel)
{
@@
-237,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,
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;
}
{
return NULL;
}
+static inline
+void trace_ust_delete_channel(struct lttng_ht *ht,
+ struct ltt_ust_channel *channel)
+{
+ return;
+}
#endif /* HAVE_LIBLTTNG_UST_CTL */
#endif /* HAVE_LIBLTTNG_UST_CTL */
This page took
0.026366 seconds
and
5
git commands to generate.