#include "lttng-tracer-core.h"
#include "lttng-ust-statedump.h"
#include "jhash.h"
+#include "getenv.h"
#define TRACEPOINT_DEFINE
#include "ust_lib.h" /* Only define. */
{
unsigned int i;
+ if (data->cancel)
+ goto end;
/*
* Iterate on hash table.
* For each marked, traced, do nothing.
trace_lib_load(&e->bin_data, ip);
e->traced = true;
}
+ e->marked = false;
} else {
if (e->traced)
trace_lib_unload(&e->bin_data, ip);
remove_dl_node(e);
free_dl_node(e);
}
- e->marked = false;
}
}
+end:
ust_unlock();
}
{
struct dl_iterate_data data;
- if (getenv("LTTNG_UST_WITHOUT_BADDR_STATEDUMP"))
+ if (lttng_getenv("LTTNG_UST_WITHOUT_BADDR_STATEDUMP"))
return;
+ /*
+ * Fixup lttng-ust TLS when called from dlopen/dlclose
+ * instrumentation.
+ */
+ lttng_ust_fixup_tls();
+
data.exec_found = 0;
data.first = true;
data.cancel = false;
static
int do_baddr_statedump(void *owner)
{
- if (getenv("LTTNG_UST_WITHOUT_BADDR_STATEDUMP"))
+ if (lttng_getenv("LTTNG_UST_WITHOUT_BADDR_STATEDUMP"))
return 0;
lttng_ust_dl_update(LTTNG_UST_CALLER_IP());
ust_dl_table_statedump(owner);
* session, statedumps from different processes may be
* interleaved. The vpid context should be used to identify which
* events belong to which process.
+ *
+ * Grab the ust_lock outside of the RCU read-side lock because we
+ * perform synchronize_rcu with the ust_lock held, which can trigger
+ * deadlocks otherwise.
*/
int do_lttng_ust_statedump(void *owner)
{
+ ust_lock_nocheck();
trace_statedump_start(owner);
+ ust_unlock();
+
do_baddr_statedump(owner);
+
+ ust_lock_nocheck();
trace_statedump_end(owner);
+ ust_unlock();
return 0;
}