Refactoring: context callbacks

[lttng-modules.git] / src / lttng-ring-buffer-client.h

diff --git a/src/lttng-ring-buffer-client.h b/src/lttng-ring-buffer-client.h
index 9ac2cfe9d348d057e7b30199cb1072766c69bd8d..cec656af5a7c20898c8b8db61226902dcf5edc0a 100644 (file)
--- 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);
 }
 
 /*