void (*destroy)(struct lttng_ctx_field *field);
};
-#define LTTNG_UST_CTX_PADDING 24
+#define LTTNG_UST_CTX_PADDING 20
struct lttng_ctx {
struct lttng_ctx_field *fields;
unsigned int nr_fields;
unsigned int allocated_fields;
+ unsigned int largest_align;
char padding[LTTNG_UST_CTX_PADDING];
};
int lttng_find_context(struct lttng_ctx *ctx, const char *name);
int lttng_get_context_index(struct lttng_ctx *ctx, const char *name);
struct lttng_ctx_field *lttng_append_context(struct lttng_ctx **ctx_p);
+void lttng_context_update(struct lttng_ctx *ctx);
void lttng_remove_context_field(struct lttng_ctx **ctx_p,
struct lttng_ctx_field *field);
void lttng_destroy_context(struct lttng_ctx *ctx);
field->event_field.type.u.basic.integer.encoding = lttng_encode_none;
field->get_size = ip_get_size;
field->record = ip_record;
+ lttng_context_update(*ctx);
return 0;
}
field->get_size = procname_get_size;
field->record = procname_record;
field->get_value = procname_get_value;
+ lttng_context_update(*ctx);
return 0;
}
field->get_size = pthread_id_get_size;
field->record = pthread_id_record;
field->get_value = pthread_id_get_value;
+ lttng_context_update(*ctx);
return 0;
}
field->get_size = vpid_get_size;
field->record = vpid_record;
field->get_value = vpid_get_value;
+ lttng_context_update(*ctx);
return 0;
}
field->get_size = vtid_get_size;
field->record = vtid_record;
field->get_value = vtid_get_value;
+ lttng_context_update(*ctx);
return 0;
}
*ctx_p = zmalloc(sizeof(struct lttng_ctx));
if (!*ctx_p)
return NULL;
+ (*ctx_p)->largest_align = 1;
}
ctx = *ctx_p;
if (ctx->nr_fields + 1 > ctx->allocated_fields) {
return field;
}
+/*
+ * lttng_context_update() should be called at least once between context
+ * modification and trace start.
+ */
+void lttng_context_update(struct lttng_ctx *ctx)
+{
+ int i;
+ size_t largest_align = 8; /* in bits */
+
+ for (i = 0; i < ctx->nr_fields; i++) {
+ struct lttng_type *type;
+ size_t field_align = 8;
+
+ type = &ctx->fields[i].event_field.type;
+ switch (type->atype) {
+ case atype_integer:
+ field_align = type->u.basic.integer.alignment;
+ break;
+ case atype_array:
+ {
+ struct lttng_basic_type *btype;
+
+ btype = &type->u.array.elem_type;
+ switch (btype->atype) {
+ case atype_integer:
+ field_align = btype->u.basic.integer.alignment;
+ break;
+ case atype_string:
+ break;
+
+ case atype_array:
+ case atype_sequence:
+ default:
+ WARN_ON_ONCE(1);
+ break;
+ }
+ break;
+ }
+ case atype_sequence:
+ {
+ struct lttng_basic_type *btype;
+
+ btype = &type->u.sequence.length_type;
+ switch (btype->atype) {
+ case atype_integer:
+ field_align = btype->u.basic.integer.alignment;
+ break;
+
+ case atype_string:
+ case atype_array:
+ case atype_sequence:
+ default:
+ WARN_ON_ONCE(1);
+ break;
+ }
+
+ btype = &type->u.sequence.elem_type;
+ switch (btype->atype) {
+ case atype_integer:
+ field_align = max_t(size_t,
+ field_align,
+ btype->u.basic.integer.alignment);
+ break;
+
+ case atype_string:
+ break;
+
+ case atype_array:
+ case atype_sequence:
+ default:
+ WARN_ON_ONCE(1);
+ break;
+ }
+ break;
+ }
+ case atype_string:
+ break;
+
+ case atype_enum:
+ default:
+ WARN_ON_ONCE(1);
+ break;
+ }
+ largest_align = max_t(size_t, largest_align, field_align);
+ }
+ ctx->largest_align = largest_align >> 3; /* bits to bytes */
+}
+
/*
* Remove last context field.
*/
if (caa_likely(!ctx))
return 0;
+ offset += lib_ring_buffer_align(offset, ctx->largest_align);
for (i = 0; i < ctx->nr_fields; i++)
offset += ctx->fields[i].get_size(offset);
return offset - orig_offset;
if (caa_likely(!ctx))
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);
}