X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=libringbuffer%2Fring_buffer_frontend.c;h=1396f44a26263a202867b6f9f2e115275e4d9b35;hb=9c995331b51a9b9a8c85457a897fa89e770de111;hp=14ae8eb334b5352c5d831f398a30ad5849acf7fe;hpb=40745074477e85361af72620a85ccf7945079d68;p=lttng-ust.git

diff --git a/libringbuffer/ring_buffer_frontend.c b/libringbuffer/ring_buffer_frontend.c
index 14ae8eb3..1396f44a 100644
--- a/libringbuffer/ring_buffer_frontend.c
+++ b/libringbuffer/ring_buffer_frontend.c
@@ -2168,6 +2168,34 @@ void lib_ring_buffer_vmcore_check_deliver(const struct lttng_ust_lib_ring_buffer
 		v_set(config, &shmp_index(handle, buf->commit_hot, idx)->seq, commit_count);
 }
 
+/*
+ * The ring buffer can count events recorded and overwritten per buffer,
+ * but it is disabled by default due to its performance overhead.
+ */
+#ifdef LTTNG_RING_BUFFER_COUNT_EVENTS
+static
+void deliver_count_events(const struct lttng_ust_lib_ring_buffer_config *config,
+		struct lttng_ust_lib_ring_buffer *buf,
+		unsigned long idx,
+		struct lttng_ust_shm_handle *handle)
+{
+	v_add(config, subbuffer_get_records_count(config,
+			&buf->backend, idx, handle),
+		&buf->records_count);
+	v_add(config, subbuffer_count_records_overrun(config,
+			&buf->backend, idx, handle),
+		&buf->records_overrun);
+}
+#else /* LTTNG_RING_BUFFER_COUNT_EVENTS */
+static
+void deliver_count_events(const struct lttng_ust_lib_ring_buffer_config *config,
+		struct lttng_ust_lib_ring_buffer *buf,
+		unsigned long idx,
+		struct lttng_ust_shm_handle *handle)
+{
+}
+#endif /* #else LTTNG_RING_BUFFER_COUNT_EVENTS */
+
 void lib_ring_buffer_check_deliver_slow(const struct lttng_ust_lib_ring_buffer_config *config,
 				   struct lttng_ust_lib_ring_buffer *buf,
 			           struct channel *chan,
@@ -2221,16 +2249,7 @@ void lib_ring_buffer_check_deliver_slow(const struct lttng_ust_lib_ring_buffer_c
 		 * and any other writer trying to access this subbuffer
 		 * in this state is required to drop records.
 		 */
-		v_add(config,
-		      subbuffer_get_records_count(config,
-						  &buf->backend,
-						  idx, handle),
-		      &buf->records_count);
-		v_add(config,
-		      subbuffer_count_records_overrun(config,
-						      &buf->backend,
-						      idx, handle),
-		      &buf->records_overrun);
+		deliver_count_events(config, buf, idx, handle);
 		config->cb.buffer_end(buf, tsc, idx,
 				      lib_ring_buffer_get_data_size(config,
 								buf,