projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: take the ust lock around session iteration in statedump
[lttng-ust.git]
/
liblttng-ust
/
lttng-events.c
diff --git
a/liblttng-ust/lttng-events.c
b/liblttng-ust/lttng-events.c
index 9380e9ceb688b9b46df58122d7cc3a47c14421b3..6e16cf2548f04087ec3d1b6805736d3da1f179b5 100644
(file)
--- a/
liblttng-ust/lttng-events.c
+++ b/
liblttng-ust/lttng-events.c
@@
-54,6
+54,7
@@
#include "tracepoint-internal.h"
#include "lttng-tracer.h"
#include "lttng-tracer-core.h"
#include "tracepoint-internal.h"
#include "lttng-tracer.h"
#include "lttng-tracer-core.h"
+#include "lttng-ust-baddr.h"
#include "wait.h"
#include "../libringbuffer/shm.h"
#include "jhash.h"
#include "wait.h"
#include "../libringbuffer/shm.h"
#include "jhash.h"
@@
-77,6
+78,11
@@
void ust_unlock(void)
static CDS_LIST_HEAD(sessions);
static CDS_LIST_HEAD(sessions);
+struct cds_list_head *_lttng_get_sessions(void)
+{
+ return &sessions;
+}
+
static void _lttng_event_destroy(struct lttng_event *event);
static
static void _lttng_event_destroy(struct lttng_event *event);
static
@@
-676,18
+682,27
@@
int lttng_fix_pending_events(void)
}
/*
}
/*
- * Called after session enable: For each session, execute pending statedumps.
+ * For each session of the owner thread, execute pending statedump.
+ * Only dump state for the sessions owned by the caller thread, because
+ * we don't keep ust_lock across the entire iteration.
*/
*/
-int lttng_handle_pending_statedump
s(t_statedump_func_ptr statedump_func_pt
r)
+int lttng_handle_pending_statedump
(void *owne
r)
{
struct lttng_session *session;
{
struct lttng_session *session;
+ /* Execute state dump */
+ lttng_ust_baddr_statedump(owner);
+
+ /* Clear pending state dump */
+ ust_lock();
cds_list_for_each_entry(session, &sessions, node) {
cds_list_for_each_entry(session, &sessions, node) {
- if (session->statedump_pending) {
- session->statedump_pending = 0;
- statedump_func_ptr(session);
- }
+ if (session->owner != owner)
+ continue;
+ if (!session->statedump_pending)
+ continue;
+ session->statedump_pending = 0;
}
}
+ ust_unlock();
return 0;
}
return 0;
}
This page took
0.036016 seconds
and
4
git commands to generate.