projects
/
lttng-modules.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refactoring: type description structures
[lttng-modules.git]
/
src
/
lttng-bytecode.c
diff --git
a/src/lttng-bytecode.c
b/src/lttng-bytecode.c
index 38c2d18380c3a5e4c510a6123c13b4c8b9262c43..6ed20f7ea054bb13e86d0816046fe860a13608b4 100644
(file)
--- a/
src/lttng-bytecode.c
+++ b/
src/lttng-bytecode.c
@@
-11,6
+11,7
@@
#include <linux/slab.h>
#include <lttng/lttng-bytecode.h>
#include <linux/slab.h>
#include <lttng/lttng-bytecode.h>
+#include <lttng/events-internal.h>
static const char *opnames[] = {
[ BYTECODE_OP_UNKNOWN ] = "UNKNOWN",
static const char *opnames[] = {
[ BYTECODE_OP_UNKNOWN ] = "UNKNOWN",
@@
-167,14
+168,14
@@
const char *lttng_bytecode_print_op(enum bytecode_op op)
}
static
}
static
-int apply_field_reloc(const struct lttng_event_desc *event_desc,
+int apply_field_reloc(const struct lttng_
kernel_
event_desc *event_desc,
struct bytecode_runtime *runtime,
uint32_t runtime_len,
uint32_t reloc_offset,
const char *field_name,
enum bytecode_op bytecode_op)
{
struct bytecode_runtime *runtime,
uint32_t runtime_len,
uint32_t reloc_offset,
const char *field_name,
enum bytecode_op bytecode_op)
{
- const struct lttng_
event_field
*fields, *field = NULL;
+ const struct lttng_
kernel_event_field *
*fields, *field = NULL;
unsigned int nr_fields, i;
struct load_op *op;
uint32_t field_offset = 0;
unsigned int nr_fields, i;
struct load_op *op;
uint32_t field_offset = 0;
@@
-189,35
+190,35
@@
int apply_field_reloc(const struct lttng_event_desc *event_desc,
return -EINVAL;
nr_fields = event_desc->nr_fields;
for (i = 0; i < nr_fields; i++) {
return -EINVAL;
nr_fields = event_desc->nr_fields;
for (i = 0; i < nr_fields; i++) {
- if (fields[i]
.
nofilter)
+ if (fields[i]
->
nofilter)
continue;
continue;
- if (!strcmp(fields[i]
.
name, field_name)) {
- field =
&
fields[i];
+ if (!strcmp(fields[i]
->
name, field_name)) {
+ field = fields[i];
break;
}
/* compute field offset */
break;
}
/* compute field offset */
- switch (fields[i]
.type.a
type) {
- case
a
type_integer:
- case
atype_enum_nestable
:
+ switch (fields[i]
->type->
type) {
+ case
lttng_kernel_
type_integer:
+ case
lttng_kernel_type_enum
:
field_offset += sizeof(int64_t);
break;
field_offset += sizeof(int64_t);
break;
- case
atype_array_nestable
:
- if (!lttng_
is_bytewise_integer(fields[i].type.u.array_nestable.
elem_type))
+ case
lttng_kernel_type_array
:
+ if (!lttng_
kernel_type_is_bytewise_integer(lttng_kernel_get_type_array(fields[i]->type)->
elem_type))
return -EINVAL;
field_offset += sizeof(unsigned long);
field_offset += sizeof(void *);
break;
return -EINVAL;
field_offset += sizeof(unsigned long);
field_offset += sizeof(void *);
break;
- case
atype_sequence_nestabl
e:
- if (!lttng_
is_bytewise_integer(fields[i].type.u.sequence_nestable.
elem_type))
+ case
lttng_kernel_type_sequenc
e:
+ if (!lttng_
kernel_type_is_bytewise_integer(lttng_kernel_get_type_sequence(fields[i]->type)->
elem_type))
return -EINVAL;
field_offset += sizeof(unsigned long);
field_offset += sizeof(void *);
break;
return -EINVAL;
field_offset += sizeof(unsigned long);
field_offset += sizeof(void *);
break;
- case
a
type_string:
+ case
lttng_kernel_
type_string:
field_offset += sizeof(void *);
break;
field_offset += sizeof(void *);
break;
- case
atype_struct_nestable:
/* Unsupported. */
- case
atype_variant_nestable:
/* Unsupported. */
+ case
lttng_kernel_type_struct:
/* Unsupported. */
+ case
lttng_kernel_type_variant:
/* Unsupported. */
default:
return -EINVAL;
}
default:
return -EINVAL;
}
@@
-238,16
+239,17
@@
int apply_field_reloc(const struct lttng_event_desc *event_desc,
struct field_ref *field_ref;
field_ref = (struct field_ref *) op->data;
struct field_ref *field_ref;
field_ref = (struct field_ref *) op->data;
- switch (field->type
.a
type) {
- case
a
type_integer:
- case
atype_enum_nestable
:
+ switch (field->type
->
type) {
+ case
lttng_kernel_
type_integer:
+ case
lttng_kernel_type_enum
:
op->op = BYTECODE_OP_LOAD_FIELD_REF_S64;
break;
op->op = BYTECODE_OP_LOAD_FIELD_REF_S64;
break;
- case
atype_array_nestable
:
+ case
lttng_kernel_type_array
:
{
{
- const struct lttng_type *elem_type = field->type.u.array_nestable.elem_type;
+ const struct lttng_kernel_type_array *array_type = lttng_kernel_get_type_array(field->type);
+ const struct lttng_kernel_type_common *elem_type = array_type->elem_type;
- if (!lttng_
is_bytewise_integer(elem_type) || elem_type->u.integer.encoding == lttng_encode
_none)
+ if (!lttng_
kernel_type_is_bytewise_integer(elem_type) || array_type->encoding == lttng_kernel_string_encoding
_none)
return -EINVAL;
if (field->user)
op->op = BYTECODE_OP_LOAD_FIELD_REF_USER_SEQUENCE;
return -EINVAL;
if (field->user)
op->op = BYTECODE_OP_LOAD_FIELD_REF_USER_SEQUENCE;
@@
-255,11
+257,12
@@
int apply_field_reloc(const struct lttng_event_desc *event_desc,
op->op = BYTECODE_OP_LOAD_FIELD_REF_SEQUENCE;
break;
}
op->op = BYTECODE_OP_LOAD_FIELD_REF_SEQUENCE;
break;
}
- case
atype_sequence_nestabl
e:
+ case
lttng_kernel_type_sequenc
e:
{
{
- const struct lttng_type *elem_type = field->type.u.sequence_nestable.elem_type;
+ const struct lttng_kernel_type_sequence *sequence_type = lttng_kernel_get_type_sequence(field->type);
+ const struct lttng_kernel_type_common *elem_type = sequence_type->elem_type;
- if (!lttng_
is_bytewise_integer(elem_type) || elem_type->u.integer.encoding == lttng_encode
_none)
+ if (!lttng_
kernel_type_is_bytewise_integer(elem_type) || sequence_type->encoding == lttng_kernel_string_encoding
_none)
return -EINVAL;
if (field->user)
op->op = BYTECODE_OP_LOAD_FIELD_REF_USER_SEQUENCE;
return -EINVAL;
if (field->user)
op->op = BYTECODE_OP_LOAD_FIELD_REF_USER_SEQUENCE;
@@
-267,14
+270,14
@@
int apply_field_reloc(const struct lttng_event_desc *event_desc,
op->op = BYTECODE_OP_LOAD_FIELD_REF_SEQUENCE;
break;
}
op->op = BYTECODE_OP_LOAD_FIELD_REF_SEQUENCE;
break;
}
- case
a
type_string:
+ case
lttng_kernel_
type_string:
if (field->user)
op->op = BYTECODE_OP_LOAD_FIELD_REF_USER_STRING;
else
op->op = BYTECODE_OP_LOAD_FIELD_REF_STRING;
break;
if (field->user)
op->op = BYTECODE_OP_LOAD_FIELD_REF_USER_STRING;
else
op->op = BYTECODE_OP_LOAD_FIELD_REF_STRING;
break;
- case
atype_struct_nestable:
/* Unsupported. */
- case
atype_variant_nestable:
/* Unsupported. */
+ case
lttng_kernel_type_struct:
/* Unsupported. */
+ case
lttng_kernel_type_variant:
/* Unsupported. */
default:
return -EINVAL;
}
default:
return -EINVAL;
}
@@
-296,13
+299,13
@@
int apply_context_reloc(struct bytecode_runtime *runtime,
enum bytecode_op bytecode_op)
{
struct load_op *op;
enum bytecode_op bytecode_op)
{
struct load_op *op;
- struct lttng_ctx_field *ctx_field;
+ struct lttng_
kernel_
ctx_field *ctx_field;
int idx;
dbg_printk("Apply context reloc: %u %s\n", reloc_offset, context_name);
/* Get context index */
int idx;
dbg_printk("Apply context reloc: %u %s\n", reloc_offset, context_name);
/* Get context index */
- idx = lttng_get_context_index(lttng_static_ctx, context_name);
+ idx = lttng_
kernel_
get_context_index(lttng_static_ctx, context_name);
if (idx < 0)
return -ENOENT;
if (idx < 0)
return -ENOENT;
@@
-320,38
+323,40
@@
int apply_context_reloc(struct bytecode_runtime *runtime,
struct field_ref *field_ref;
field_ref = (struct field_ref *) op->data;
struct field_ref *field_ref;
field_ref = (struct field_ref *) op->data;
- switch (ctx_field->event_field
.type.a
type) {
- case
a
type_integer:
- case
atype_enum_nestable
:
+ switch (ctx_field->event_field
->type->
type) {
+ case
lttng_kernel_
type_integer:
+ case
lttng_kernel_type_enum
:
op->op = BYTECODE_OP_GET_CONTEXT_REF_S64;
break;
/* Sequence and array supported as string */
op->op = BYTECODE_OP_GET_CONTEXT_REF_S64;
break;
/* Sequence and array supported as string */
- case
a
type_string:
- BUG_ON(ctx_field->event_field
.
user);
+ case
lttng_kernel_
type_string:
+ BUG_ON(ctx_field->event_field
->
user);
op->op = BYTECODE_OP_GET_CONTEXT_REF_STRING;
break;
op->op = BYTECODE_OP_GET_CONTEXT_REF_STRING;
break;
- case
atype_array_nestable
:
+ case
lttng_kernel_type_array
:
{
{
- const struct lttng_type *elem_type = ctx_field->event_field.type.u.array_nestable.elem_type;
+ const struct lttng_kernel_type_array *array_type = lttng_kernel_get_type_array(ctx_field->event_field->type);
+ const struct lttng_kernel_type_common *elem_type = array_type->elem_type;
- if (!lttng_
is_bytewise_integer(elem_type) || elem_type->u.integer.encoding == lttng_encode
_none)
+ if (!lttng_
kernel_type_is_bytewise_integer(elem_type) || array_type->encoding == lttng_kernel_string_encoding
_none)
return -EINVAL;
return -EINVAL;
- BUG_ON(ctx_field->event_field
.
user);
+ BUG_ON(ctx_field->event_field
->
user);
op->op = BYTECODE_OP_GET_CONTEXT_REF_STRING;
break;
}
op->op = BYTECODE_OP_GET_CONTEXT_REF_STRING;
break;
}
- case
atype_sequence_nestabl
e:
+ case
lttng_kernel_type_sequenc
e:
{
{
- const struct lttng_type *elem_type = ctx_field->event_field.type.u.sequence_nestable.elem_type;
+ const struct lttng_kernel_type_sequence *sequence_type = lttng_kernel_get_type_sequence(ctx_field->event_field->type);
+ const struct lttng_kernel_type_common *elem_type = sequence_type->elem_type;
- if (!lttng_
is_bytewise_integer(elem_type) || elem_type->u.integer.encoding == lttng_encode
_none)
+ if (!lttng_
kernel_type_is_bytewise_integer(elem_type) || sequence_type->encoding == lttng_kernel_string_encoding
_none)
return -EINVAL;
return -EINVAL;
- BUG_ON(ctx_field->event_field
.
user);
+ BUG_ON(ctx_field->event_field
->
user);
op->op = BYTECODE_OP_GET_CONTEXT_REF_STRING;
break;
}
op->op = BYTECODE_OP_GET_CONTEXT_REF_STRING;
break;
}
- case
atype_struct_nestable:
/* Unsupported. */
- case
atype_variant_nestable:
/* Unsupported. */
+ case
lttng_kernel_type_struct:
/* Unsupported. */
+ case
lttng_kernel_type_variant:
/* Unsupported. */
default:
return -EINVAL;
}
default:
return -EINVAL;
}
@@
-366,7
+371,7
@@
int apply_context_reloc(struct bytecode_runtime *runtime,
}
static
}
static
-int apply_reloc(const struct lttng_event_desc *event_desc,
+int apply_reloc(const struct lttng_
kernel_
event_desc *event_desc,
struct bytecode_runtime *runtime,
uint32_t runtime_len,
uint32_t reloc_offset,
struct bytecode_runtime *runtime,
uint32_t runtime_len,
uint32_t reloc_offset,
@@
-420,8
+425,8
@@
int bytecode_is_linked(struct lttng_bytecode_node *bytecode,
* bytecode runtime.
*/
static
* bytecode runtime.
*/
static
-int link_bytecode(const struct lttng_event_desc *event_desc,
- struct lttng_ctx *ctx,
+int link_bytecode(const struct lttng_
kernel_
event_desc *event_desc,
+ struct lttng_
kernel_
ctx *ctx,
struct lttng_bytecode_node *bytecode,
struct list_head *bytecode_runtime_head,
struct list_head *insert_loc)
struct lttng_bytecode_node *bytecode,
struct list_head *bytecode_runtime_head,
struct list_head *insert_loc)
@@
-542,8
+547,8
@@
void lttng_bytecode_capture_sync_state(struct lttng_bytecode_runtime *runtime)
* This function is called after we confirmed that name enabler and the
* instance are matching names (or glob pattern matching).
*/
* This function is called after we confirmed that name enabler and the
* instance are matching names (or glob pattern matching).
*/
-void lttng_enabler_link_bytecode(const struct lttng_event_desc *event_desc,
- struct lttng_ctx *ctx,
+void lttng_enabler_link_bytecode(const struct lttng_
kernel_
event_desc *event_desc,
+ struct lttng_
kernel_
ctx *ctx,
struct list_head *instance_bytecode_head,
struct list_head *enabler_bytecode_head)
{
struct list_head *instance_bytecode_head,
struct list_head *enabler_bytecode_head)
{
This page took
0.027359 seconds
and
4
git commands to generate.