Fix: sessiond: ODR violation results in memory corruption

[lttng-tools.git] / src / bin / lttng-sessiond / rotation-thread.cpp

diff --git a/src/bin/lttng-sessiond/rotation-thread.cpp b/src/bin/lttng-sessiond/rotation-thread.cpp
index ee924ba98f042ee83a7f80f5d0737c95630d867a..ac75f58abab75bf24e0a25b817070c0bfc2aa5ca 100644 (file)
--- a/src/bin/lttng-sessiond/rotation-thread.cpp
+++ b/src/bin/lttng-sessiond/rotation-thread.cpp
@@ -47,13 +47,6 @@ struct rotation_thread {
        struct lttng_poll_event events;
 };
 
        struct lttng_poll_event events;
 };
 

-struct rotation_thread_job {
-       enum rotation_thread_job_type type;
-       struct ltt_session *session;
-       /* List member in struct rotation_thread_timer_queue. */
-       struct cds_list_head head;
-};
-

 /*
  * The timer thread enqueues jobs and wakes up the rotation thread.
  * When the rotation thread wakes up, it empties the queue.
 /*
  * The timer thread enqueues jobs and wakes up the rotation thread.
  * When the rotation thread wakes up, it empties the queue.


@@ -72,6 +65,15 @@ struct rotation_thread_handle {
        struct lttng_pipe *quit_pipe;
 };
 
        struct lttng_pipe *quit_pipe;
 };
 

+namespace {
+struct rotation_thread_job {
+       enum rotation_thread_job_type type;
+       struct ltt_session *session;
+       /* List member in struct rotation_thread_timer_queue. */
+       struct cds_list_head head;
+};
+} /* namespace */
+

 static
 const char *get_job_type_str(enum rotation_thread_job_type job_type)
 {
 static
 const char *get_job_type_str(enum rotation_thread_job_type job_type)
 {