tests/hello.cxx: add ctf_enum_auto() entries

[lttng-ust.git] / libringbuffer / backend_internal.h

diff --git a/libringbuffer/backend_internal.h b/libringbuffer/backend_internal.h
index 1045a60c2760ae2314f4d0ab89a7aedcebabf387..df3617cacd76dccdd756d870cf56d0e477b8f387 100644 (file)
--- a/libringbuffer/backend_internal.h
+++ b/libringbuffer/backend_internal.h
@@ -45,7 +45,8 @@ int channel_backend_init(struct channel_backend *chanb,
                         const char *name,
                         const struct lttng_ust_lib_ring_buffer_config *config,
                         size_t subbuf_size,
-                        size_t num_subbuf, struct lttng_ust_shm_handle *handle);
+                        size_t num_subbuf, struct lttng_ust_shm_handle *handle,
+                        const int *stream_fds);
 void channel_backend_free(struct channel_backend *chanb,
                          struct lttng_ust_shm_handle *handle);
 
@@ -309,6 +310,14 @@ unsigned long subbuffer_get_data_size(
        return shmp(handle, pages->shmp)->data_size;
 }
 
+static inline
+void subbuffer_inc_packet_count(const struct lttng_ust_lib_ring_buffer_config *config,
+               struct lttng_ust_lib_ring_buffer_backend *bufb,
+               unsigned long idx, struct lttng_ust_shm_handle *handle)
+{
+       shmp_index(handle, bufb->buf_cnt, idx)->seq_cnt++;
+}
+
 /**
  * lib_ring_buffer_clear_noref - Clear the noref subbuffer flag, called by
  *                               writer.
@@ -484,7 +493,7 @@ static inline int lttng_ust_fls(unsigned int x)
                r -= 2;
        }
        if (!(x & 0x80000000U)) {
-               x <<= 1;
+               /* No need to bit shift on last operation */
                r -= 1;
        }
        return r;