X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=ustd%2Flowlevel.c;h=bce1d20f91c09c55cacf2964eabf75fda119b5cc;hb=8c36d1ee4e2c77783f6edfdd49f2d812afdd3f67;hp=7d3fed9e6c2d327b89b43fa4decde7326289d1f3;hpb=211c34d255c481b47faf1362475ee12dcbafa255;p=ust.git

diff --git a/ustd/lowlevel.c b/ustd/lowlevel.c
index 7d3fed9..bce1d20 100644
--- a/ustd/lowlevel.c
+++ b/ustd/lowlevel.c
@@ -1,8 +1,26 @@
+/* Copyright (C) 2009  Pierre-Marc Fournier
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
+ */
+
 #include <assert.h>
 
+#include "buffers.h"
 #include "tracer.h"
 #include "ustd.h"
-#include "localerr.h"
+#include "usterr.h"
 
 /* This truncates to an offset in the buffer. */
 #define USTD_BUFFER_TRUNC(offset, bufinfo) \
@@ -10,10 +28,10 @@
 
 void finish_consuming_dead_subbuffer(struct buffer_info *buf)
 {
-	struct ltt_channel_buf_struct *ltt_buf = buf->bufstruct_mem;
+	struct ust_buffer *ustbuf = buf->bufstruct_mem;
 
-	long write_offset = local_read(&ltt_buf->offset);
-	long consumed_offset = atomic_long_read(&ltt_buf->consumed);
+	long write_offset = local_read(&ustbuf->offset);
+	long consumed_offset = atomic_long_read(&ustbuf->consumed);
 
 	long i_subbuf;
 
@@ -42,7 +60,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(&ltt_buf->commit_seq[i_subbuf]);
+		long commit_seq = local_read(&ustbuf->commit_seq[i_subbuf]);
 
 		unsigned long valid_length = buf->subbuf_size;
 		long n_subbufs_order = get_count_order(buf->n_subbufs);
@@ -60,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));
 		}