projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: timestamp_end field should include all events within sub-buffer
[lttng-ust.git]
/
liblttng-ust
/
lttng-ust-statedump.c
diff --git
a/liblttng-ust/lttng-ust-statedump.c
b/liblttng-ust/lttng-ust-statedump.c
index 644af303aa9ceae55bae10d899571d8999e02b26..f40b7195af4f9474d946609192423a22f8fbd76f 100644
(file)
--- a/
liblttng-ust/lttng-ust-statedump.c
+++ b/
liblttng-ust/lttng-ust-statedump.c
@@
-34,6
+34,7
@@
#include "lttng-tracer-core.h"
#include "lttng-ust-statedump.h"
#include "jhash.h"
#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. */
#define TRACEPOINT_DEFINE
#include "ust_lib.h" /* Only define. */
@@
-413,6
+414,8
@@
void iter_end(struct dl_iterate_data *data, void *ip)
{
unsigned int i;
{
unsigned int i;
+ if (data->cancel)
+ goto end;
/*
* Iterate on hash table.
* For each marked, traced, do nothing.
/*
* Iterate on hash table.
* For each marked, traced, do nothing.
@@
-440,6
+443,7
@@
void iter_end(struct dl_iterate_data *data, void *ip)
}
}
}
}
}
}
+end:
ust_unlock();
}
ust_unlock();
}
@@
-548,9
+552,15
@@
void lttng_ust_dl_update(void *ip)
{
struct dl_iterate_data data;
{
struct dl_iterate_data data;
- if (getenv("LTTNG_UST_WITHOUT_BADDR_STATEDUMP"))
+ if (
lttng_
getenv("LTTNG_UST_WITHOUT_BADDR_STATEDUMP"))
return;
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;
data.exec_found = 0;
data.first = true;
data.cancel = false;
@@
-576,7
+586,7
@@
void lttng_ust_dl_update(void *ip)
static
int do_baddr_statedump(void *owner)
{
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);
return 0;
lttng_ust_dl_update(LTTNG_UST_CALLER_IP());
ust_dl_table_statedump(owner);
This page took
0.023758 seconds
and
4
git commands to generate.