X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Flttng-ring-buffer-client.h;h=cec656af5a7c20898c8b8db61226902dcf5edc0a;hb=2dc781e02eb156a76554ada092a181ab2916db57;hp=9ac2cfe9d348d057e7b30199cb1072766c69bd8d;hpb=c2fb9c1c4f890840c02ad4b66a7cf69ae5dca6f7;p=lttng-modules.git

diff --git a/src/lttng-ring-buffer-client.h b/src/lttng-ring-buffer-client.h
index 9ac2cfe9..cec656af 100644
--- a/src/lttng-ring-buffer-client.h
+++ b/src/lttng-ring-buffer-client.h
@@ -99,11 +99,8 @@ void ctx_get_struct_size(struct lttng_kernel_ctx *ctx, size_t *ctx_len,
 		return;
 	}
 	for (i = 0; i < ctx->nr_fields; i++) {
-		if (ctx->fields[i].get_size)
-			offset += ctx->fields[i].get_size(offset);
-		if (ctx->fields[i].get_size_arg)
-			offset += ctx->fields[i].get_size_arg(offset,
-					&ctx->fields[i], bufctx, chan);
+		offset += ctx->fields[i].get_size(ctx->fields[i].priv,
+				bufctx->probe_ctx, offset);
 	}
 	*ctx_len = offset;
 }
@@ -119,7 +116,8 @@ void ctx_record(struct lib_ring_buffer_ctx *bufctx,
 		return;
 	lib_ring_buffer_align_ctx(bufctx, ctx->largest_align);
 	for (i = 0; i < ctx->nr_fields; i++)
-		ctx->fields[i].record(&ctx->fields[i], bufctx, chan);
+		ctx->fields[i].record(ctx->fields[i].priv, bufctx->probe_ctx,
+				bufctx, chan);
 }
 
 /*