Cleanup: elf: use off_t for offsets, size_t for len

[lttng-ust.git] / liblttng-ust / lttng-events.c

diff --git a/liblttng-ust/lttng-events.c b/liblttng-ust/lttng-events.c
index e44628dfcc02b8dc207232fe9d42ff836bc4edbd..25b4962583a833811014cf50558f46ea4a5aa7e3 100644 (file)
--- a/liblttng-ust/lttng-events.c
+++ b/liblttng-ust/lttng-events.c
@@ -54,7 +54,7 @@
 #include "tracepoint-internal.h"
 #include "lttng-tracer.h"
 #include "lttng-tracer-core.h"
-#include "lttng-ust-baddr.h"
+#include "lttng-ust-statedump.h"
 #include "wait.h"
 #include "../libringbuffer/shm.h"
 #include "jhash.h"
@@ -248,8 +248,6 @@ int lttng_session_enable(struct lttng_session *session)
 
        /* Set transient enabler state to "enabled" */
        session->tstate = 1;
-       /* We need to sync enablers with session before activation. */
-       lttng_session_sync_enablers(session);
 
        /*
         * Snapshot the number of events per channel to know the type of header
@@ -287,6 +285,9 @@ int lttng_session_enable(struct lttng_session *session)
                }
        }
 
+       /* We need to sync enablers with session before activation. */
+       lttng_session_sync_enablers(session);
+
        /* Set atomically the state to "active" */
        CMM_ACCESS_ONCE(session->active) = 1;
        CMM_ACCESS_ONCE(session->been_active) = 1;
@@ -682,7 +683,7 @@ void lttng_handle_pending_statedump(void *owner)
        struct lttng_session *session;
 
        /* Execute state dump */
-       lttng_ust_baddr_statedump(owner);
+       do_lttng_ust_statedump(owner);
 
        /* Clear pending state dump */
        if (ust_lock()) {
@@ -745,7 +746,7 @@ struct lttng_enabler *lttng_enabler_create(enum lttng_enabler_type type,
                sizeof(enabler->event_param));
        enabler->chan = chan;
        /* ctx left NULL */
-       enabler->enabled = 1;
+       enabler->enabled = 0;
        cds_list_add(&enabler->node, &enabler->chan->session->enablers_head);
        lttng_session_lazy_sync_enablers(enabler->chan->session);
        return enabler;
@@ -816,6 +817,8 @@ int lttng_attach_context(struct lttng_ust_context *context_param,
                return lttng_add_procname_to_ctx(ctx);
        case LTTNG_UST_CONTEXT_IP:
                return lttng_add_ip_to_ctx(ctx);
+       case LTTNG_UST_CONTEXT_CPU_ID:
+               return lttng_add_cpu_id_to_ctx(ctx);
        default:
                return -EINVAL;
        }