Fix: don't perform extra flush on metadata channel

[lttng-modules.git] / lib / ringbuffer / frontend_internal.h

diff --git a/lib/ringbuffer/frontend_internal.h b/lib/ringbuffer/frontend_internal.h
index eda800de4e1fbaeb2aac47a720ba665269689021..76bf20e79b1ae21ad217bc073c9e9f02a1709ee4 100644 (file)
--- a/lib/ringbuffer/frontend_internal.h
+++ b/lib/ringbuffer/frontend_internal.h
@@ -28,10 +28,10 @@
  * See ring_buffer_frontend.c for more information on wait-free algorithms.
  */
 
-#include "../../wrapper/ringbuffer/config.h"
-#include "../../wrapper/ringbuffer/backend_types.h"
-#include "../../wrapper/ringbuffer/frontend_types.h"
-#include "../../lib/prio_heap/lttng_prio_heap.h"       /* For per-CPU read-side iterator */
+#include <wrapper/ringbuffer/config.h>
+#include <wrapper/ringbuffer/backend_types.h>
+#include <wrapper/ringbuffer/frontend_types.h>
+#include <lib/prio_heap/lttng_prio_heap.h>     /* For per-CPU read-side iterator */
 
 /* Buffer offset macros */
 
@@ -159,6 +159,9 @@ void lib_ring_buffer_switch_slow(struct lib_ring_buffer *buf,
 extern
 void lib_ring_buffer_switch_remote(struct lib_ring_buffer *buf);
 
+extern
+void lib_ring_buffer_switch_remote_empty(struct lib_ring_buffer *buf);
+
 /* Buffer write helpers */
 
 static inline
@@ -367,6 +370,12 @@ void lib_ring_buffer_check_deliver(const struct lib_ring_buffer_config *config,
                                                                        buf,
                                                                        idx));
 
+                       /*
+                        * Increment the packet counter while we have exclusive
+                        * access.
+                        */
+                       subbuffer_inc_packet_count(config, &buf->backend, idx);
+
                        /*
                         * Set noref flag and offset for this subbuffer id.
                         * Contains a memory barrier that ensures counter stores
@@ -421,23 +430,20 @@ void lib_ring_buffer_write_commit_counter(const struct lib_ring_buffer_config *c
                                          struct channel *chan,
                                          unsigned long idx,
                                          unsigned long buf_offset,
-                                         unsigned long commit_count,
-                                         size_t slot_size)
+                                         unsigned long commit_count)
 {
-       unsigned long offset, commit_seq_old;
+       unsigned long commit_seq_old;
 
        if (config->oops != RING_BUFFER_OOPS_CONSISTENCY)
                return;
 
-       offset = buf_offset + slot_size;
-
        /*
         * subbuf_offset includes commit_count_mask. We can simply
         * compare the offsets within the subbuffer without caring about
         * buffer full/empty mismatch because offset is never zero here
         * (subbuffer header and record headers have non-zero length).
         */
-       if (unlikely(subbuf_offset(offset - commit_count, chan)))
+       if (unlikely(subbuf_offset(buf_offset - commit_count, chan)))
                return;
 
        commit_seq_old = v_read(config, &buf->commit_hot[idx].seq);