Version 2.5.7

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

diff --git a/libringbuffer/frontend_api.h b/libringbuffer/frontend_api.h
index 6a06bba2c2393ba139bc506a8f88bb4027b59ea9..56dbef2aa4326c8a4067ecc96ada66b887358afd 100644 (file)
--- a/libringbuffer/frontend_api.h
+++ b/libringbuffer/frontend_api.h
@@ -55,12 +55,12 @@ int lib_ring_buffer_get_cpu(const struct lttng_ust_lib_ring_buffer_config *confi
 
        rcu_read_lock();
        cpu = lttng_ust_get_cpu();
-       nesting = ++lib_ring_buffer_nesting;    /* TLS */
+       nesting = ++URCU_TLS(lib_ring_buffer_nesting);
        cmm_barrier();
 
        if (caa_unlikely(nesting > 4)) {
                WARN_ON_ONCE(1);
-               lib_ring_buffer_nesting--;      /* TLS */
+               URCU_TLS(lib_ring_buffer_nesting)--;
                rcu_read_unlock();
                return -EPERM;
        } else
@@ -74,7 +74,7 @@ static inline
 void lib_ring_buffer_put_cpu(const struct lttng_ust_lib_ring_buffer_config *config)
 {
        cmm_barrier();
-       lib_ring_buffer_nesting--;              /* TLS */
+       URCU_TLS(lib_ring_buffer_nesting)--;            /* TLS */
        rcu_read_unlock();
 }
 
@@ -288,14 +288,13 @@ void lib_ring_buffer_commit(const struct lttng_ust_lib_ring_buffer_config *confi
        commit_count = v_read(config, &shmp_index(handle, buf->commit_hot, endidx)->cc);
 
        lib_ring_buffer_check_deliver(config, buf, chan, offset_end - 1,
-                                     commit_count, endidx, handle);
+                                     commit_count, endidx, handle, ctx->tsc);
        /*
         * Update used size at each commit. It's needed only for extracting
         * ring_buffer buffers from vmcore, after crash.
         */
        lib_ring_buffer_write_commit_counter(config, buf, chan, endidx,
-                                            ctx->buf_offset, commit_count,
-                                            ctx->slot_size, handle);
+                       offset_end, commit_count, handle);
 }
 
 /**