#include <assert.h>
#include <glib.h>
#include <inttypes.h>
-#include <endian.h>
#include <errno.h>
#include <babeltrace/babeltrace-internal.h>
#include <babeltrace/list.h>
#include <babeltrace/types.h>
#include <babeltrace/ctf/metadata.h>
-#include <uuid/uuid.h>
+#include <babeltrace/uuid.h>
+#include <babeltrace/endian.h>
+#include <babeltrace/ctf/events-internal.h>
#include "ctf-scanner.h"
#include "ctf-parser.h"
#include "ctf-ast.h"
#define _bt_list_first_entry(ptr, type, member) \
bt_list_entry((ptr)->next, type, member)
+struct last_enum_value {
+ union {
+ int64_t s;
+ uint64_t u;
+ } u;
+};
+
int opt_clock_force_correlate;
static
int ctf_stream_visit(FILE *fd, int depth, struct ctf_node *node,
struct declaration_scope *parent_declaration_scope, struct ctf_trace *trace);
+static
+int is_unary_string(struct bt_list_head *head)
+{
+ struct ctf_node *node;
+
+ bt_list_for_each_entry(node, head, siblings) {
+ if (node->type != NODE_UNARY_EXPRESSION)
+ return 0;
+ if (node->u.unary_expression.type != UNARY_STRING)
+ return 0;
+ }
+ return 1;
+}
+
/*
* String returned must be freed by the caller using g_free.
*/
return g_quark_from_string(name);
}
+static
+int is_unary_unsigned(struct bt_list_head *head)
+{
+ struct ctf_node *node;
+
+ bt_list_for_each_entry(node, head, siblings) {
+ if (node->type != NODE_UNARY_EXPRESSION)
+ return 0;
+ if (node->u.unary_expression.type != UNARY_UNSIGNED_CONSTANT)
+ return 0;
+ }
+ return 1;
+}
+
static
int get_unary_unsigned(struct bt_list_head *head, uint64_t *value)
{
return 0;
}
+static
+int is_unary_signed(struct bt_list_head *head)
+{
+ struct ctf_node *node;
+
+ bt_list_for_each_entry(node, head, siblings) {
+ if (node->type != NODE_UNARY_EXPRESSION)
+ return 0;
+ if (node->u.unary_expression.type != UNARY_SIGNED_CONSTANT)
+ return 0;
+ }
+ return 1;
+}
+
static
int get_unary_signed(struct bt_list_head *head, int64_t *value)
{
}
static
-int get_unary_uuid(struct bt_list_head *head, uuid_t *uuid)
+int get_unary_uuid(struct bt_list_head *head, unsigned char *uuid)
{
struct ctf_node *node;
int i = 0;
assert(node->u.unary_expression.link == UNARY_LINK_UNKNOWN);
assert(i == 0);
src_string = node->u.unary_expression.u.string;
- ret = uuid_parse(src_string, *uuid);
+ ret = babeltrace_uuid_parse(src_string, uuid);
}
return ret;
}
static
-struct ctf_stream_class *trace_stream_lookup(struct ctf_trace *trace, uint64_t stream_id)
+struct ctf_stream_declaration *trace_stream_lookup(struct ctf_trace *trace, uint64_t stream_id)
{
if (trace->streams->len <= stream_id)
return NULL;
static
int ctf_enumerator_list_visit(FILE *fd, int depth,
struct ctf_node *enumerator,
- struct declaration_enum *enum_declaration)
+ struct declaration_enum *enum_declaration,
+ struct last_enum_value *last)
{
GQuark q;
struct ctf_node *iter;
}
nr_vals++;
}
- if (nr_vals == 1)
+ if (nr_vals == 0)
+ start = last->u.s;
+ if (nr_vals <= 1)
end = start;
+ last->u.s = end + 1;
enum_signed_insert(enum_declaration, start, end, q);
} else {
uint64_t start, end;
}
nr_vals++;
}
- if (nr_vals == 1)
+ if (nr_vals == 0)
+ start = last->u.u;
+ if (nr_vals <= 1)
end = start;
+ last->u.u = end + 1;
enum_unsigned_insert(enum_declaration, start, end, q);
}
return 0;
struct declaration *declaration;
struct declaration_enum *enum_declaration;
struct declaration_integer *integer_declaration;
+ struct last_enum_value last_value;
struct ctf_node *iter;
GQuark dummy_id;
int ret;
integer_declaration = container_of(declaration, struct declaration_integer, p);
enum_declaration = enum_declaration_new(integer_declaration);
declaration_unref(&integer_declaration->p); /* leave ref to enum */
+ if (enum_declaration->integer_declaration->signedness) {
+ last_value.u.s = 0;
+ } else {
+ last_value.u.u = 0;
+ }
bt_list_for_each_entry(iter, enumerator_list, siblings) {
- ret = ctf_enumerator_list_visit(fd, depth + 1, iter, enum_declaration);
+ ret = ctf_enumerator_list_visit(fd, depth + 1, iter, enum_declaration,
+ &last_value);
if (ret)
goto error;
}
}
static
-int ctf_event_declaration_visit(FILE *fd, int depth, struct ctf_node *node, struct ctf_event *event, struct ctf_trace *trace)
+int ctf_event_declaration_visit(FILE *fd, int depth, struct ctf_node *node, struct ctf_event_declaration *event, struct ctf_trace *trace)
{
int ret = 0;
{
int ret = 0;
struct ctf_node *iter;
- struct ctf_event *event;
+ struct ctf_event_declaration *event;
+ struct bt_ctf_event_decl *event_decl;
- event = g_new0(struct ctf_event, 1);
+ event_decl = g_new0(struct bt_ctf_event_decl, 1);
+ event = &event_decl->parent;
event->declaration_scope = new_declaration_scope(parent_declaration_scope);
event->loglevel = -1;
bt_list_for_each_entry(iter, &node->u.event.declaration_list, siblings) {
g_hash_table_insert(event->stream->event_quark_to_id,
(gpointer) (unsigned long) event->name,
&event->id);
+ g_ptr_array_add(trace->event_declarations, event_decl);
return 0;
error:
if (event->context_decl)
declaration_unref(&event->context_decl->p);
free_declaration_scope(event->declaration_scope);
- g_free(event);
+ g_free(event_decl);
return ret;
}
static
-int ctf_stream_declaration_visit(FILE *fd, int depth, struct ctf_node *node, struct ctf_stream_class *stream, struct ctf_trace *trace)
+int ctf_stream_declaration_visit(FILE *fd, int depth, struct ctf_node *node, struct ctf_stream_declaration *stream, struct ctf_trace *trace)
{
int ret = 0;
{
int ret = 0;
struct ctf_node *iter;
- struct ctf_stream_class *stream;
+ struct ctf_stream_declaration *stream;
- stream = g_new0(struct ctf_stream_class, 1);
+ stream = g_new0(struct ctf_stream_declaration, 1);
stream->declaration_scope = new_declaration_scope(parent_declaration_scope);
stream->events_by_id = g_ptr_array_new();
stream->event_quark_to_id = g_hash_table_new(g_direct_hash, g_direct_equal);
}
CTF_TRACE_SET_FIELD(trace, minor);
} else if (!strcmp(left, "uuid")) {
- uuid_t uuid;
+ unsigned char uuid[BABELTRACE_UUID_LEN];
- ret = get_unary_uuid(&node->u.ctf_expression.right, &uuid);
+ ret = get_unary_uuid(&node->u.ctf_expression.right, uuid);
if (ret) {
fprintf(fd, "[error] %s: unexpected unary expression for trace uuid\n", __func__);
ret = -EINVAL;
goto error;
}
if (CTF_TRACE_FIELD_IS_SET(trace, uuid)
- && uuid_compare(uuid, trace->uuid)) {
+ && babeltrace_uuid_compare(uuid, trace->uuid)) {
fprintf(fd, "[error] %s: uuid mismatch\n", __func__);
ret = -EPERM;
goto error;
return -EEXIST;
trace->declaration_scope = new_declaration_scope(trace->root_declaration_scope);
trace->streams = g_ptr_array_new();
+ trace->event_declarations = g_ptr_array_new();
bt_list_for_each_entry(iter, &node->u.trace.declaration_list, siblings) {
ret = ctf_trace_declaration_visit(fd, depth + 1, iter, trace);
if (ret)
fprintf(fd, "[error] %s: missing minor field in trace declaration\n", __func__);
goto error;
}
- if (!CTF_TRACE_FIELD_IS_SET(trace, uuid)) {
- ret = -EPERM;
- fprintf(fd, "[error] %s: missing uuid field in trace declaration\n", __func__);
- goto error;
- }
if (!CTF_TRACE_FIELD_IS_SET(trace, byte_order)) {
ret = -EPERM;
fprintf(fd, "[error] %s: missing byte_order field in trace declaration\n", __func__);
trace->packet_header_decl = NULL;
}
g_ptr_array_free(trace->streams, TRUE);
+ g_ptr_array_free(trace->event_declarations, TRUE);
free_declaration_scope(trace->declaration_scope);
trace->declaration_scope = NULL;
return ret;
}
if (!CTF_CLOCK_FIELD_IS_SET(clock, name)) {
ret = -EPERM;
- fprintf(fd, "[error] %s: missing namefield in clock declaration\n", __func__);
+ fprintf(fd, "[error] %s: missing name field in clock declaration\n", __func__);
goto error;
}
if (g_hash_table_size(trace->clocks) > 0) {
}
strncpy(env->procname, right, TRACER_ENV_LEN);
env->procname[TRACER_ENV_LEN - 1] = '\0';
- printf_verbose("env.procname = %s\n", env->procname);
+ printf_verbose("env.procname = \"%s\"\n", env->procname);
} else if (!strcmp(left, "domain")) {
char *right;
}
strncpy(env->domain, right, TRACER_ENV_LEN);
env->domain[TRACER_ENV_LEN - 1] = '\0';
- printf_verbose("env.domain = %s\n", env->domain);
+ printf_verbose("env.domain = \"%s\"\n", env->domain);
} else if (!strcmp(left, "sysname")) {
char *right;
}
strncpy(env->sysname, right, TRACER_ENV_LEN);
env->sysname[TRACER_ENV_LEN - 1] = '\0';
- printf_verbose("env.sysname = %s\n", env->sysname);
- } else if (!strcmp(left, "release")) {
+ printf_verbose("env.sysname = \"%s\"\n", env->sysname);
+ } else if (!strcmp(left, "kernel_release")) {
char *right;
if (env->release[0]) {
}
strncpy(env->release, right, TRACER_ENV_LEN);
env->release[TRACER_ENV_LEN - 1] = '\0';
- printf_verbose("env.release = %s\n", env->release);
- } else if (!strcmp(left, "version")) {
+ printf_verbose("env.release = \"%s\"\n", env->release);
+ } else if (!strcmp(left, "kernel_version")) {
char *right;
if (env->version[0]) {
}
strncpy(env->version, right, TRACER_ENV_LEN);
env->version[TRACER_ENV_LEN - 1] = '\0';
- printf_verbose("env.version = %s\n", env->version);
+ printf_verbose("env.version = \"%s\"\n", env->version);
} else {
- printf_verbose("%s: attribute \"%s\" is unknown in environment declaration.\n", __func__, left);
+ if (is_unary_string(&node->u.ctf_expression.right)) {
+ char *right;
+
+ right = concatenate_unary_strings(&node->u.ctf_expression.right);
+ printf_verbose("env.%s = \"%s\"\n", left, right);
+ } else if (is_unary_unsigned(&node->u.ctf_expression.right)) {
+ uint64_t v;
+ int ret;
+
+ ret = get_unary_unsigned(&node->u.ctf_expression.right, &v);
+ assert(ret == 0);
+ printf_verbose("env.%s = %" PRIu64 "\n", left, v);
+ } else if (is_unary_signed(&node->u.ctf_expression.right)) {
+ int64_t v;
+ int ret;
+
+ ret = get_unary_signed(&node->u.ctf_expression.right, &v);
+ assert(ret == 0);
+ printf_verbose("env.%s = %" PRId64 "\n", left, v);
+ } else {
+ printf_verbose("%s: attribute \"%s\" has unknown type.\n", __func__, left);
+ }
}
error:
projects / babeltrace.git / blobdiff