X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust%2Flttng-context-pthread-id.c;h=a032b26ab7f57e1dee47f430cdf1f12931b7b9fb;hb=5152f6df156d6ccb234965d1b3d26b167bd6b94e;hp=ba371d7cb0eeaa23afe1a560ca01e52fa1441a47;hpb=3b8bedd809f1a5b56da5fc101a90b44263b0f473;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-context-pthread-id.c b/liblttng-ust/lttng-context-pthread-id.c
index ba371d7c..a032b26a 100644
--- a/liblttng-ust/lttng-context-pthread-id.c
+++ b/liblttng-ust/lttng-context-pthread-id.c
@@ -17,29 +17,29 @@
 #include "context-internal.h"
 
 static
-size_t pthread_id_get_size(struct lttng_ust_ctx_field *field, size_t offset)
+size_t pthread_id_get_size(struct lttng_ust_ctx_field *field __attribute__((unused)),
+		size_t offset)
 {
 	size_t size = 0;
 
-	size += lttng_ust_lib_ring_buffer_align(offset, lttng_alignof(unsigned long));
+	size += lttng_ust_lib_ring_buffer_align(offset, lttng_ust_rb_alignof(unsigned long));
 	size += sizeof(unsigned long);
 	return size;
 }
 
 static
-void pthread_id_record(struct lttng_ust_ctx_field *field,
+void pthread_id_record(struct lttng_ust_ctx_field *field __attribute__((unused)),
 		 struct lttng_ust_lib_ring_buffer_ctx *ctx,
 		 struct lttng_ust_channel_buffer *chan)
 {
 	unsigned long pthread_id;
 
 	pthread_id = (unsigned long) pthread_self();
-	lttng_ust_lib_ring_buffer_align_ctx(ctx, lttng_alignof(pthread_id));
-	chan->ops->event_write(ctx, &pthread_id, sizeof(pthread_id));
+	chan->ops->event_write(ctx, &pthread_id, sizeof(pthread_id), lttng_ust_rb_alignof(pthread_id));
 }
 
 static
-void pthread_id_get_value(struct lttng_ust_ctx_field *field,
+void pthread_id_get_value(struct lttng_ust_ctx_field *field __attribute__((unused)),
 		struct lttng_ust_ctx_value *value)
 {
 	value->u.s64 = (unsigned long) pthread_self();
@@ -52,7 +52,7 @@ int lttng_add_pthread_id_to_ctx(struct lttng_ust_ctx **ctx)
 	int ret;
 
 	type = lttng_ust_create_type_integer(sizeof(unsigned long) * CHAR_BIT,
-			lttng_alignof(unsigned long) * CHAR_BIT,
+			lttng_ust_rb_alignof(unsigned long) * CHAR_BIT,
 			lttng_ust_is_signed_type(unsigned long),
 			BYTE_ORDER, 10);
 	if (!type)