projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change the UST event hash table match function
[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 b0a65cf191c5b9624d24e354b98d900c373ef7fe..efca4d23b8989dc37650565e9037879372e09ff9 100644
(file)
--- a/
src/bin/lttng-sessiond/trace-ust.h
+++ b/
src/bin/lttng-sessiond/trace-ust.h
@@
-29,6
+29,12
@@
#include "consumer.h"
#include "ust-ctl.h"
#include "consumer.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;
+};
+
/* UST Stream list */
struct ltt_ust_stream_list {
unsigned int count;
/* UST Stream list */
struct ltt_ust_stream_list {
unsigned int count;
@@
-45,7
+51,6
@@
struct ltt_ust_context {
struct ltt_ust_event {
unsigned int enabled;
struct lttng_ust_event attr;
struct ltt_ust_event {
unsigned int enabled;
struct lttng_ust_event attr;
- struct lttng_ht *ctx;
struct lttng_ht_node_str node;
struct lttng_ust_filter_bytecode *filter;
};
struct lttng_ht_node_str node;
struct lttng_ust_filter_bytecode *filter;
};
@@
-130,11
+135,15
@@
struct ltt_ust_session {
#ifdef HAVE_LIBLTTNG_UST_CTL
#ifdef HAVE_LIBLTTNG_UST_CTL
+int trace_ust_ht_match_event(struct cds_lfht_node *node, const void *_key);
+int trace_ust_ht_match_event_by_name(struct cds_lfht_node *node,
+ const void *_key);
+
/*
* Lookup functions. NULL is returned if not found.
*/
/*
* Lookup functions. NULL is returned if not found.
*/
-struct ltt_ust_event *trace_ust_find_event
_by_name
(struct lttng_ht *ht,
- char *name);
+struct ltt_ust_event *trace_ust_find_event(struct lttng_ht *ht,
+ char *name
, struct lttng_filter_bytecode *filter, int loglevel
);
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);
@@
-161,13
+170,6
@@
void trace_ust_destroy_event(struct ltt_ust_event *event);
#else /* HAVE_LIBLTTNG_UST_CTL */
#else /* HAVE_LIBLTTNG_UST_CTL */
-static inline
-struct ltt_ust_event *trace_ust_find_event_by_name(struct lttng_ht *ht,
- char *name)
-{
- return NULL;
-}
-
static inline
struct ltt_ust_channel *trace_ust_find_channel_by_name(struct lttng_ht *ht,
char *name)
static inline
struct ltt_ust_channel *trace_ust_find_channel_by_name(struct lttng_ht *ht,
char *name)
This page took
0.055546 seconds
and
5
git commands to generate.