projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: relayd: live client fails on clear of multi-domain session
[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 a06c471cce9a6c10a7673f10e86ab1d55da31eb7..c312dd970768db6135c9bfb0a98a068f12146e3d 100644
(file)
--- a/
src/bin/lttng-sessiond/trace-ust.h
+++ b/
src/bin/lttng-sessiond/trace-ust.h
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (C) 2011
David Goulet <david.goulet@polymtl.ca>
+ * Copyright (C) 2011
EfficiOS Inc.
* Copyright (C) 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
*
* SPDX-License-Identifier: GPL-2.0-only
* Copyright (C) 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
*
* SPDX-License-Identifier: GPL-2.0-only
@@
-12,9
+12,10
@@
#include <limits.h>
#include <urcu/list.h>
#include <limits.h>
#include <urcu/list.h>
-#include <lttng/lttng.h>
-#include <common/hashtable/hashtable.h>
#include <common/defaults.h>
#include <common/defaults.h>
+#include <common/hashtable/hashtable.h>
+#include <common/tracker.h>
+#include <lttng/lttng.h>
#include "consumer.h"
#include "lttng-ust-ctl.h"
#include "consumer.h"
#include "lttng-ust-ctl.h"
@@
-23,8
+24,8
@@
struct agent;
struct ltt_ust_ht_key {
const char *name;
struct ltt_ust_ht_key {
const char *name;
- const struct lttng_
filter_
bytecode *filter;
- enum lttng_ust_loglevel_type loglevel_type;
+ const struct lttng_bytecode *filter;
+ enum lttng_ust_
abi_
loglevel_type loglevel_type;
int loglevel_value;
const struct lttng_event_exclusion *exclusion;
};
int loglevel_value;
const struct lttng_event_exclusion *exclusion;
};
@@
-39,10
+40,10
@@
struct ltt_ust_context {
/* UST event */
struct ltt_ust_event {
unsigned int enabled;
/* UST event */
struct ltt_ust_event {
unsigned int enabled;
- struct lttng_ust_event attr;
+ struct lttng_ust_
abi_
event attr;
struct lttng_ht_node_str node;
char *filter_expression;
struct lttng_ht_node_str node;
char *filter_expression;
- struct lttng_
filter_
bytecode *filter;
+ struct lttng_bytecode *filter;
struct lttng_event_exclusion *exclusion;
/*
* An internal event is an event which was created by the session daemon
struct lttng_event_exclusion *exclusion;
/*
* An internal event is an event which was created by the session daemon
@@
-62,8
+63,8
@@
struct ltt_ust_channel {
* Log4j, Python.
*/
enum lttng_domain_type domain;
* Log4j, Python.
*/
enum lttng_domain_type domain;
- char name[LTTNG_UST_SYM_NAME_LEN];
- struct lttng_ust_channel_attr attr;
+ char name[LTTNG_UST_
ABI_
SYM_NAME_LEN];
+ struct lttng_ust_
abi_
channel_attr attr;
struct lttng_ht *ctx;
struct cds_list_head ctx_list;
struct lttng_ht *events;
struct lttng_ht *ctx;
struct cds_list_head ctx_list;
struct lttng_ht *events;
@@
-120,7
+121,7
@@
struct ltt_ust_session {
unsigned int live_timer_interval; /* usec */
/* Metadata channel attributes. */
unsigned int live_timer_interval; /* usec */
/* Metadata channel attributes. */
- struct lttng_ust_channel_attr metadata_attr;
+ struct lttng_ust_
abi_
channel_attr metadata_attr;
/*
* Path where to keep the shared memory files.
/*
* Path where to keep the shared memory files.
@@
-137,9
+138,9
@@
struct ltt_ust_session {
struct ust_id_tracker vgid_tracker;
/* Tracker list of keys requested by users. */
struct ust_id_tracker vgid_tracker;
/* Tracker list of keys requested by users. */
- struct
lttng_tracker_list *tracker_list
_vpid;
- struct
lttng_tracker_list *tracker_list
_vuid;
- struct
lttng_tracker_list *tracker_list
_vgid;
+ struct
process_attr_tracker *tracker
_vpid;
+ struct
process_attr_tracker *tracker
_vuid;
+ struct
process_attr_tracker *tracker
_vgid;
};
/*
};
/*
@@
-181,8
+182,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,
- enum lttng_ust_loglevel_type loglevel_type, int loglevel_value,
+ char *name, struct lttng_bytecode *filter,
+ enum lttng_ust_
abi_
loglevel_type loglevel_type, int loglevel_value,
struct lttng_event_exclusion *exclusion);
struct ltt_ust_channel *trace_ust_find_channel_by_name(struct lttng_ht *ht,
const char *name);
struct lttng_event_exclusion *exclusion);
struct ltt_ust_channel *trace_ust_find_channel_by_name(struct lttng_ht *ht,
const char *name);
@@
-195,9
+196,10
@@
struct agent *trace_ust_find_agent(struct ltt_ust_session *session,
struct ltt_ust_session *trace_ust_create_session(uint64_t session_id);
struct ltt_ust_channel *trace_ust_create_channel(struct lttng_channel *attr,
enum lttng_domain_type domain);
struct ltt_ust_session *trace_ust_create_session(uint64_t session_id);
struct ltt_ust_channel *trace_ust_create_channel(struct lttng_channel *attr,
enum lttng_domain_type domain);
+
enum lttng_error_code trace_ust_create_event(struct lttng_event *ev,
char *filter_expression,
enum lttng_error_code trace_ust_create_event(struct lttng_event *ev,
char *filter_expression,
- struct lttng_
filter_
bytecode *filter,
+ struct lttng_bytecode *filter,
struct lttng_event_exclusion *exclusion,
bool internal_event, struct ltt_ust_event **ust_event);
struct ltt_ust_context *trace_ust_create_context(
struct lttng_event_exclusion *exclusion,
bool internal_event, struct ltt_ust_event **ust_event);
struct ltt_ust_context *trace_ust_create_context(
@@
-217,20
+219,24
@@
void trace_ust_destroy_event(struct ltt_ust_event *event);
void trace_ust_destroy_context(struct ltt_ust_context *ctx);
void trace_ust_free_session(struct ltt_ust_session *session);
void trace_ust_destroy_context(struct ltt_ust_context *ctx);
void trace_ust_free_session(struct ltt_ust_session *session);
-int trace_ust_
track_id(enum lttng_tracker_type tracker_type
,
+int trace_ust_
id_tracker_lookup(enum lttng_process_attr process_attr
,
struct ltt_ust_session *session,
struct ltt_ust_session *session,
-
const struct lttng_tracker_id *
id);
-int trace_ust_untrack_id(enum lttng_tracker_type tracker_type,
+
int
id);
+enum lttng_error_code trace_ust_process_attr_tracker_set_tracking_policy(
struct ltt_ust_session *session,
struct ltt_ust_session *session,
- const struct lttng_tracker_id *id);
-
-int trace_ust_id_tracker_lookup(enum lttng_tracker_type tracker_type,
+ enum lttng_process_attr process_attr,
+ enum lttng_tracking_policy policy);
+enum lttng_error_code trace_ust_process_attr_tracker_inclusion_set_add_value(
struct ltt_ust_session *session,
struct ltt_ust_session *session,
- int id);
-
-int trace_ust_list_tracker_ids(enum lttng_tracker_type tracker_type,
+ enum lttng_process_attr process_attr,
+ const struct process_attr_value *value);
+enum lttng_error_code trace_ust_process_attr_tracker_inclusion_set_remove_value(
struct ltt_ust_session *session,
struct ltt_ust_session *session,
- struct lttng_tracker_ids **_ids);
+ enum lttng_process_attr process_attr,
+ const struct process_attr_value *value);
+const struct process_attr_tracker *trace_ust_get_process_attr_tracker(
+ struct ltt_ust_session *session,
+ enum lttng_process_attr process_attr);
#else /* HAVE_LIBLTTNG_UST_CTL */
#else /* HAVE_LIBLTTNG_UST_CTL */
@@
-265,7
+271,7
@@
struct ltt_ust_channel *trace_ust_create_channel(struct lttng_channel *attr,
static inline
enum lttng_error_code trace_ust_create_event(struct lttng_event *ev,
const char *filter_expression,
static inline
enum lttng_error_code trace_ust_create_event(struct lttng_event *ev,
const char *filter_expression,
- struct lttng_
filter_
bytecode *filter,
+ struct lttng_bytecode *filter,
struct lttng_event_exclusion *exclusion,
bool internal_event, struct ltt_ust_event **ust_event)
{
struct lttng_event_exclusion *exclusion,
bool internal_event, struct ltt_ust_event **ust_event)
{
@@
-305,8
+311,8
@@
int trace_ust_match_context(const struct ltt_ust_context *uctx,
}
static inline
struct ltt_ust_event *trace_ust_find_event(struct lttng_ht *ht,
}
static inline
struct ltt_ust_event *trace_ust_find_event(struct lttng_ht *ht,
- char *name, struct lttng_
filter_
bytecode *filter,
- enum lttng_ust_loglevel_type loglevel_type, int loglevel_value,
+ char *name, struct lttng_bytecode *filter,
+ enum lttng_ust_
abi_
loglevel_type loglevel_type, int loglevel_value,
struct lttng_event_exclusion *exclusion)
{
return NULL;
struct lttng_event_exclusion *exclusion)
{
return NULL;
@@
-323,32
+329,44
@@
struct agent *trace_ust_find_agent(struct ltt_ust_session *session,
{
return NULL;
}
{
return NULL;
}
-static inline int trace_ust_track_id(enum lttng_tracker_type tracker_type,
+static inline int trace_ust_id_tracker_lookup(
+ enum lttng_process_attr process_attr,
struct ltt_ust_session *session,
struct ltt_ust_session *session,
-
const struct lttng_tracker_id *
id)
+
int
id)
{
return 0;
}
{
return 0;
}
-static inline int trace_ust_untrack_id(enum lttng_tracker_type tracker_type,
+static inline enum lttng_error_code
+trace_ust_process_attr_tracker_set_tracking_policy(
struct ltt_ust_session *session,
struct ltt_ust_session *session,
- const struct lttng_tracker_id *id)
+ enum lttng_process_attr process_attr,
+ enum lttng_tracking_policy policy)
{
{
- return
0
;
+ return
LTTNG_OK
;
}
}
-static inline
int trace_ust_id_tracker_lookup(
- enum lttng_tracker_type tracker_type,
+static inline
enum lttng_error_code
+trace_ust_process_attr_tracker_inclusion_set_add_value(
struct ltt_ust_session *session,
struct ltt_ust_session *session,
- int pid)
+ enum lttng_process_attr process_attr,
+ const struct process_attr_value *value)
{
{
- return
0
;
+ return
LTTNG_OK
;
}
}
-static inline
int trace_ust_list_tracker_ids(
- enum lttng_tracker_type tracker_type,
+static inline
enum lttng_error_code
+trace_ust_process_attr_tracker_inclusion_set_remove_value(
struct ltt_ust_session *session,
struct ltt_ust_session *session,
- struct lttng_tracker_ids **_ids)
+ enum lttng_process_attr process_attr,
+ const struct process_attr_value *value)
{
{
- return
-1
;
+ return
LTTNG_OK
;
}
}
+static inline const struct process_attr_tracker *
+trace_ust_get_process_attr_tracker(struct ltt_ust_session *session,
+ enum lttng_process_attr process_attr)
+{
+ return NULL;
+}
+
#endif /* HAVE_LIBLTTNG_UST_CTL */
#endif /* _LTT_TRACE_UST_H */
#endif /* HAVE_LIBLTTNG_UST_CTL */
#endif /* _LTT_TRACE_UST_H */
This page took
0.026469 seconds
and
4
git commands to generate.