projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: cleanup JUL agent state on sessiond disconnect
[lttng-ust.git]
/
liblttng-ust
/
lttng-events.c
diff --git
a/liblttng-ust/lttng-events.c
b/liblttng-ust/lttng-events.c
index 9380e9ceb688b9b46df58122d7cc3a47c14421b3..03acff110466405976fccdb509d85077377f532b 100644
(file)
--- a/
liblttng-ust/lttng-events.c
+++ b/
liblttng-ust/lttng-events.c
@@
-54,29
+54,23
@@
#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"
/*
- * The sessions mutex is the centralized mutex across UST tracing
- * control and probe registration. All operations within this file are
- * called by the communication thread, under ust_lock protection.
+ * All operations within this file are called by the communication
+ * thread, under ust_lock protection.
*/
*/
-static pthread_mutex_t sessions_mutex = PTHREAD_MUTEX_INITIALIZER;
-void ust_lock(void)
-{
- pthread_mutex_lock(&sessions_mutex);
-}
+static CDS_LIST_HEAD(sessions);
-
void ust_unlock
(void)
+
struct cds_list_head *_lttng_get_sessions
(void)
{
{
-
pthread_mutex_unlock(&sessions_mutex)
;
+
return &sessions
;
}
}
-static CDS_LIST_HEAD(sessions);
-
static void _lttng_event_destroy(struct lttng_event *event);
static
static void _lttng_event_destroy(struct lttng_event *event);
static
@@
-106,8
+100,6
@@
int lttng_loglevel_match(int loglevel,
enum lttng_ust_loglevel_type req_type,
int req_loglevel)
{
enum lttng_ust_loglevel_type req_type,
int req_loglevel)
{
- if (req_type == LTTNG_UST_LOGLEVEL_ALL)
- return 1;
if (!has_loglevel)
loglevel = TRACE_DEFAULT;
switch (req_type) {
if (!has_loglevel)
loglevel = TRACE_DEFAULT;
switch (req_type) {
@@
-676,19
+668,31
@@
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_statedumps(t_statedump_func_ptr statedump_func_pt
r)
+
void 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 */
+ if (ust_lock()) {
+ goto end;
+ }
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;
}
}
- return 0;
+end:
+ ust_unlock();
+ return;
}
/*
}
/*
This page took
0.025372 seconds
and
4
git commands to generate.