Namespace enum lttng_ust_bytecode_interpreter_ret flags with lttng_ust_ prefix

[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..98b80b35fa3a343fd85d3d6d854e61fa2eadb66f 100644 (file)
--- a/liblttng-ust/lttng-ust-statedump.c
+++ b/liblttng-ust/lttng-ust-statedump.c
@@ -16,13 +16,14 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include <lttng/ust-elf.h>
-#include <helper.h>
+#include <ust-elf.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. */
@@ -62,7 +63,7 @@ struct lttng_ust_dl_node {
 #define UST_DL_STATE_TABLE_SIZE        (1 << UST_DL_STATE_HASH_BITS)
 struct cds_hlist_head dl_state_table[UST_DL_STATE_TABLE_SIZE];
 
-typedef void (*tracepoint_cb)(struct lttng_session *session, void *priv);
+typedef void (*tracepoint_cb)(struct lttng_ust_session *session, void *priv);
 
 static
 struct lttng_ust_dl_node *alloc_dl_node(const struct bin_info_data *bin_data)
@@ -190,20 +191,20 @@ 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);
        }
 }
 
 static
-void trace_bin_info_cb(struct lttng_session *session, void *priv)
+void trace_bin_info_cb(struct lttng_ust_session *session, void *priv)
 {
        struct bin_info_data *bin_data = (struct bin_info_data *) priv;
 
@@ -215,7 +216,7 @@ void trace_bin_info_cb(struct lttng_session *session, void *priv)
 }
 
 static
-void trace_build_id_cb(struct lttng_session *session, void *priv)
+void trace_build_id_cb(struct lttng_ust_session *session, void *priv)
 {
        struct bin_info_data *bin_data = (struct bin_info_data *) priv;
 
@@ -225,7 +226,7 @@ void trace_build_id_cb(struct lttng_session *session, void *priv)
 }
 
 static
-void trace_debug_link_cb(struct lttng_session *session, void *priv)
+void trace_debug_link_cb(struct lttng_ust_session *session, void *priv)
 {
        struct bin_info_data *bin_data = (struct bin_info_data *) priv;
 
@@ -235,20 +236,20 @@ void trace_debug_link_cb(struct lttng_session *session, void *priv)
 }
 
 static
-void procname_cb(struct lttng_session *session, void *priv)
+void procname_cb(struct lttng_ust_session *session, void *priv)
 {
        char *procname = (char *) priv;
        tracepoint(lttng_ust_statedump, procname, session, procname);
 }
 
 static
-void trace_start_cb(struct lttng_session *session, void *priv)
+void trace_start_cb(struct lttng_ust_session *session, void *priv)
 {
        tracepoint(lttng_ust_statedump, start, session);
 }
 
 static
-void trace_end_cb(struct lttng_session *session, void *priv)
+void trace_end_cb(struct lttng_ust_session *session, void *priv)
 {
        tracepoint(lttng_ust_statedump, end, session);
 }
@@ -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));