X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ustd%2Flowlevel.c;h=bce1d20f91c09c55cacf2964eabf75fda119b5cc;hb=2dae156b134735a52d29f544e4c9e12d03baa283;hp=48bd580ee71d59d93a8be604561b148081e7119f;hpb=b5b073e22d34bec71259d39b8946354f170f01a9;p=ust.git diff --git a/ustd/lowlevel.c b/ustd/lowlevel.c index 48bd580..bce1d20 100644 --- a/ustd/lowlevel.c +++ b/ustd/lowlevel.c @@ -17,6 +17,7 @@ #include +#include "buffers.h" #include "tracer.h" #include "ustd.h" #include "usterr.h" @@ -77,18 +78,18 @@ void finish_consuming_dead_subbuffer(struct buffer_info *buf) if (((commit_seq - buf->subbuf_size) & commit_seq_mask) - (USTD_BUFFER_TRUNC(consumed_offset, buf) >> n_subbufs_order) == 0) { - /* If it was, we only check the lost_size. This is the lost padding at the end of - * the subbuffer. */ - valid_length = (unsigned long)buf->subbuf_size - header->lost_size; + /* If it was, we only check the data_size. This is the amount of valid data at + * the beginning of the subbuffer. */ + valid_length = header->data_size; } else { - /* If the subbuffer was not fully written, then we don't check lost_size because + /* If the subbuffer was not fully written, then we don't check data_size because * it hasn't been written yet. Instead we check commit_seq and use it to choose - * a value for lost_size. The viewer will need this value when parsing. + * a value for data_size. The viewer will need this value when parsing. */ valid_length = commit_seq & (buf->subbuf_size-1); - header->lost_size = buf->subbuf_size-valid_length; + header->data_size = valid_length; assert(i_subbuf == (last_subbuf % buf->n_subbufs)); }