projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: java agent: migrate to new channel structures
[lttng-ust.git]
/
liblttng-ust
/
lttng-bytecode.c
diff --git
a/liblttng-ust/lttng-bytecode.c
b/liblttng-ust/lttng-bytecode.c
index a16b35cc2fd752c1375660903aed2010a76ef497..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",
@@
-178,7
+179,7
@@
int apply_field_reloc(const struct lttng_ust_event_desc *event_desc,
const char *field_name,
enum bytecode_op bytecode_op)
{
const char *field_name,
enum bytecode_op bytecode_op)
{
-
const
struct lttng_ust_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;
@@
-201,20
+202,20
@@
int apply_field_reloc(const struct lttng_ust_event_desc *event_desc,
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:
@@
-237,19
+238,19
@@
int apply_field_reloc(const struct lttng_ust_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);
@@
-301,7
+302,7
@@
int apply_context_reloc(struct bytecode_runtime *runtime,
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:
@@
-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_ust_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)
@@
-528,8
+529,8
@@
void lttng_bytecode_capture_sync_state(struct lttng_ust_bytecode_runtime *runtim
* 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_ust_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 cds_list_head *instance_bytecode_head,
struct cds_list_head *enabler_bytecode_head)
{
This page took
0.041953 seconds
and
4
git commands to generate.