X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Fcommon%2Fringbuffer%2Fring_buffer_backend.c;h=d2fadb771b9aae9878d02afc2499848244c57870;hb=refs%2Fheads%2Fmaster;hp=c880c9d610011ffff3fbe5396b98c6e0c3908896;hpb=b5457df5fd74e033cbaa75307f9bbc12aff4ab8f;p=lttng-ust.git

diff --git a/src/common/ringbuffer/ring_buffer_backend.c b/src/common/ringbuffer/ring_buffer_backend.c
index c880c9d6..d2fadb77 100644
--- a/src/common/ringbuffer/ring_buffer_backend.c
+++ b/src/common/ringbuffer/ring_buffer_backend.c
@@ -12,15 +12,16 @@
 #include <limits.h>
 
 #include <lttng/ust-utils.h>
-#include <lttng/ringbuffer-context.h>
+#include <lttng/ust-ringbuffer-context.h>
 
 #include "ringbuffer-config.h"
 #include "vatomic.h"
 #include "backend.h"
 #include "frontend.h"
-#include "smp.h"
+#include "common/smp.h"
 #include "shm.h"
 #include "common/align.h"
+#include "common/populate.h"
 
 /**
  * lib_ring_buffer_backend_allocate - allocate a channel buffer
@@ -234,7 +235,7 @@ void channel_backend_reset(struct channel_backend *chanb)
 	 * num_subbuf_order, buf_size_order, extra_reader_sb, num_subbuf,
 	 * priv, notifiers, config, cpumask and name.
 	 */
-	chanb->start_tsc = config->cb.ring_buffer_clock_read(chan);
+	chanb->start_timestamp = config->cb.ring_buffer_clock_read(chan);
 }
 
 /**
@@ -346,7 +347,8 @@ int channel_backend_init(struct channel_backend *chanb,
 			struct shm_object *shmobj;
 
 			shmobj = shm_object_table_alloc(handle->table, shmsize,
-					SHM_OBJECT_SHM, stream_fds[i], i);
+					SHM_OBJECT_SHM, stream_fds[i], i,
+					lttng_ust_map_populate_cpu_is_enabled(i));
 			if (!shmobj)
 				goto end;
 			align_shm(shmobj, __alignof__(struct lttng_ust_ring_buffer));
@@ -365,7 +367,8 @@ int channel_backend_init(struct channel_backend *chanb,
 		struct lttng_ust_ring_buffer *buf;
 
 		shmobj = shm_object_table_alloc(handle->table, shmsize,
-					SHM_OBJECT_SHM, stream_fds[0], -1);
+					SHM_OBJECT_SHM, stream_fds[0], -1,
+					lttng_ust_map_populate_is_enabled());
 		if (!shmobj)
 			goto end;
 		align_shm(shmobj, __alignof__(struct lttng_ust_ring_buffer));
@@ -379,7 +382,7 @@ int channel_backend_init(struct channel_backend *chanb,
 		if (ret)
 			goto free_bufs;
 	}
-	chanb->start_tsc = config->cb.ring_buffer_clock_read(chan);
+	chanb->start_timestamp = config->cb.ring_buffer_clock_read(chan);
 
 	return 0;