X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust-java-agent%2Fjni%2Fcommon%2Flttng_ust_context.c;h=95679f5358bd3b8492a3c02a6615285aefd581e6;hb=8936b6c0add7eb6706e0a1ca50e03c446dda4006;hp=ae478ba3c407c26ccd015ea9a2232454e763c5c7;hpb=e016c06adf51c2e213303343026c2b5d3d7776e1;p=lttng-ust.git

diff --git a/liblttng-ust-java-agent/jni/common/lttng_ust_context.c b/liblttng-ust-java-agent/jni/common/lttng_ust_context.c
index ae478ba3..95679f53 100644
--- a/liblttng-ust-java-agent/jni/common/lttng_ust_context.c
+++ b/liblttng-ust-java-agent/jni/common/lttng_ust_context.c
@@ -81,7 +81,7 @@ static size_t get_size_cb(struct lttng_ust_ctx_field *field, size_t offset)
 	enum lttng_ust_jni_type jni_type;
 
 
-	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 */
 	jctx = lookup_ctx_by_name(ctx_name);
 	if (!jctx) {
@@ -93,28 +93,28 @@ static size_t get_size_cb(struct lttng_ust_ctx_field *field, size_t offset)
 	case JNI_TYPE_NULL:
 		break;
 	case JNI_TYPE_INTEGER:
-		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 JNI_TYPE_LONG:
-		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 JNI_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 JNI_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 JNI_TYPE_SHORT:
-		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 JNI_TYPE_BYTE:		/* Fall-through. */
 	case JNI_TYPE_BOOLEAN:
-		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);		/* variant */
 		break;
 	case JNI_TYPE_STRING:
@@ -154,18 +154,15 @@ static void record_cb(struct lttng_ust_ctx_field *field,
 	switch (jni_type) {
 	case JNI_TYPE_NULL:
 		sel_char = LTTNG_UST_DYNAMIC_TYPE_NONE;
-		lib_ring_buffer_align_ctx(ctx, lttng_alignof(char));
-		lttng_chan_buf->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));
 		break;
 	case JNI_TYPE_INTEGER:
 	{
 		int32_t v = jctx->value._integer;
 
 		sel_char = LTTNG_UST_DYNAMIC_TYPE_S32;
-		lib_ring_buffer_align_ctx(ctx, lttng_alignof(char));
-		lttng_chan_buf->ops->event_write(ctx, &sel_char, sizeof(sel_char));
-		lib_ring_buffer_align_ctx(ctx, lttng_alignof(v));
-		lttng_chan_buf->ops->event_write(ctx, &v, sizeof(v));
+		lttng_chan_buf->ops->event_write(ctx, &sel_char, sizeof(sel_char), lttng_ust_rb_alignof(char));
+		lttng_chan_buf->ops->event_write(ctx, &v, sizeof(v), lttng_ust_rb_alignof(v));
 		break;
 	}
 	case JNI_TYPE_LONG:
@@ -173,10 +170,8 @@ static void record_cb(struct lttng_ust_ctx_field *field,
 		int64_t v = jctx->value._long;
 
 		sel_char = LTTNG_UST_DYNAMIC_TYPE_S64;
-		lib_ring_buffer_align_ctx(ctx, lttng_alignof(char));
-		lttng_chan_buf->ops->event_write(ctx, &sel_char, sizeof(sel_char));
-		lib_ring_buffer_align_ctx(ctx, lttng_alignof(v));
-		lttng_chan_buf->ops->event_write(ctx, &v, sizeof(v));
+		lttng_chan_buf->ops->event_write(ctx, &sel_char, sizeof(sel_char), lttng_ust_rb_alignof(char));
+		lttng_chan_buf->ops->event_write(ctx, &v, sizeof(v), lttng_ust_rb_alignof(v));
 		break;
 	}
 	case JNI_TYPE_DOUBLE:
@@ -184,10 +179,8 @@ static void record_cb(struct lttng_ust_ctx_field *field,
 		double v = jctx->value._double;
 
 		sel_char = LTTNG_UST_DYNAMIC_TYPE_DOUBLE;
-		lib_ring_buffer_align_ctx(ctx, lttng_alignof(char));
-		lttng_chan_buf->ops->event_write(ctx, &sel_char, sizeof(sel_char));
-		lib_ring_buffer_align_ctx(ctx, lttng_alignof(v));
-		lttng_chan_buf->ops->event_write(ctx, &v, sizeof(v));
+		lttng_chan_buf->ops->event_write(ctx, &sel_char, sizeof(sel_char), lttng_ust_rb_alignof(char));
+		lttng_chan_buf->ops->event_write(ctx, &v, sizeof(v), lttng_ust_rb_alignof(v));
 		break;
 	}
 	case JNI_TYPE_FLOAT:
