Implement clock mapping within integer type

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/formats/ctf/metadata/ctf-visitor-generate-io-struct.c b/formats/ctf/metadata/ctf-visitor-generate-io-struct.c
index cb3dc008c76c126deffe53e85cbd5b6a829ba521..a8aebf919fc3e2d77b43b02d985bd3f0cab67104 100644 (file)
--- a/formats/ctf/metadata/ctf-visitor-generate-io-struct.c
+++ b/formats/ctf/metadata/ctf-visitor-generate-io-struct.c
@@ -87,6 +87,50 @@ char *concatenate_unary_strings(struct cds_list_head *head)
        return g_string_free(str, FALSE);
 }
 
        return g_string_free(str, FALSE);
 }
 

+static
+GQuark get_map_clock_name_value(struct cds_list_head *head)
+{
+       struct ctf_node *node;
+       const char *name = NULL;
+       int i = 0;
+
+       cds_list_for_each_entry(node, head, siblings) {
+               char *src_string;
+
+               assert(node->type == NODE_UNARY_EXPRESSION);
+               assert(node->u.unary_expression.type == UNARY_STRING);
+               assert((node->u.unary_expression.link == UNARY_LINK_UNKNOWN)
+                       ^ (i != 0));
+               /* needs to be chained with . */
+               switch (node->u.unary_expression.link) {
+               case UNARY_DOTLINK:
+                       break;
+               case UNARY_ARROWLINK:
+               case UNARY_DOTDOTDOT:
+                       return 0;
+               default:
+                       break;
+               }
+               src_string = node->u.unary_expression.u.string;
+               switch (i) {
+               case 0: if (strcmp("clock", src_string) != 0) {
+                               return 0;
+                       }
+                       break;
+               case 1: name = src_string;
+                       break;
+               case 2: if (strcmp("value", src_string) != 0) {
+                               return 0;
+                       }
+                       break;
+               default:
+                       return 0;       /* extra identifier, unknown */
+               }
+               i++;
+       }
+       return g_quark_from_string(name);
+}
+

 static
 int get_unary_unsigned(struct cds_list_head *head, uint64_t *value)
 {
 static
 int get_unary_unsigned(struct cds_list_head *head, uint64_t *value)
 {


@@ -149,6 +193,12 @@ struct ctf_stream_class *trace_stream_lookup(struct ctf_trace *trace, uint64_t s
        return g_ptr_array_index(trace->streams, stream_id);
 }
 
        return g_ptr_array_index(trace->streams, stream_id);
 }
 

+static
+struct ctf_clock *trace_clock_lookup(struct ctf_trace *trace, GQuark clock_name)
+{
+       return g_hash_table_lookup(trace->clocks, (gpointer) (unsigned long) clock_name);
+}
+

 static
 int visit_type_specifier(FILE *fd, struct ctf_node *type_specifier, GString *str)
 {
 static
 int visit_type_specifier(FILE *fd, struct ctf_node *type_specifier, GString *str)
 {


@@ -342,7 +392,8 @@ struct declaration *ctf_type_declarator_visit(FILE *fd, int depth,
                                         */
                                        integer_declaration = integer_declaration_new(integer_declaration->len,
                                                integer_declaration->byte_order, integer_declaration->signedness,
                                         */
                                        integer_declaration = integer_declaration_new(integer_declaration->len,
                                                integer_declaration->byte_order, integer_declaration->signedness,

-                                               integer_declaration->p.alignment, 16, integer_declaration->encoding);
+                                               integer_declaration->p.alignment, 16, integer_declaration->encoding,
+                                               integer_declaration->clock);

                                        nested_declaration = &integer_declaration->p;
                                }
                        }
                                        nested_declaration = &integer_declaration->p;
                                }
                        }


