Combine common recorder/notifier functions to lttng_free_event_filter_runtime

[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 4387cab4931ad8221b59d6d99df63eaff2904f7b..ff24e7c8de2df75914fab7101aa330a2ee61ae29 100644 (file)
--- a/liblttng-ust/lttng-ust-statedump.c
+++ b/liblttng-ust/lttng-ust-statedump.c
@@ -17,12 +17,13 @@
 #include <unistd.h>
 
 #include <lttng/ust-elf.h>
-#include <helper.h>
+#include <ust-helper.h>
 #include "lttng-tracer-core.h"
 #include "lttng-ust-statedump.h"
 #include "jhash.h"
 #include "getenv.h"
 #include "compat.h"
+#include "ust-events-internal.h"
 
 #define TRACEPOINT_DEFINE
 #include "ust_lib.h"                           /* Only define. */
@@ -190,15 +191,15 @@ static
 void trace_statedump_event(tracepoint_cb tp_cb, void *owner, void *priv)
 {
        struct cds_list_head *sessionsp;
-       struct lttng_session *session;
+       struct lttng_ust_session_private *session_priv;
 
-       sessionsp = _lttng_get_sessions();
-       cds_list_for_each_entry(session, sessionsp, node) {
-               if (session->owner != owner)
+       sessionsp = lttng_get_sessions();
+       cds_list_for_each_entry(session_priv, sessionsp, node) {
+               if (session_priv->owner != owner)
                        continue;
-               if (!session->statedump_pending)
+               if (!session_priv->statedump_pending)
                        continue;
-               tp_cb(session, priv);
+               tp_cb(session_priv->pub, priv);
        }
 }
 
@@ -547,7 +548,7 @@ void lttng_ust_dl_update(void *ip)
 {
        struct dl_iterate_data data;
 
-       if (lttng_getenv("LTTNG_UST_WITHOUT_BADDR_STATEDUMP"))
+       if (lttng_ust_getenv("LTTNG_UST_WITHOUT_BADDR_STATEDUMP"))
                return;
 
        /*
@@ -581,7 +582,7 @@ void lttng_ust_dl_update(void *ip)
 static
 int do_baddr_statedump(void *owner)
 {
-       if (lttng_getenv("LTTNG_UST_WITHOUT_BADDR_STATEDUMP"))
+       if (lttng_ust_getenv("LTTNG_UST_WITHOUT_BADDR_STATEDUMP"))
                return 0;
        lttng_ust_dl_update(LTTNG_UST_CALLER_IP());
        ust_dl_table_statedump(owner);
@@ -591,7 +592,7 @@ int do_baddr_statedump(void *owner)
 static
 int do_procname_statedump(void *owner)
 {
-       if (lttng_getenv("LTTNG_UST_WITHOUT_PROCNAME_STATEDUMP"))
+       if (lttng_ust_getenv("LTTNG_UST_WITHOUT_PROCNAME_STATEDUMP"))
                return 0;
 
        trace_statedump_event(procname_cb, owner, lttng_ust_sockinfo_get_procname(owner));