X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ustd%2Flowlevel.c;h=5c145fa3f9e9ffae7cb947ef9ab76643eada4290;hb=d9ba7a59f617334901d86db6b197df3d02aaee11;hp=4c179c5cbe1317b71b6724f276fcd920cdee4ac8;hpb=1d59f7ebe74e0bb11f5db359e543f8f05a2f8635;p=lttng-ust.git diff --git a/ustd/lowlevel.c b/ustd/lowlevel.c index 4c179c5c..5c145fa3 100644 --- a/ustd/lowlevel.c +++ b/ustd/lowlevel.c @@ -15,6 +15,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include #include #include @@ -65,8 +66,8 @@ void finish_consuming_dead_subbuffer(struct buffer_info *buf) { struct ust_buffer *ustbuf = buf->bufstruct_mem; - long write_offset = local_read(&ustbuf->offset); - long consumed_offset = atomic_long_read(&ustbuf->consumed); + long write_offset = uatomic_read(&ustbuf->offset); + long consumed_offset = uatomic_read(&ustbuf->consumed); long i_subbuf; @@ -95,7 +96,7 @@ void finish_consuming_dead_subbuffer(struct buffer_info *buf) void *tmp; /* commit_seq is the offset in the buffer of the end of the last sequential commit. * Bytes beyond this limit cannot be recovered. This is a free-running counter. */ - long commit_seq = local_read(&ustbuf->commit_seq[i_subbuf]); + long commit_seq = uatomic_read(&ustbuf->commit_seq[i_subbuf]); unsigned long valid_length = buf->subbuf_size; long n_subbufs_order = get_count_order(buf->n_subbufs);