@@ -1116,6 +1167,7 @@ struct declaration *ctf_declaration_integer_visit(FILE *fd, int depth,
        int has_alignment = 0, has_size = 0;
        int base = 0;
        enum ctf_string_encoding encoding = CTF_STRING_NONE;
        int has_alignment = 0, has_size = 0;
        int base = 0;
        enum ctf_string_encoding encoding = CTF_STRING_NONE;

+       struct ctf_clock *clock = NULL;

        struct declaration_integer *integer_declaration;
 
        cds_list_for_each_entry(expression, expressions, siblings) {
        struct declaration_integer *integer_declaration;
 
        cds_list_for_each_entry(expression, expressions, siblings) {


@@ -1235,21 +1287,35 @@ struct declaration *ctf_declaration_integer_visit(FILE *fd, int depth,
                        }
                        g_free(s_right);
                } else if (!strcmp(left->u.unary_expression.u.string, "map")) {
                        }
                        g_free(s_right);
                } else if (!strcmp(left->u.unary_expression.u.string, "map")) {

-                       char *s_right;
+                       GQuark clock_name;

 
                        if (right->u.unary_expression.type != UNARY_STRING) {
                                fprintf(fd, "[error] %s: map: expecting identifier\n",
                                        __func__);
                                return NULL;
                        }
 
                        if (right->u.unary_expression.type != UNARY_STRING) {
                                fprintf(fd, "[error] %s: map: expecting identifier\n",
                                        __func__);
                                return NULL;
                        }

-                       s_right = concatenate_unary_strings(&expression->u.ctf_expression.right);
-                       if (!s_right) {
-                               fprintf(fd, "[error] %s: unexpected unary expression for integer map\n", __func__);
+                       /* currently only support clock.name.value */
+                       clock_name = get_map_clock_name_value(&expression->u.ctf_expression.right);
+                       if (!clock_name) {
+                               char *s_right;
+
+                               s_right = concatenate_unary_strings(&expression->u.ctf_expression.right);
+                               if (!s_right) {
+                                       fprintf(fd, "[error] %s: unexpected unary expression for integer map\n", __func__);
+                                       g_free(s_right);
+                                       return NULL;
+                               }
+                               fprintf(fd, "[warning] %s: unknown map %s in integer declaration\n", __func__,
+                                       s_right);

                                g_free(s_right);
                                g_free(s_right);

+                               continue;
+                       }
+                       clock = trace_clock_lookup(trace, clock_name);
+                       if (!clock) {
+                               fprintf(fd, "[error] %s: map: unable to find clock %s declaration\n",
+                                       __func__, g_quark_to_string(clock_name));

                                return NULL;
                        }
                                return NULL;
                        }

-                       /* TODO: lookup */
-

                } else {
                        fprintf(fd, "[warning] %s: unknown attribute name %s\n",
                                __func__, left->u.unary_expression.u.string);
                } else {
                        fprintf(fd, "[warning] %s: unknown attribute name %s\n",
                                __func__, left->u.unary_expression.u.string);


@@ -1271,7 +1337,7 @@ struct declaration *ctf_declaration_integer_visit(FILE *fd, int depth,
        }
        integer_declaration = integer_declaration_new(size,
                                byte_order, signedness, alignment,
        }
        integer_declaration = integer_declaration_new(size,
                                byte_order, signedness, alignment,

-                               base, encoding);
+                               base, encoding, clock);

        return &integer_declaration->p;
 }
 
        return &integer_declaration->p;
 }
 


