projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: don't start session if no channel
[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 06d0202d1d1fdb323f94baafd8577c8e58714f29..07af0f1eeb96ac74d57aa87b679989e6570d6572 100644
(file)
--- a/
src/bin/lttng-sessiond/trace-ust.h
+++ b/
src/bin/lttng-sessiond/trace-ust.h
@@
-50,7
+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;
-
const
struct lttng_event_exclusion *exclusion;
+ struct lttng_event_exclusion *exclusion;
};
/* UST channel */
};
/* UST channel */
@@
-67,15
+67,6
@@
struct ltt_ust_channel {
uint64_t tracefile_count;
};
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;
@@
-157,7
+148,8
@@
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);
struct ltt_ust_channel *trace_ust_find_channel_by_name(struct lttng_ht *ht,
char *name);
@@
-167,8
+159,8
@@
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,
- 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_context *trace_ust_create_context(
struct lttng_event_context *ctx);
void trace_ust_delete_channel(struct lttng_ht *ht,
@@
-179,7
+171,6
@@
void trace_ust_delete_channel(struct lttng_ht *ht,
* it's applies.
*/
void trace_ust_destroy_session(struct ltt_ust_session *session);
* 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);
@@
-214,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)
+ struct lttng_filter_bytecode *filter,
+ struct lttng_event_exclusion *exclusion)
{
return NULL;
}
{
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_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)
{
@@
-250,7
+231,8
@@
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;
}
This page took
0.026399 seconds
and
4
git commands to generate.