Convert ltt_kernel_session to c++

[lttng-tools.git] / src / bin / lttng-sessiond / trace-kernel.cpp

diff --git a/src/bin/lttng-sessiond/trace-kernel.cpp b/src/bin/lttng-sessiond/trace-kernel.cpp
index 23d808ce8852f155e82bcbf7dc6cd65f41f48703..63524f7261fe9413dd097d25a438126c5f02d152 100644 (file)
--- a/src/bin/lttng-sessiond/trace-kernel.cpp
+++ b/src/bin/lttng-sessiond/trace-kernel.cpp
@@ -151,18 +151,15 @@ struct ltt_kernel_session *trace_kernel_create_session(void)
        struct ltt_kernel_session *lks = NULL;
 
        /* Allocate a new ltt kernel session */
-       lks = zmalloc<ltt_kernel_session>();
+       lks = new ltt_kernel_session;
        if (lks == NULL) {
                PERROR("create kernel session zmalloc");
                goto alloc_error;
        }
 
+       lks->active = 0;
+
        /* Init data structure */
-       lks->fd = -1;
-       lks->metadata_stream_fd = -1;
-       lks->channel_count = 0;
-       lks->stream_count_global = 0;
-       lks->metadata = NULL;
        CDS_INIT_LIST_HEAD(&lks->channel_list.head);
 
        lks->tracker_pid = process_attr_tracker_create();
@@ -203,7 +200,7 @@ error:
        process_attr_tracker_destroy(lks->tracker_vuid);
        process_attr_tracker_destroy(lks->tracker_gid);
        process_attr_tracker_destroy(lks->tracker_vgid);
-       free(lks);
+       delete (lks);
 
 alloc_error:
        return NULL;
@@ -1047,5 +1044,5 @@ void trace_kernel_free_session(struct ltt_kernel_session *session)
        process_attr_tracker_destroy(session->tracker_gid);
        process_attr_tracker_destroy(session->tracker_vgid);
 
-       free(session);
+       delete (session);
 }