projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: sessiond vs consumerd push/get metadata deadlock
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
ust-app.h
diff --git
a/src/bin/lttng-sessiond/ust-app.h
b/src/bin/lttng-sessiond/ust-app.h
index 567c79e044ef77bdef54ebfdd6b750be91a26e61..2e768b0282f55ac5efebb0b013f6342c221fcfb9 100644
(file)
--- a/
src/bin/lttng-sessiond/ust-app.h
+++ b/
src/bin/lttng-sessiond/ust-app.h
@@
-48,9
+48,9
@@
struct ust_app_notify_sock_obj {
struct ust_app_ht_key {
const char *name;
struct ust_app_ht_key {
const char *name;
- const struct lttng_
ust_
filter_bytecode *filter;
+ const struct lttng_filter_bytecode *filter;
enum lttng_ust_loglevel_type loglevel;
enum lttng_ust_loglevel_type loglevel;
- const struct lttng_
ust_
event_exclusion *exclusion;
+ const struct lttng_event_exclusion *exclusion;
};
/*
};
/*
@@
-115,8
+115,8
@@
struct ust_app_event {
struct lttng_ust_event attr;
char name[LTTNG_UST_SYM_NAME_LEN];
struct lttng_ht_node_str node;
struct lttng_ust_event attr;
char name[LTTNG_UST_SYM_NAME_LEN];
struct lttng_ht_node_str node;
- struct lttng_
ust_
filter_bytecode *filter;
- struct lttng_
ust_
event_exclusion *exclusion;
+ struct lttng_filter_bytecode *filter;
+ struct lttng_event_exclusion *exclusion;
};
struct ust_app_stream {
};
struct ust_app_stream {
@@
-183,6
+183,8
@@
struct ust_app_session {
int started; /* allows detection of start vs restart. */
int handle; /* used has unique identifier for app session */
int started; /* allows detection of start vs restart. */
int handle; /* used has unique identifier for app session */
+ bool deleted; /* Session deleted flag. Check with lock held. */
+
/*
* Tracing session ID. Multiple ust app session can have the same tracing
* session id making this value NOT unique to the object.
/*
* Tracing session ID. Multiple ust app session can have the same tracing
* session id making this value NOT unique to the object.
@@
-421,7
+423,7
@@
int ust_app_ht_alloc(void)
return 0;
}
static inline
return 0;
}
static inline
-void ust_app_global_update(struct ltt_ust_session *usess,
int sock
)
+void ust_app_global_update(struct ltt_ust_session *usess,
struct ust_app *app
)
{}
static inline
int ust_app_disable_channel_glb(struct ltt_ust_session *usess,
{}
static inline
int ust_app_disable_channel_glb(struct ltt_ust_session *usess,
This page took
0.027132 seconds
and
4
git commands to generate.