Rename shm_handle to lttng_ust_shm_handle

[ust.git] / libringbuffer / frontend_internal.h

diff --git a/libringbuffer/frontend_internal.h b/libringbuffer/frontend_internal.h
index 73b44726df2fe9f1c4baaee731418e8fcead28f0..4c72318c2cf8bdab3a4ab03fd02399a82587d608 100644 (file)
--- a/libringbuffer/frontend_internal.h
+++ b/libringbuffer/frontend_internal.h
@@ -145,7 +145,7 @@ int lib_ring_buffer_reserve_slow(struct lib_ring_buffer_ctx *ctx);
 extern
 void lib_ring_buffer_switch_slow(struct lib_ring_buffer *buf,
                                 enum switch_mode mode,
-                                struct shm_handle *handle);
+                                struct lttng_ust_shm_handle *handle);
 
 /* Buffer write helpers */
 
@@ -182,23 +182,23 @@ void lib_ring_buffer_vmcore_check_deliver(const struct lib_ring_buffer_config *c
                                          struct lib_ring_buffer *buf,
                                          unsigned long commit_count,
                                          unsigned long idx,
-                                         struct shm_handle *handle)
+                                         struct lttng_ust_shm_handle *handle)
 {
        if (config->oops == RING_BUFFER_OOPS_CONSISTENCY)
-               v_set(config, &shmp(handle, buf->commit_hot)[idx].seq, commit_count);
+               v_set(config, &shmp_index(handle, buf->commit_hot, idx)->seq, commit_count);
 }
 
 static inline
 int lib_ring_buffer_poll_deliver(const struct lib_ring_buffer_config *config,
                                 struct lib_ring_buffer *buf,
                                 struct channel *chan,
-                                struct shm_handle *handle)
+                                struct lttng_ust_shm_handle *handle)
 {
        unsigned long consumed_old, consumed_idx, commit_count, write_offset;
 
        consumed_old = uatomic_read(&buf->consumed);
        consumed_idx = subbuf_index(consumed_old, chan);
-       commit_count = v_read(config, &shmp(handle, buf->commit_cold)[consumed_idx].cc_sb);
+       commit_count = v_read(config, &shmp_index(handle, buf->commit_cold, consumed_idx)->cc_sb);
        /*
         * No memory barrier here, since we are only interested
         * in a statistically correct polling result. The next poll will
@@ -243,7 +243,7 @@ static inline
 unsigned long lib_ring_buffer_get_data_size(const struct lib_ring_buffer_config *config,
                                            struct lib_ring_buffer *buf,
                                            unsigned long idx,
-                                           struct shm_handle *handle)
+                                           struct lttng_ust_shm_handle *handle)
 {
        return subbuffer_get_data_size(config, &buf->backend, idx, handle);
 }
@@ -257,7 +257,7 @@ static inline
 int lib_ring_buffer_reserve_committed(const struct lib_ring_buffer_config *config,
                                      struct lib_ring_buffer *buf,
                                      struct channel *chan,
-                                     struct shm_handle *handle)
+                                     struct lttng_ust_shm_handle *handle)
 {
        unsigned long offset, idx, commit_count;
 
@@ -275,7 +275,7 @@ int lib_ring_buffer_reserve_committed(const struct lib_ring_buffer_config *confi
        do {
                offset = v_read(config, &buf->offset);
                idx = subbuf_index(offset, chan);
-               commit_count = v_read(config, &shmp(handle, buf->commit_hot)[idx].cc);
+               commit_count = v_read(config, &shmp_index(handle, buf->commit_hot, idx)->cc);
        } while (offset != v_read(config, &buf->offset));
 
        return ((buf_trunc(offset, chan) >> chan->backend.num_subbuf_order)
@@ -289,7 +289,7 @@ void lib_ring_buffer_check_deliver(const struct lib_ring_buffer_config *config,
                                   unsigned long offset,
                                   unsigned long commit_count,
                                   unsigned long idx,
-                                  struct shm_handle *handle)
+                                  struct lttng_ust_shm_handle *handle)
 {
        unsigned long old_commit_count = commit_count
                                         - chan->backend.subbuf_size;
@@ -324,7 +324,7 @@ void lib_ring_buffer_check_deliver(const struct lib_ring_buffer_config *config,
                 * The subbuffer size is least 2 bytes (minimum size: 1 page).
                 * This guarantees that old_commit_count + 1 != commit_count.
                 */
-               if (likely(v_cmpxchg(config, &shmp(handle, buf->commit_cold)[idx].cc_sb,
+               if (likely(v_cmpxchg(config, &shmp_index(handle, buf->commit_cold, idx)->cc_sb,
                                         old_commit_count, old_commit_count + 1)
                           == old_commit_count)) {
                        /*
@@ -367,7 +367,7 @@ void lib_ring_buffer_check_deliver(const struct lib_ring_buffer_config *config,
                         */
                        cmm_smp_mb();
                        /* End of exclusive subbuffer access */
-                       v_set(config, &shmp(handle, buf->commit_cold)[idx].cc_sb,
+                       v_set(config, &shmp_index(handle, buf->commit_cold, idx)->cc_sb,
                              commit_count);
                        lib_ring_buffer_vmcore_check_deliver(config, buf,
                                                 commit_count, idx, handle);
@@ -376,10 +376,36 @@ void lib_ring_buffer_check_deliver(const struct lib_ring_buffer_config *config,
                         * RING_BUFFER_WAKEUP_BY_WRITER wakeup is not lock-free.
                         */
                        if (config->wakeup == RING_BUFFER_WAKEUP_BY_WRITER
-                           && uatomic_read(&buf->active_readers)
+                           && (uatomic_read(&buf->active_readers)
+                               || uatomic_read(&buf->active_shadow_readers))
                            && lib_ring_buffer_poll_deliver(config, buf, chan, handle)) {
-                               //wake_up_interruptible(&buf->read_wait);
-                               //wake_up_interruptible(&chan->read_wait);
+                               int wakeup_fd = shm_get_wakeup_fd(handle, &buf->self._ref);
+
+                               if (wakeup_fd >= 0) {
+                                       int ret;
+                                       /*
+                                        * Wake-up the other end by
+                                        * writing a null byte in the
+                                        * pipe (non-blocking).
+                                        * Important note: Because
+                                        * writing into the pipe is
+                                        * non-blocking (and therefore
+                                        * we allow dropping wakeup
+                                        * data, as long as there is
+                                        * wakeup data present in the
+                                        * pipe buffer to wake up the
+                                        * consumer), the consumer
+                                        * should perform the following
+                                        * sequence for waiting:
+                                        * 1) empty the pipe (reads).
+                                        * 2) check if there is data in
+                                        *    the buffer.
+                                        * 3) wait on the pipe (poll).
+                                        */
+                                       do {
+                                               ret = write(wakeup_fd, "", 1);
+                                       } while (ret == -1L && errno == EINTR);
+                               }
                        }
 
                }
@@ -402,7 +428,7 @@ void lib_ring_buffer_write_commit_counter(const struct lib_ring_buffer_config *c
                                          unsigned long buf_offset,
                                          unsigned long commit_count,
                                          size_t slot_size,
-                                         struct shm_handle *handle)
+                                         struct lttng_ust_shm_handle *handle)
 {
        unsigned long offset, commit_seq_old;
 
@@ -420,18 +446,18 @@ void lib_ring_buffer_write_commit_counter(const struct lib_ring_buffer_config *c
        if (unlikely(subbuf_offset(offset - commit_count, chan)))
                return;
 
-       commit_seq_old = v_read(config, &shmp(handle, buf->commit_hot)[idx].seq);
+       commit_seq_old = v_read(config, &shmp_index(handle, buf->commit_hot, idx)->seq);
        while ((long) (commit_seq_old - commit_count) < 0)
-               commit_seq_old = v_cmpxchg(config, &shmp(handle, buf->commit_hot)[idx].seq,
+               commit_seq_old = v_cmpxchg(config, &shmp_index(handle, buf->commit_hot, idx)->seq,
                                           commit_seq_old, commit_count);
 }
 
 extern int lib_ring_buffer_create(struct lib_ring_buffer *buf,
                                  struct channel_backend *chanb, int cpu,
-                                 struct shm_handle *handle,
+                                 struct lttng_ust_shm_handle *handle,
                                  struct shm_object *shmobj);
 extern void lib_ring_buffer_free(struct lib_ring_buffer *buf,
-                                struct shm_handle *handle);
+                                struct lttng_ust_shm_handle *handle);
 
 /* Keep track of trap nesting inside ring buffer code */
 extern __thread unsigned int lib_ring_buffer_nesting;