@@ -195,10 +188,8 @@ static void record_cb(struct lttng_ust_ctx_field *field,
 		float v = jctx->value._float;
 
 		sel_char = LTTNG_UST_DYNAMIC_TYPE_FLOAT;
-		lib_ring_buffer_align_ctx(ctx, lttng_alignof(char));
-		lttng_chan_buf->ops->event_write(ctx, &sel_char, sizeof(sel_char));
-		lib_ring_buffer_align_ctx(ctx, lttng_alignof(v));
-		lttng_chan_buf->ops->event_write(ctx, &v, sizeof(v));
+		lttng_chan_buf->ops->event_write(ctx, &sel_char, sizeof(sel_char), lttng_ust_rb_alignof(char));
+		lttng_chan_buf->ops->event_write(ctx, &v, sizeof(v), lttng_ust_rb_alignof(v));
 		break;
 	}
 	case JNI_TYPE_SHORT:
@@ -206,10 +197,8 @@ static void record_cb(struct lttng_ust_ctx_field *field,
 		int16_t v = jctx->value._short;
 
 		sel_char = LTTNG_UST_DYNAMIC_TYPE_S16;
-		lib_ring_buffer_align_ctx(ctx, lttng_alignof(char));
-		lttng_chan_buf->ops->event_write(ctx, &sel_char, sizeof(sel_char));
-		lib_ring_buffer_align_ctx(ctx, lttng_alignof(v));
-		lttng_chan_buf->ops->event_write(ctx, &v, sizeof(v));
+		lttng_chan_buf->ops->event_write(ctx, &sel_char, sizeof(sel_char), lttng_ust_rb_alignof(char));
+		lttng_chan_buf->ops->event_write(ctx, &v, sizeof(v), lttng_ust_rb_alignof(v));
 		break;
 	}
 	case JNI_TYPE_BYTE:
@@ -217,10 +206,8 @@ static void record_cb(struct lttng_ust_ctx_field *field,
 		char v = jctx->value._byte;
 
 		sel_char = LTTNG_UST_DYNAMIC_TYPE_S8;
-		lib_ring_buffer_align_ctx(ctx, lttng_alignof(char));
-		lttng_chan_buf->ops->event_write(ctx, &sel_char, sizeof(sel_char));
-		lib_ring_buffer_align_ctx(ctx, lttng_alignof(v));
-		lttng_chan_buf->ops->event_write(ctx, &v, sizeof(v));
+		lttng_chan_buf->ops->event_write(ctx, &sel_char, sizeof(sel_char), lttng_ust_rb_alignof(char));
+		lttng_chan_buf->ops->event_write(ctx, &v, sizeof(v), lttng_ust_rb_alignof(v));
 		break;
 	}
 	case JNI_TYPE_BOOLEAN:
@@ -228,10 +215,8 @@ static void record_cb(struct lttng_ust_ctx_field *field,
 		char v = jctx->value._boolean;
 
 		sel_char = LTTNG_UST_DYNAMIC_TYPE_S8;
-		lib_ring_buffer_align_ctx(ctx, lttng_alignof(char));
-		lttng_chan_buf->ops->event_write(ctx, &sel_char, sizeof(sel_char));
-		lib_ring_buffer_align_ctx(ctx, lttng_alignof(v));
-		lttng_chan_buf->ops->event_write(ctx, &v, sizeof(v));
+		lttng_chan_buf->ops->event_write(ctx, &sel_char, sizeof(sel_char), lttng_ust_rb_alignof(char));
+		lttng_chan_buf->ops->event_write(ctx, &v, sizeof(v), lttng_ust_rb_alignof(v));
 		break;
 	}
 	case JNI_TYPE_STRING:
@@ -244,10 +229,9 @@ static void record_cb(struct lttng_ust_ctx_field *field,
 			} else {
 				sel_char = LTTNG_UST_DYNAMIC_TYPE_NONE;
 			}
-			lib_ring_buffer_align_ctx(ctx, lttng_alignof(char));
-			lttng_chan_buf->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));
 			if (str) {
-				lttng_chan_buf->ops->event_write(ctx, str, strlen(str) + 1);
+				lttng_chan_buf->ops->event_write(ctx, str, strlen(str) + 1, 1);
 			}
 			break;
 	}