X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=tests%2Fcompile%2Ftest-app-ctx%2Fhello.c;h=6e16b12fac871b19e011fc60f03a6433b6df0990;hb=c589eca21586907ffd057fa614e7e2715086b5c7;hp=19901c7caf64559c8a8fd9e3c7370e1e38fd85b4;hpb=0466ac28c41336fd6d373cc8b0b26ef132225b9f;p=lttng-ust.git

diff --git a/tests/compile/test-app-ctx/hello.c b/tests/compile/test-app-ctx/hello.c
index 19901c7c..6e16b12f 100644
--- a/tests/compile/test-app-ctx/hello.c
+++ b/tests/compile/test-app-ctx/hello.c
@@ -46,49 +46,49 @@ size_t test_get_size(struct lttng_ust_ctx_field *field, size_t offset)
 	int sel = test_count % _NR_LTTNG_UST_DYNAMIC_TYPES;
 	size_t size = 0;
 
-	size += lib_ring_buffer_align(offset, lttng_alignof(char));
+	size += lttng_ust_lib_ring_buffer_align(offset, lttng_ust_rb_alignof(char));
 	size += sizeof(char);		/* tag */
 	switch (sel) {
 	case LTTNG_UST_DYNAMIC_TYPE_NONE:
 		break;
 	case LTTNG_UST_DYNAMIC_TYPE_S8:
-		size += lib_ring_buffer_align(offset, lttng_alignof(int8_t));
+		size += lttng_ust_lib_ring_buffer_align(offset, lttng_ust_rb_alignof(int8_t));
 		size += sizeof(int8_t);		/* variant */
 		break;
 	case LTTNG_UST_DYNAMIC_TYPE_S16:
-		size += lib_ring_buffer_align(offset, lttng_alignof(int16_t));
+		size += lttng_ust_lib_ring_buffer_align(offset, lttng_ust_rb_alignof(int16_t));
 		size += sizeof(int16_t);	/* variant */
 		break;
 	case LTTNG_UST_DYNAMIC_TYPE_S32:
-		size += lib_ring_buffer_align(offset, lttng_alignof(int32_t));
+		size += lttng_ust_lib_ring_buffer_align(offset, lttng_ust_rb_alignof(int32_t));
 		size += sizeof(int32_t);	/* variant */
 		break;
 	case LTTNG_UST_DYNAMIC_TYPE_S64:
-		size += lib_ring_buffer_align(offset, lttng_alignof(int64_t));
+		size += lttng_ust_lib_ring_buffer_align(offset, lttng_ust_rb_alignof(int64_t));
 		size += sizeof(int64_t);	/* variant */
 		break;
 	case LTTNG_UST_DYNAMIC_TYPE_U8:
-		size += lib_ring_buffer_align(offset, lttng_alignof(uint8_t));
+		size += lttng_ust_lib_ring_buffer_align(offset, lttng_ust_rb_alignof(uint8_t));
 		size += sizeof(uint8_t);		/* variant */
 		break;
 	case LTTNG_UST_DYNAMIC_TYPE_U16:
-		size += lib_ring_buffer_align(offset, lttng_alignof(uint16_t));
+		size += lttng_ust_lib_ring_buffer_align(offset, lttng_ust_rb_alignof(uint16_t));
 		size += sizeof(uint16_t);	/* variant */
 		break;
 	case LTTNG_UST_DYNAMIC_TYPE_U32:
-		size += lib_ring_buffer_align(offset, lttng_alignof(uint32_t));
+		size += lttng_ust_lib_ring_buffer_align(offset, lttng_ust_rb_alignof(uint32_t));
 		size += sizeof(uint32_t);	/* variant */
 		break;
 	case LTTNG_UST_DYNAMIC_TYPE_U64:
-		size += lib_ring_buffer_align(offset, lttng_alignof(uint64_t));
+		size += lttng_ust_lib_ring_buffer_align(offset, lttng_ust_rb_alignof(uint64_t));
 		size += sizeof(uint64_t);	/* variant */
 		break;
 	case LTTNG_UST_DYNAMIC_TYPE_FLOAT:
-		size += lib_ring_buffer_align(offset, lttng_alignof(float));
+		size += lttng_ust_lib_ring_buffer_align(offset, lttng_ust_rb_alignof(float));
 		size += sizeof(float);		/* variant */
 		break;
 	case LTTNG_UST_DYNAMIC_TYPE_DOUBLE:
-		size += lib_ring_buffer_align(offset, lttng_alignof(double));
+		size += lttng_ust_lib_ring_buffer_align(offset, lttng_ust_rb_alignof(double));
 		size += sizeof(double);		/* variant */
 		break;
 	case LTTNG_UST_DYNAMIC_TYPE_STRING:
@@ -104,13 +104,12 @@ size_t test_get_size(struct lttng_ust_ctx_field *field, size_t offset)
 static
 void test_record(struct lttng_ust_ctx_field *field,
 		 struct lttng_ust_lib_ring_buffer_ctx *ctx,
-		 struct lttng_channel *chan)
+		 struct lttng_ust_channel_buffer *lttng_chan_buf)
 {
 	int sel = test_count % _NR_LTTNG_UST_DYNAMIC_TYPES;
 	char sel_char = (char) sel;
 
-	lib_ring_buffer_align_ctx(ctx, lttng_alignof(char));
-	chan->ops->event_write(ctx, &sel_char, sizeof(sel_char));
+	lttng_chan_buf->ops->event_write(ctx, &sel_char, sizeof(sel_char), lttng_ust_rb_alignof(char));
 	switch (sel) {
 	case LTTNG_UST_DYNAMIC_TYPE_NONE:
 		break;
@@ -118,86 +117,76 @@ void test_record(struct lttng_ust_ctx_field *field,
 	{
 		int8_t v = -8;
 
-		lib_ring_buffer_align_ctx(ctx, lttng_alignof(v));
-		chan->ops->event_write(ctx, &v, sizeof(v));
+		lttng_chan_buf->ops->event_write(ctx, &v, sizeof(v), lttng_ust_rb_alignof(v));
 		break;
 	}
 	case LTTNG_UST_DYNAMIC_TYPE_S16:
 	{
 		int16_t v = -16;
 
-		lib_ring_buffer_align_ctx(ctx, lttng_alignof(v));
-		chan->ops->event_write(ctx, &v, sizeof(v));
+		lttng_chan_buf->ops->event_write(ctx, &v, sizeof(v), lttng_ust_rb_alignof(v));
 		break;
 	}
 	case LTTNG_UST_DYNAMIC_TYPE_S32:
 	{
 		int32_t v = -32;
 
-		lib_ring_buffer_align_ctx(ctx, lttng_alignof(v));
-		chan->ops->event_write(ctx, &v, sizeof(v));
+		lttng_chan_buf->ops->event_write(ctx, &v, sizeof(v), lttng_ust_rb_alignof(v));
 		break;
 	}
 	case LTTNG_UST_DYNAMIC_TYPE_S64:
 	{
 		int64_t v = -64;
 
-		lib_ring_buffer_align_ctx(ctx, lttng_alignof(v));
-		chan->ops->event_write(ctx, &v, sizeof(v));
+		lttng_chan_buf->ops->event_write(ctx, &v, sizeof(v), lttng_ust_rb_alignof(v));
 		break;
 	}
 	case LTTNG_UST_DYNAMIC_TYPE_U8:
 	{
 		uint8_t v = 8;
 
-		lib_ring_buffer_align_ctx(ctx, lttng_alignof(v));
-		chan->ops->event_write(ctx, &v, sizeof(v));
+		lttng_chan_buf->ops->event_write(ctx, &v, sizeof(v), lttng_ust_rb_alignof(v));
 		break;
 	}
 	case LTTNG_UST_DYNAMIC_TYPE_U16:
 	{
 		uint16_t v = 16;
 
-		lib_ring_buffer_align_ctx(ctx, lttng_alignof(v));
-		chan->ops->event_write(ctx, &v, sizeof(v));
+		lttng_chan_buf->ops->event_write(ctx, &v, sizeof(v), lttng_ust_rb_alignof(v));
 		break;
 	}
 	case LTTNG_UST_DYNAMIC_TYPE_U32:
 	{
 		uint32_t v = 32;
 
-		lib_ring_buffer_align_ctx(ctx, lttng_alignof(v));
-		chan->ops->event_write(ctx, &v, sizeof(v));
+		lttng_chan_buf->ops->event_write(ctx, &v, sizeof(v), lttng_ust_rb_alignof(v));
 		break;
 	}
 	case LTTNG_UST_DYNAMIC_TYPE_U64:
 	{
 		uint64_t v = 64;
 
-		lib_ring_buffer_align_ctx(ctx, lttng_alignof(v));
-		chan->ops->event_write(ctx, &v, sizeof(v));
+		lttng_chan_buf->ops->event_write(ctx, &v, sizeof(v), lttng_ust_rb_alignof(v));
 		break;
 	}
 	case LTTNG_UST_DYNAMIC_TYPE_FLOAT:
 	{
 		float f = 22322.0;
 
-		lib_ring_buffer_align_ctx(ctx, lttng_alignof(f));
-		chan->ops->event_write(ctx, &f, sizeof(f));
+		lttng_chan_buf->ops->event_write(ctx, &f, sizeof(f), lttng_ust_rb_alignof(f));
 		break;
 	}
 	case LTTNG_UST_DYNAMIC_TYPE_DOUBLE:
 	{
 		double d = 2.0;
 
-		lib_ring_buffer_align_ctx(ctx, lttng_alignof(d));
-		chan->ops->event_write(ctx, &d, sizeof(d));
+		lttng_chan_buf->ops->event_write(ctx, &d, sizeof(d), lttng_ust_rb_alignof(d));
 		break;
 	}
 	case LTTNG_UST_DYNAMIC_TYPE_STRING:
 	{
 		const char *str = "teststr";
-		chan->ops->event_write(ctx, str, strlen(str) + 1);
+		lttng_chan_buf->ops->event_write(ctx, str, strlen(str) + 1, 1);
 		break;
 	}
 	default: