projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove app context backward compatibility dead code
[lttng-ust.git]
/
liblttng-ust
/
lttng-bytecode-specialize.c
diff --git
a/liblttng-ust/lttng-bytecode-specialize.c
b/liblttng-ust/lttng-bytecode-specialize.c
index c546c8d6dc411688943e8804128721ef69325fc1..31bc3d05f6d043072854415cdeebe3736353664b 100644
(file)
--- a/
liblttng-ust/lttng-bytecode-specialize.c
+++ b/
liblttng-ust/lttng-bytecode-specialize.c
@@
-7,10
+7,11
@@
*/
#define _LGPL_SOURCE
*/
#define _LGPL_SOURCE
+#include <limits.h>
#include <stddef.h>
#include <stdint.h>
#include <stddef.h>
#include <stdint.h>
-#include <lttng/
align
.h>
+#include <lttng/
ust-utils
.h>
#include "context-internal.h"
#include "lttng-bytecode.h"
#include "context-internal.h"
#include "lttng-bytecode.h"
@@
-253,20
+254,20
@@
static int specialize_get_index(struct bytecode_runtime *runtime,
switch (stack_top->load.object_type) {
case OBJECT_TYPE_ARRAY:
{
switch (stack_top->load.object_type) {
case OBJECT_TYPE_ARRAY:
{
- const struct lttng_
integer_type
*integer_type;
+ const struct lttng_
ust_type_integer
*integer_type;
const struct lttng_ust_event_field *field;
uint32_t elem_len, num_elems;
int signedness;
field = stack_top->load.field;
const struct lttng_ust_event_field *field;
uint32_t elem_len, num_elems;
int signedness;
field = stack_top->load.field;
- switch (field->type
.a
type) {
- case
atype_array_nestable
:
- if (
field->type.u.array_nestable.elem_type->atype != a
type_integer) {
+ switch (field->type
->
type) {
+ case
lttng_ust_type_array
:
+ if (
lttng_ust_get_type_array(field->type)->elem_type->type != lttng_ust_
type_integer) {
ret = -EINVAL;
goto end;
}
ret = -EINVAL;
goto end;
}
- integer_type =
&field->type.u.array_nestable.elem_type->u.integer
;
- num_elems =
field->type.u.array_nestable.
length;
+ integer_type =
lttng_ust_get_type_integer(lttng_ust_get_type_array(field->type)->elem_type)
;
+ num_elems =
lttng_ust_get_type_array(field->type)->
length;
break;
default:
ret = -EINVAL;
break;
default:
ret = -EINVAL;
@@
-293,19
+294,19
@@
static int specialize_get_index(struct bytecode_runtime *runtime,
}
case OBJECT_TYPE_SEQUENCE:
{
}
case OBJECT_TYPE_SEQUENCE:
{
- const struct lttng_
integer_type
*integer_type;
+ const struct lttng_
ust_type_integer
*integer_type;
const struct lttng_ust_event_field *field;
uint32_t elem_len;
int signedness;
field = stack_top->load.field;
const struct lttng_ust_event_field *field;
uint32_t elem_len;
int signedness;
field = stack_top->load.field;
- switch (field->type
.a
type) {
- case
atype_sequence_nestabl
e:
- if (
field->type.u.sequence_nestable.elem_type->atype != a
type_integer) {
+ switch (field->type
->
type) {
+ case
lttng_ust_type_sequenc
e:
+ if (
lttng_ust_get_type_sequence(field->type)->elem_type->type != lttng_ust_
type_integer) {
ret = -EINVAL;
goto end;
}
ret = -EINVAL;
goto end;
}
- integer_type =
&field->type.u.sequence_nestable.elem_type->u.integer
;
+ integer_type =
lttng_ust_get_type_integer(lttng_ust_get_type_sequence(field->type)->elem_type)
;
break;
default:
ret = -EINVAL;
break;
default:
ret = -EINVAL;
@@
-374,7
+375,7
@@
static int specialize_context_lookup_name(struct lttng_ust_ctx *ctx,
const char *name;
offset = ((struct get_symbol *) insn->data)->offset;
const char *name;
offset = ((struct get_symbol *) insn->data)->offset;
- name = bytecode->p.
priv->bc->bc.data + bytecode->p.priv->
bc->bc.reloc_offset + offset;
+ name = bytecode->p.
bc->bc.data + bytecode->p.
bc->bc.reloc_offset + offset;
return lttng_get_context_index(ctx, name);
}
return lttng_get_context_index(ctx, name);
}
@@
-383,19
+384,19
@@
static int specialize_load_object(const struct lttng_ust_event_field *field,
{
load->type = LOAD_OBJECT;
{
load->type = LOAD_OBJECT;
- switch (field->type
.a
type) {
- case
a
type_integer:
- if (
field->type.u.integer.
signedness)
+ switch (field->type
->
type) {
+ case
lttng_ust_
type_integer:
+ if (
lttng_ust_get_type_integer(field->type)->
signedness)
load->object_type = OBJECT_TYPE_S64;
else
load->object_type = OBJECT_TYPE_U64;
load->rev_bo = false;
break;
load->object_type = OBJECT_TYPE_S64;
else
load->object_type = OBJECT_TYPE_U64;
load->rev_bo = false;
break;
- case
atype_enum_nestable
:
+ case
lttng_ust_type_enum
:
{
{
- const struct lttng_
integer_type
*itype;
+ const struct lttng_
ust_type_integer
*itype;
- itype =
&field->type.u.enum_nestable.container_type->u.integer
;
+ itype =
lttng_ust_get_type_integer(lttng_ust_get_type_enum(field->type)->container_type)
;
if (itype->signedness)
load->object_type = OBJECT_TYPE_SIGNED_ENUM;
else
if (itype->signedness)
load->object_type = OBJECT_TYPE_SIGNED_ENUM;
else
@@
-403,15
+404,15
@@
static int specialize_load_object(const struct lttng_ust_event_field *field,
load->rev_bo = false;
break;
}
load->rev_bo = false;
break;
}
- case
atype_array_nestable
:
- if (
field->type.u.array_nestable.elem_type->atype != a
type_integer) {
+ case
lttng_ust_type_array
:
+ if (
lttng_ust_get_type_array(field->type)->elem_type->type != lttng_ust_
type_integer) {
ERR("Array nesting only supports integer types.");
return -EINVAL;
}
if (is_context) {
load->object_type = OBJECT_TYPE_STRING;
} else {
ERR("Array nesting only supports integer types.");
return -EINVAL;
}
if (is_context) {
load->object_type = OBJECT_TYPE_STRING;
} else {
- if (
field->type.u.array_nestable.elem_type->u.integer.encoding == lttng_encode
_none) {
+ if (
lttng_ust_get_type_array(field->type)->encoding == lttng_ust_string_encoding
_none) {
load->object_type = OBJECT_TYPE_ARRAY;
load->field = field;
} else {
load->object_type = OBJECT_TYPE_ARRAY;
load->field = field;
} else {
@@
-419,15
+420,15
@@
static int specialize_load_object(const struct lttng_ust_event_field *field,
}
}
break;
}
}
break;
- case
atype_sequence_nestabl
e:
- if (
field->type.u.sequence_nestable.elem_type->atype != a
type_integer) {
+ case
lttng_ust_type_sequenc
e:
+ if (
lttng_ust_get_type_sequence(field->type)->elem_type->type != lttng_ust_
type_integer) {
ERR("Sequence nesting only supports integer types.");
return -EINVAL;
}
if (is_context) {
load->object_type = OBJECT_TYPE_STRING;
} else {
ERR("Sequence nesting only supports integer types.");
return -EINVAL;
}
if (is_context) {
load->object_type = OBJECT_TYPE_STRING;
} else {
- if (
field->type.u.sequence_nestable.elem_type->u.integer.encoding == lttng_encode
_none) {
+ if (
lttng_ust_get_type_sequence(field->type)->encoding == lttng_ust_string_encoding
_none) {
load->object_type = OBJECT_TYPE_SEQUENCE;
load->field = field;
} else {
load->object_type = OBJECT_TYPE_SEQUENCE;
load->field = field;
} else {
@@
-436,17
+437,17
@@
static int specialize_load_object(const struct lttng_ust_event_field *field,
}
break;
}
break;
- case
a
type_string:
+ case
lttng_ust_
type_string:
load->object_type = OBJECT_TYPE_STRING;
break;
load->object_type = OBJECT_TYPE_STRING;
break;
- case
a
type_float:
+ case
lttng_ust_
type_float:
load->object_type = OBJECT_TYPE_DOUBLE;
break;
load->object_type = OBJECT_TYPE_DOUBLE;
break;
- case
a
type_dynamic:
+ case
lttng_ust_
type_dynamic:
load->object_type = OBJECT_TYPE_DYNAMIC;
break;
default:
load->object_type = OBJECT_TYPE_DYNAMIC;
break;
default:
- ERR("Unknown type: %d", (int) field->type
.a
type);
+ ERR("Unknown type: %d", (int) field->type
->
type);
return -EINVAL;
}
return 0;
return -EINVAL;
}
return 0;
@@
-458,8
+459,8
@@
static int specialize_context_lookup(struct lttng_ust_ctx *ctx,
struct vstack_load *load)
{
int idx, ret;
struct vstack_load *load)
{
int idx, ret;
- struct lttng_ust_ctx_field *ctx_field;
- struct lttng_ust_event_field *field;
+
const
struct lttng_ust_ctx_field *ctx_field;
+
const
struct lttng_ust_event_field *field;
struct bytecode_get_index_data gid;
ssize_t data_offset;
struct bytecode_get_index_data gid;
ssize_t data_offset;
@@
-467,7
+468,7
@@
static int specialize_context_lookup(struct lttng_ust_ctx *ctx,
if (idx < 0) {
return -ENOENT;
}
if (idx < 0) {
return -ENOENT;
}
- ctx_field = ctx->fields[idx];
+ ctx_field =
&
ctx->fields[idx];
field = ctx_field->event_field;
ret = specialize_load_object(field, load, true);
if (ret)
field = ctx_field->event_field;
ret = specialize_load_object(field, load, true);
if (ret)
@@
-497,13
+498,13
@@
static int specialize_app_context_lookup(struct lttng_ust_ctx **pctx,
const char *orig_name;
char *name = NULL;
int idx, ret;
const char *orig_name;
char *name = NULL;
int idx, ret;
- struct lttng_ust_ctx_field *ctx_field;
- struct lttng_ust_event_field *field;
+
const
struct lttng_ust_ctx_field *ctx_field;
+
const
struct lttng_ust_event_field *field;
struct bytecode_get_index_data gid;
ssize_t data_offset;
offset = ((struct get_symbol *) insn->data)->offset;
struct bytecode_get_index_data gid;
ssize_t data_offset;
offset = ((struct get_symbol *) insn->data)->offset;
- orig_name = runtime->p.
priv->bc->bc.data + runtime->p.priv->
bc->bc.reloc_offset + offset;
+ orig_name = runtime->p.
bc->bc.data + runtime->p.
bc->bc.reloc_offset + offset;
name = zmalloc(strlen(orig_name) + strlen("$app.") + 1);
if (!name) {
ret = -ENOMEM;
name = zmalloc(strlen(orig_name) + strlen("$app.") + 1);
if (!name) {
ret = -ENOMEM;
@@
-522,7
+523,7
@@
static int specialize_app_context_lookup(struct lttng_ust_ctx **pctx,
if (idx < 0)
return -ENOENT;
}
if (idx < 0)
return -ENOENT;
}
- ctx_field = (*pctx)->fields[idx];
+ ctx_field =
&
(*pctx)->fields[idx];
field = ctx_field->event_field;
ret = specialize_load_object(field, load, true);
if (ret)
field = ctx_field->event_field;
ret = specialize_load_object(field, load, true);
if (ret)
@@
-564,7
+565,7
@@
static int specialize_payload_lookup(const struct lttng_ust_event_desc *event_de
nr_fields = event_desc->nr_fields;
offset = ((struct get_symbol *) insn->data)->offset;
nr_fields = event_desc->nr_fields;
offset = ((struct get_symbol *) insn->data)->offset;
- name = runtime->p.
priv->bc->bc.data + runtime->p.priv->
bc->bc.reloc_offset + offset;
+ name = runtime->p.
bc->bc.data + runtime->p.
bc->bc.reloc_offset + offset;
for (i = 0; i < nr_fields; i++) {
field = event_desc->fields[i];
if (field->nofilter) {
for (i = 0; i < nr_fields; i++) {
field = event_desc->fields[i];
if (field->nofilter) {
@@
-575,20
+576,20
@@
static int specialize_payload_lookup(const struct lttng_ust_event_desc *event_de
break;
}
/* compute field offset on stack */
break;
}
/* compute field offset on stack */
- switch (field->type
.a
type) {
- case
a
type_integer:
- case
atype_enum_nestable
:
+ switch (field->type
->
type) {
+ case
lttng_ust_
type_integer:
+ case
lttng_ust_type_enum
:
field_offset += sizeof(int64_t);
break;
field_offset += sizeof(int64_t);
break;
- case
atype_array_nestable
:
- case
atype_sequence_nestabl
e:
+ case
lttng_ust_type_array
:
+ case
lttng_ust_type_sequenc
e:
field_offset += sizeof(unsigned long);
field_offset += sizeof(void *);
break;
field_offset += sizeof(unsigned long);
field_offset += sizeof(void *);
break;
- case
a
type_string:
+ case
lttng_ust_
type_string:
field_offset += sizeof(void *);
break;
field_offset += sizeof(void *);
break;
- case
a
type_float:
+ case
lttng_ust_
type_float:
field_offset += sizeof(double);
break;
default:
field_offset += sizeof(double);
break;
default:
@@
-631,7
+632,7
@@
int lttng_bytecode_specialize(const struct lttng_ust_event_desc *event_desc,
int ret = -EINVAL;
struct vstack _stack;
struct vstack *stack = &_stack;
int ret = -EINVAL;
struct vstack _stack;
struct vstack *stack = &_stack;
- struct lttng_ust_ctx **pctx = bytecode->p.p
riv->p
ctx;
+ struct lttng_ust_ctx **pctx = bytecode->p.pctx;
vstack_init(stack);
vstack_init(stack);
This page took
0.029564 seconds
and
4
git commands to generate.