X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=libust%2Frelay.h;h=ba7c1d63aa2d10c35349bf2d86b70e9000228e04;hb=957f86e7e03c9cce749ac96e65749209247e4382;hp=7d582a8802e13c70cced7ea3e1bfbbe93e56c005;hpb=769d015768372ce7f68ff12bbc55aa339c3a6bcd;p=lttng-ust.git

diff --git a/libust/relay.h b/libust/relay.h
index 7d582a88..ba7c1d63 100644
--- a/libust/relay.h
+++ b/libust/relay.h
@@ -21,9 +21,11 @@
 //ust// #include <linux/kref.h>
 //ust// #include <linux/mm.h>
 //ust// #include <linux/ltt-core.h>
-#include "kref.h"
+#include <assert.h>
+#include <kcompat/kref.h>
 //#include "list.h"
 #include "channels.h"
+#include "buffer.h"
 
 /* Needs a _much_ better name... */
 #define FIX_SIZE(x) ((((x) - 1) & PAGE_MASK) + PAGE_SIZE)
@@ -213,16 +215,24 @@ static inline struct buf_page *ltt_relay_cache_page(struct rchan_buf *buf,
 //ust// #ifdef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS
  static inline void ltt_relay_do_copy(void *dest, const void *src, size_t len)
 {
+	union {
+		const void *src;
+		const u8 *src8;
+		const u16 *src16;
+		const u32 *src32;
+		const u64 *src64;
+	} u = { .src = src };
+
 	switch (len) {
 	case 0:	break;
-	case 1:	*(u8 *)dest = *(const u8 *)src;
+	case 1:	*(u8 *)dest = *u.src8;
 		break;
-	case 2:	*(u16 *)dest = *(const u16 *)src;
+	case 2:	*(u16 *)dest = *u.src16;
 		break;
-	case 4:	*(u32 *)dest = *(const u32 *)src;
+	case 4:	*(u32 *)dest = *u.src32;
 		break;
 //ust// #if (BITS_PER_LONG == 64)
-	case 8:	*(u64 *)dest = *(const u64 *)src;
+	case 8:	*(u64 *)dest = *u.src64;
 		break;
 //ust// #endif
 	default:
@@ -290,13 +300,16 @@ static inline int ltt_relay_write(struct rchan_buf *buf, size_t offset,
 //ust//		_ltt_relay_write(buf, offset, src, len, page, pagecpy);
 //ust//	return len;
 
-
 	size_t cpy;
-	cpy = min_t(size_t, len, buf->buf_size - offset);
-	ltt_relay_do_copy(buf->buf_data + offset, src, cpy);
+	size_t buf_offset = BUFFER_OFFSET(offset, buf->chan);
+
+	assert(buf_offset < buf->chan->subbuf_size*buf->chan->n_subbufs);
+
+	cpy = min_t(size_t, len, buf->buf_size - buf_offset);
+	ltt_relay_do_copy(buf->buf_data + buf_offset, src, cpy);
 	
 	if (unlikely(len != cpy))
-		_ltt_relay_write(buf, offset, src, len, cpy);
+		_ltt_relay_write(buf, buf_offset, src, len, cpy);
 	return len;
 }
 
@@ -366,4 +379,6 @@ int ltt_do_get_subbuf(struct rchan_buf *buf, struct ltt_channel_buf_struct *ltt_
 
 int ltt_do_put_subbuf(struct rchan_buf *buf, struct ltt_channel_buf_struct *ltt_buf, u32 uconsumed_old);
 
+void init_ustrelay_transport(void);
+
 #endif /* _LINUX_LTT_RELAY_H */