X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=ustd%2Flowlevel.c;h=48bd580ee71d59d93a8be604561b148081e7119f;hb=b5b073e22d34bec71259d39b8946354f170f01a9;hp=7d3fed9e6c2d327b89b43fa4decde7326289d1f3;hpb=211c34d255c481b47faf1362475ee12dcbafa255;p=ust.git

diff --git a/ustd/lowlevel.c b/ustd/lowlevel.c
index 7d3fed9..48bd580 100644
--- a/ustd/lowlevel.c
+++ b/ustd/lowlevel.c
@@ -1,8 +1,25 @@
+/* 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 "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 +27,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 +59,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);