X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=tests%2Fcompile%2Ftest-app-ctx%2Fhello.c;h=6b1a6bd30251058abc2c20773c39e8cd1b9f2b87;hb=b7c3885540ac3ae1a5f1e8f93e9347c28db9fdcc;hp=3d026095039091c6610e00557303c3ee3c9c78b2;hpb=ae4b659d95f8dab9f2aa4b890d6937d7d5375f07;p=lttng-ust.git

diff --git a/tests/compile/test-app-ctx/hello.c b/tests/compile/test-app-ctx/hello.c
index 3d026095..6b1a6bd3 100644
--- a/tests/compile/test-app-ctx/hello.c
+++ b/tests/compile/test-app-ctx/hello.c
@@ -28,9 +28,9 @@ struct mmsghdr;
 #define TRACEPOINT_DEFINE
 #include "ust_tests_hello.h"
 
-/* Internal header. */
 #include <lttng/ust-events.h>
-#include <lttng/ringbuffer-config.h>
+#include <lttng/ringbuffer-context.h>
+/* Internal header. */
 #include <ust-context-provider.h>
 
 static __thread unsigned int test_count;
@@ -41,7 +41,7 @@ void test_inc_count(void)
 }
 
 static
-size_t test_get_size(struct lttng_ctx_field *field, size_t offset)
+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;
@@ -102,15 +102,15 @@ size_t test_get_size(struct lttng_ctx_field *field, size_t offset)
 }
 
 static
-void test_record(struct lttng_ctx_field *field,
+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));
 	switch (sel) {
 	case LTTNG_UST_DYNAMIC_TYPE_NONE:
 		break;
@@ -119,7 +119,7 @@ void test_record(struct lttng_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));
 		break;
 	}
 	case LTTNG_UST_DYNAMIC_TYPE_S16:
@@ -127,7 +127,7 @@ void test_record(struct lttng_ctx_field *field,
 		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));
 		break;
 	}
 	case LTTNG_UST_DYNAMIC_TYPE_S32:
@@ -135,7 +135,7 @@ void test_record(struct lttng_ctx_field *field,
 		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));
 		break;
 	}
 	case LTTNG_UST_DYNAMIC_TYPE_S64:
@@ -143,7 +143,7 @@ void test_record(struct lttng_ctx_field *field,
 		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));
 		break;
 	}
 	case LTTNG_UST_DYNAMIC_TYPE_U8:
@@ -151,7 +151,7 @@ void test_record(struct lttng_ctx_field *field,
 		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));
 		break;
 	}
 	case LTTNG_UST_DYNAMIC_TYPE_U16:
@@ -159,7 +159,7 @@ void test_record(struct lttng_ctx_field *field,
 		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));
 		break;
 	}
 	case LTTNG_UST_DYNAMIC_TYPE_U32:
@@ -167,7 +167,7 @@ void test_record(struct lttng_ctx_field *field,
 		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));
 		break;
 	}
 	case LTTNG_UST_DYNAMIC_TYPE_U64:
@@ -175,7 +175,7 @@ void test_record(struct lttng_ctx_field *field,
 		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));
 		break;
 	}
 	case LTTNG_UST_DYNAMIC_TYPE_FLOAT:
@@ -183,7 +183,7 @@ void test_record(struct lttng_ctx_field *field,
 		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));
 		break;
 	}
 	case LTTNG_UST_DYNAMIC_TYPE_DOUBLE:
@@ -191,13 +191,13 @@ void test_record(struct lttng_ctx_field *field,
 		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));
 		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);
 		break;
 	}
 	default:
@@ -206,8 +206,8 @@ void test_record(struct lttng_ctx_field *field,
 }
 
 static
-void test_get_value(struct lttng_ctx_field *field,
-		struct lttng_ctx_value *value)
+void test_get_value(struct lttng_ust_ctx_field *field,
+		struct lttng_ust_ctx_value *value)
 {
 	int sel = test_count % _NR_LTTNG_UST_DYNAMIC_TYPES;
 
@@ -254,6 +254,7 @@ void test_get_value(struct lttng_ctx_field *field,
 }
 
 struct lttng_ust_context_provider myprovider = {
+	.struct_size = sizeof(struct lttng_ust_context_provider),
 	.name = "$app.myprovider",
 	.get_size = test_get_size,
 	.record = test_record,