@@ -1678,7 +1744,7 @@ int ctf_event_visit(FILE *fd, int depth, struct ctf_node *node,
                g_ptr_array_set_size(event->stream->events_by_id, event->id + 1);
        g_ptr_array_index(event->stream->events_by_id, event->id) = event;
        g_hash_table_insert(event->stream->event_quark_to_id,
                g_ptr_array_set_size(event->stream->events_by_id, event->id + 1);
        g_ptr_array_index(event->stream->events_by_id, event->id) = event;
        g_hash_table_insert(event->stream->event_quark_to_id,

-                           (gpointer)(unsigned long) event->name,
+                           (gpointer) (unsigned long) event->name,

                            &event->id);
        return 0;
 
                            &event->id);
        return 0;
 


@@ -2278,6 +2344,7 @@ int ctf_visitor_construct_metadata(FILE *fd, int depth, struct ctf_node *node,
 {
        int ret = 0;
        struct ctf_node *iter;
 {
        int ret = 0;
        struct ctf_node *iter;

+       int clock_done = 0;

 
        printf_verbose("CTF visitor: metadata construction... ");
        trace->byte_order = byte_order;
 
        printf_verbose("CTF visitor: metadata construction... ");
        trace->byte_order = byte_order;


@@ -2289,6 +2356,21 @@ retry:
 
        switch (node->type) {
        case NODE_ROOT:
 
        switch (node->type) {
        case NODE_ROOT:

+               if (!clock_done) {
+                       /*
+                        * declarations need to query clock hash table,
+                        * so clock need to be treated first.
+                        */
+                       cds_list_for_each_entry(iter, &node->u.root.clock, siblings) {
+                               ret = ctf_clock_visit(fd, depth + 1, iter,
+                                                     trace);
+                               if (ret) {
+                                       fprintf(fd, "[error] %s: clock declaration error\n", __func__);
+                                       goto error;
+                               }
+                       }
+                       clock_done = 1;
+               }

                cds_list_for_each_entry(iter, &node->u.root.declaration_list,
                                        siblings) {
                        ret = ctf_root_declaration_visit(fd, depth + 1, iter, trace);
                cds_list_for_each_entry(iter, &node->u.root.declaration_list,
                                        siblings) {
                        ret = ctf_root_declaration_visit(fd, depth + 1, iter, trace);


@@ -2313,15 +2395,6 @@ retry:
                                goto error;
                        }
                }
                                goto error;
                        }
                }

-               cds_list_for_each_entry(iter, &node->u.root.clock, siblings) {
-                       ret = ctf_clock_visit(fd, depth + 1, iter,
-                                             trace);
-                       if (ret) {
-                               fprintf(fd, "[error] %s: clock declaration error\n", __func__);
-                               goto error;
-                       }
-               }
-

                if (!trace->streams) {
                        fprintf(fd, "[error] %s: missing trace declaration\n", __func__);
                        ret = -EINVAL;
                if (!trace->streams) {
                        fprintf(fd, "[error] %s: missing trace declaration\n", __func__);
                        ret = -EINVAL;

diff --git a/include/babeltrace/types.h b/include/babeltrace/types.h
index f3a0e831b15fcdfb9a85f76dc79a0c569222ca8a..b4d2d4a7dc8b423a5bf1f7ebea971f381384ef2f 100644 (file)
--- a/include/babeltrace/types.h
+++ b/include/babeltrace/types.h
@@ -37,6 +37,7 @@ struct ctf_stream;
 struct stream_pos;
 struct format;
 struct definition;
 struct stream_pos;
 struct format;
 struct definition;

+struct ctf_clock;

 
 /* type scope */
 struct declaration_scope {
 
 /* type scope */
 struct declaration_scope {


@@ -151,6 +152,7 @@ struct declaration_integer {
        int signedness;
        int base;               /* Base for pretty-printing: 2, 8, 10, 16 */
        enum ctf_string_encoding encoding;
        int signedness;
        int base;               /* Base for pretty-printing: 2, 8, 10, 16 */
        enum ctf_string_encoding encoding;

+       struct ctf_clock *clock;

 };
 
 struct definition_integer {
 };
 
 struct definition_integer {


@@ -382,7 +384,8 @@ void definition_unref(struct definition *definition);
 
 struct declaration_integer *integer_declaration_new(size_t len, int byte_order,
                                  int signedness, size_t alignment,
 
 struct declaration_integer *integer_declaration_new(size_t len, int byte_order,
                                  int signedness, size_t alignment,

-                                 int base, enum ctf_string_encoding encoding);
+                                 int base, enum ctf_string_encoding encoding,
+                                 struct ctf_clock *clock);

 uint64_t get_unsigned_int(struct definition *field);
 int64_t get_signed_int(struct definition *field);
 
 uint64_t get_unsigned_int(struct definition *field);
 int64_t get_signed_int(struct definition *field);
 

diff --git a/types/float.c b/types/float.c
index dc97af48f1304d99003446b404bf6785169b1640..863173852c9baacc6bfbf7dbe5208cad55d89088 100644 (file)
--- a/types/float.c
+++ b/types/float.c
@@ -61,13 +61,13 @@ struct declaration_float *
 
        float_declaration->sign = integer_declaration_new(1,
                                                byte_order, false, 1, 2,
 
        float_declaration->sign = integer_declaration_new(1,
                                                byte_order, false, 1, 2,

-                                               CTF_STRING_NONE);
+                                               CTF_STRING_NONE, NULL);

        float_declaration->mantissa = integer_declaration_new(mantissa_len - 1,
                                                byte_order, false, 1, 10,
        float_declaration->mantissa = integer_declaration_new(mantissa_len - 1,
                                                byte_order, false, 1, 10,

-                                               CTF_STRING_NONE);
+                                               CTF_STRING_NONE, NULL);

        float_declaration->exp = integer_declaration_new(exp_len,
                                                byte_order, true, 1, 10,
        float_declaration->exp = integer_declaration_new(exp_len,
                                                byte_order, true, 1, 10,

-                                               CTF_STRING_NONE);
+                                               CTF_STRING_NONE, NULL);

        return float_declaration;
 }
 
        return float_declaration;
 }
 

diff --git a/types/integer.c b/types/integer.c
index 9e6df588f9764537a9969a0937274b941fa70aa8..7e996f2786feeeb414f56b28f56a56cfbd1c6530 100644 (file)
--- a/types/integer.c
+++ b/types/integer.c
@@ -42,7 +42,8 @@ void _integer_declaration_free(struct declaration *declaration)
 struct declaration_integer *
        integer_declaration_new(size_t len, int byte_order,
                         int signedness, size_t alignment, int base,
 struct declaration_integer *
        integer_declaration_new(size_t len, int byte_order,
                         int signedness, size_t alignment, int base,

-                        enum ctf_string_encoding encoding)
+                        enum ctf_string_encoding encoding,
+                        struct ctf_clock *clock)

 {
        struct declaration_integer *integer_declaration;
 
 {
        struct declaration_integer *integer_declaration;
 


@@ -58,6 +59,7 @@ struct declaration_integer *
        integer_declaration->signedness = signedness;
        integer_declaration->base = base;
        integer_declaration->encoding = encoding;
        integer_declaration->signedness = signedness;
        integer_declaration->base = base;
        integer_declaration->encoding = encoding;

+       integer_declaration->clock = clock;

        return integer_declaration;
 }
 
        return integer_declaration;
 }