projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refactoring: Privatize ring buffer config header
[lttng-ust.git]
/
liblttng-ust
/
lttng-bytecode.c
diff --git
a/liblttng-ust/lttng-bytecode.c
b/liblttng-ust/lttng-bytecode.c
index 81c83ceff614e4fab9958b12089a963c8b07679e..d75600baee9a92e83e68cdae30a981bfd8c416f0 100644
(file)
--- a/
liblttng-ust/lttng-bytecode.c
+++ b/
liblttng-ust/lttng-bytecode.c
@@
-15,6
+15,7
@@
#include "context-internal.h"
#include "lttng-bytecode.h"
#include "ust-events-internal.h"
#include "context-internal.h"
#include "lttng-bytecode.h"
#include "ust-events-internal.h"
+#include "ust-helper.h"
static const char *opnames[] = {
[ BYTECODE_OP_UNKNOWN ] = "UNKNOWN",
static const char *opnames[] = {
[ BYTECODE_OP_UNKNOWN ] = "UNKNOWN",
@@
-171,14
+172,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_
ust_
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;
+
struct lttng_ust_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;
@@
-193,28
+194,28
@@
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]
.u.ext.
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_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:
@@
-225,7
+226,7
@@
int apply_field_reloc(const struct lttng_event_desc *event_desc,
return -EINVAL;
/* Check if field offset is too large for 16-bit offset */
return -EINVAL;
/* Check if field offset is too large for 16-bit offset */
- if (field_offset > FILTER_BYTECODE_MAX_LEN - 1)
+ if (field_offset >
LTTNG_UST_ABI_
FILTER_BYTECODE_MAX_LEN - 1)
return -EINVAL;
/* set type */
return -EINVAL;
/* set type */
@@
-237,19
+238,19
@@
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_ust_
type_integer:
+ case
lttng_ust_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
atype_sequence_nestabl
e:
+ case
lttng_ust_type_array
:
+ case
lttng_ust_type_sequenc
e:
op->op = BYTECODE_OP_LOAD_FIELD_REF_SEQUENCE;
break;
op->op = BYTECODE_OP_LOAD_FIELD_REF_SEQUENCE;
break;
- case
a
type_string:
+ case
lttng_ust_
type_string:
op->op = BYTECODE_OP_LOAD_FIELD_REF_STRING;
break;
op->op = BYTECODE_OP_LOAD_FIELD_REF_STRING;
break;
- case
a
type_float:
+ case
lttng_ust_
type_float:
op->op = BYTECODE_OP_LOAD_FIELD_REF_DOUBLE;
break;
default:
op->op = BYTECODE_OP_LOAD_FIELD_REF_DOUBLE;
break;
default:
@@
-273,9
+274,9
@@
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_
ust_
ctx_field *ctx_field;
int idx;
int idx;
- struct lttng_ctx **pctx = runtime->p.priv->pctx;
+ struct lttng_
ust_
ctx **pctx = runtime->p.priv->pctx;
dbg_printf("Apply context reloc: %u %s\n", reloc_offset, context_name);
dbg_printf("Apply context reloc: %u %s\n", reloc_offset, context_name);
@@
-297,11
+298,11
@@
int apply_context_reloc(struct bytecode_runtime *runtime,
}
}
/* Check if idx is too large for 16-bit offset */
}
}
/* Check if idx is too large for 16-bit offset */
- if (idx > FILTER_BYTECODE_MAX_LEN - 1)
+ if (idx >
LTTNG_UST_ABI_
FILTER_BYTECODE_MAX_LEN - 1)
return -EINVAL;
/* Get context return type */
return -EINVAL;
/* Get context return type */
- ctx_field =
&
(*pctx)->fields[idx];
+ ctx_field = (*pctx)->fields[idx];
op = (struct load_op *) &runtime->code[reloc_offset];
switch (bytecode_op) {
op = (struct load_op *) &runtime->code[reloc_offset];
switch (bytecode_op) {
@@
-310,21
+311,21
@@
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_ust_
type_integer:
+ case
lttng_ust_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:
- case
atype_array_nestable
:
- case
atype_sequence_nestabl
e:
+ case
lttng_ust_
type_string:
+ case
lttng_ust_type_array
:
+ case
lttng_ust_type_sequenc
e:
op->op = BYTECODE_OP_GET_CONTEXT_REF_STRING;
break;
op->op = BYTECODE_OP_GET_CONTEXT_REF_STRING;
break;
- case
a
type_float:
+ case
lttng_ust_
type_float:
op->op = BYTECODE_OP_GET_CONTEXT_REF_DOUBLE;
break;
op->op = BYTECODE_OP_GET_CONTEXT_REF_DOUBLE;
break;
- case
a
type_dynamic:
+ case
lttng_ust_
type_dynamic:
op->op = BYTECODE_OP_GET_CONTEXT_REF;
break;
default:
op->op = BYTECODE_OP_GET_CONTEXT_REF;
break;
default:
@@
-341,7
+342,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_
ust_
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,
@@
-381,7
+382,7
@@
static
int bytecode_is_linked(struct lttng_ust_bytecode_node *bytecode,
struct cds_list_head *bytecode_runtime_head)
{
int bytecode_is_linked(struct lttng_ust_bytecode_node *bytecode,
struct cds_list_head *bytecode_runtime_head)
{
- struct lttng_bytecode_runtime *bc_runtime;
+ struct lttng_
ust_
bytecode_runtime *bc_runtime;
cds_list_for_each_entry(bc_runtime, bytecode_runtime_head, node) {
if (bc_runtime->priv->bc == bytecode)
cds_list_for_each_entry(bc_runtime, bytecode_runtime_head, node) {
if (bc_runtime->priv->bc == bytecode)
@@
-395,8
+396,8
@@
int bytecode_is_linked(struct lttng_ust_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(
struct lttng_ust
_event_desc *event_desc,
+ struct lttng_
ust_
ctx **ctx,
struct lttng_ust_bytecode_node *bytecode,
struct cds_list_head *bytecode_runtime_head,
struct cds_list_head *insert_loc)
struct lttng_ust_bytecode_node *bytecode,
struct cds_list_head *bytecode_runtime_head,
struct cds_list_head *insert_loc)
@@
-429,6
+430,7
@@
int link_bytecode(const struct lttng_event_desc *event_desc,
goto alloc_error;
}
runtime->p.priv = runtime_priv;
goto alloc_error;
}
runtime->p.priv = runtime_priv;
+ runtime->p.struct_size = sizeof(struct lttng_ust_bytecode_runtime);
runtime_priv->pub = runtime;
runtime_priv->bc = bytecode;
runtime_priv->pctx = ctx;
runtime_priv->pub = runtime;
runtime_priv->bc = bytecode;
runtime_priv->pctx = ctx;
@@
-499,7
+501,7
@@
alloc_error:
return ret;
}
return ret;
}
-void lttng_bytecode_filter_sync_state(struct lttng_bytecode_runtime *runtime)
+void lttng_bytecode_filter_sync_state(struct lttng_
ust_
bytecode_runtime *runtime)
{
struct lttng_ust_bytecode_node *bc = runtime->priv->bc;
{
struct lttng_ust_bytecode_node *bc = runtime->priv->bc;
@@
-509,7
+511,7
@@
void lttng_bytecode_filter_sync_state(struct lttng_bytecode_runtime *runtime)
runtime->interpreter_funcs.filter = lttng_bytecode_filter_interpret;
}
runtime->interpreter_funcs.filter = lttng_bytecode_filter_interpret;
}
-void lttng_bytecode_capture_sync_state(struct lttng_bytecode_runtime *runtime)
+void lttng_bytecode_capture_sync_state(struct lttng_
ust_
bytecode_runtime *runtime)
{
struct lttng_ust_bytecode_node *bc = runtime->priv->bc;
{
struct lttng_ust_bytecode_node *bc = runtime->priv->bc;
@@
-527,13
+529,13
@@
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 name matching (or glob pattern matching).
*/
* This function is called after we confirmed that name enabler and the
* instance are name matching (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(
struct lttng_ust
_event_desc *event_desc,
+ struct lttng_
ust_
ctx **ctx,
struct cds_list_head *instance_bytecode_head,
struct cds_list_head *enabler_bytecode_head)
{
struct lttng_ust_bytecode_node *enabler_bc;
struct cds_list_head *instance_bytecode_head,
struct cds_list_head *enabler_bytecode_head)
{
struct lttng_ust_bytecode_node *enabler_bc;
- struct lttng_bytecode_runtime *runtime;
+ struct lttng_
ust_
bytecode_runtime *runtime;
assert(event_desc);
assert(event_desc);
@@
-608,13
+610,7
@@
void free_filter_runtime(struct cds_list_head *bytecode_runtime_head)
}
}
}
}
-void lttng_free_event_filter_runtime(struct lttng_
event
*event)
+void lttng_free_event_filter_runtime(struct lttng_
ust_event_common
*event)
{
free_filter_runtime(&event->filter_bytecode_runtime_head);
}
{
free_filter_runtime(&event->filter_bytecode_runtime_head);
}
-
-void lttng_free_event_notifier_filter_runtime(
- struct lttng_event_notifier *event_notifier)
-{
- free_filter_runtime(&event_notifier->filter_bytecode_runtime_head);
-}
This page took
0.027523 seconds
and
4
git commands to generate.