X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Fmetadata%2Fctf-visitor-parent-links.c;h=104afb717ddad5e78fb2dcbe87c9dabc0c0fb3eb;hp=49d067c6640c66bc97c2ab2f5436dd9e2d170604;hb=104147cd176d0b6f635777f34a7df15a33a45c15;hpb=c8b219a3168dd382a167a72406e268550005e662 diff --git a/formats/ctf/metadata/ctf-visitor-parent-links.c b/formats/ctf/metadata/ctf-visitor-parent-links.c index 49d067c6..104afb71 100644 --- a/formats/ctf/metadata/ctf-visitor-parent-links.c +++ b/formats/ctf/metadata/ctf-visitor-parent-links.c @@ -14,6 +14,14 @@ * * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. */ #include @@ -24,7 +32,7 @@ #include #include #include -#include +#include #include #include "ctf-scanner.h" #include "ctf-parser.h" @@ -61,13 +69,6 @@ int ctf_visitor_unary_expression(FILE *fd, int depth, struct ctf_node *node) if (ret) return ret; break; - case UNARY_NESTED: - node->u.unary_expression.u.nested_exp->parent = node; - ret = ctf_visitor_unary_expression(fd, depth + 1, - node->u.unary_expression.u.nested_exp); - if (ret) - return ret; - break; case UNARY_UNKNOWN: default: @@ -128,14 +129,12 @@ int ctf_visitor_type_declarator(FILE *fd, int depth, struct ctf_node *node) depth++; - if (!cds_list_empty(&node->u.type_declarator.pointers)) { - cds_list_for_each_entry(iter, &node->u.type_declarator.pointers, - siblings) { - iter->parent = node; - ret = ctf_visitor_parent_links(fd, depth + 1, iter); - if (ret) - return ret; - } + bt_list_for_each_entry(iter, &node->u.type_declarator.pointers, + siblings) { + iter->parent = node; + ret = ctf_visitor_parent_links(fd, depth + 1, iter); + if (ret) + return ret; } switch (node->u.type_declarator.type) { @@ -149,11 +148,14 @@ int ctf_visitor_type_declarator(FILE *fd, int depth, struct ctf_node *node) if (ret) return ret; } - if (node->u.type_declarator.u.nested.length) { - node->u.type_declarator.u.nested.length->parent = node; - ret = ctf_visitor_parent_links(fd, depth + 1, node->u.type_declarator.u.nested.length); - if (ret) - return ret; + if (!node->u.type_declarator.u.nested.abstract_array) { + bt_list_for_each_entry(iter, &node->u.type_declarator.u.nested.length, + siblings) { + iter->parent = node; + ret = ctf_visitor_parent_links(fd, depth + 1, iter); + if (ret) + return ret; + } } if (node->u.type_declarator.bitfield_len) { node->u.type_declarator.bitfield_len = node; @@ -180,25 +182,37 @@ int ctf_visitor_parent_links(FILE *fd, int depth, struct ctf_node *node) switch (node->type) { case NODE_ROOT: - cds_list_for_each_entry(iter, &node->u.root.declaration_list, siblings) { + bt_list_for_each_entry(iter, &node->u.root.declaration_list, siblings) { + iter->parent = node; + ret = ctf_visitor_parent_links(fd, depth + 1, iter); + if (ret) + return ret; + } + bt_list_for_each_entry(iter, &node->u.root.trace, siblings) { + iter->parent = node; + ret = ctf_visitor_parent_links(fd, depth + 1, iter); + if (ret) + return ret; + } + bt_list_for_each_entry(iter, &node->u.root.stream, siblings) { iter->parent = node; ret = ctf_visitor_parent_links(fd, depth + 1, iter); if (ret) return ret; } - cds_list_for_each_entry(iter, &node->u.root.trace, siblings) { + bt_list_for_each_entry(iter, &node->u.root.event, siblings) { iter->parent = node; ret = ctf_visitor_parent_links(fd, depth + 1, iter); if (ret) return ret; } - cds_list_for_each_entry(iter, &node->u.root.stream, siblings) { + bt_list_for_each_entry(iter, &node->u.root.clock, siblings) { iter->parent = node; ret = ctf_visitor_parent_links(fd, depth + 1, iter); if (ret) return ret; } - cds_list_for_each_entry(iter, &node->u.root.event, siblings) { + bt_list_for_each_entry(iter, &node->u.root.callsite, siblings) { iter->parent = node; ret = ctf_visitor_parent_links(fd, depth + 1, iter); if (ret) @@ -207,7 +221,7 @@ int ctf_visitor_parent_links(FILE *fd, int depth, struct ctf_node *node) break; case NODE_EVENT: - cds_list_for_each_entry(iter, &node->u.event.declaration_list, siblings) { + bt_list_for_each_entry(iter, &node->u.event.declaration_list, siblings) { iter->parent = node; ret = ctf_visitor_parent_links(fd, depth + 1, iter); if (ret) @@ -215,7 +229,15 @@ int ctf_visitor_parent_links(FILE *fd, int depth, struct ctf_node *node) } break; case NODE_STREAM: - cds_list_for_each_entry(iter, &node->u.stream.declaration_list, siblings) { + bt_list_for_each_entry(iter, &node->u.stream.declaration_list, siblings) { + iter->parent = node; + ret = ctf_visitor_parent_links(fd, depth + 1, iter); + if (ret) + return ret; + } + break; + case NODE_ENV: + bt_list_for_each_entry(iter, &node->u.env.declaration_list, siblings) { iter->parent = node; ret = ctf_visitor_parent_links(fd, depth + 1, iter); if (ret) @@ -223,7 +245,23 @@ int ctf_visitor_parent_links(FILE *fd, int depth, struct ctf_node *node) } break; case NODE_TRACE: - cds_list_for_each_entry(iter, &node->u.trace.declaration_list, siblings) { + bt_list_for_each_entry(iter, &node->u.trace.declaration_list, siblings) { + iter->parent = node; + ret = ctf_visitor_parent_links(fd, depth + 1, iter); + if (ret) + return ret; + } + break; + case NODE_CLOCK: + bt_list_for_each_entry(iter, &node->u.clock.declaration_list, siblings) { + iter->parent = node; + ret = ctf_visitor_parent_links(fd, depth + 1, iter); + if (ret) + return ret; + } + break; + case NODE_CALLSITE: + bt_list_for_each_entry(iter, &node->u.callsite.declaration_list, siblings) { iter->parent = node; ret = ctf_visitor_parent_links(fd, depth + 1, iter); if (ret) @@ -233,13 +271,13 @@ int ctf_visitor_parent_links(FILE *fd, int depth, struct ctf_node *node) case NODE_CTF_EXPRESSION: depth++; - cds_list_for_each_entry(iter, &node->u.ctf_expression.left, siblings) { + bt_list_for_each_entry(iter, &node->u.ctf_expression.left, siblings) { iter->parent = node; ret = ctf_visitor_parent_links(fd, depth + 1, iter); if (ret) return ret; } - cds_list_for_each_entry(iter, &node->u.ctf_expression.right, siblings) { + bt_list_for_each_entry(iter, &node->u.ctf_expression.right, siblings) { iter->parent = node; ret = ctf_visitor_parent_links(fd, depth + 1, iter); if (ret) @@ -256,7 +294,7 @@ int ctf_visitor_parent_links(FILE *fd, int depth, struct ctf_node *node) ret = ctf_visitor_parent_links(fd, depth + 1, node->u._typedef.type_specifier_list); if (ret) return ret; - cds_list_for_each_entry(iter, &node->u._typedef.type_declarators, siblings) { + bt_list_for_each_entry(iter, &node->u._typedef.type_declarators, siblings) { iter->parent = node; ret = ctf_visitor_parent_links(fd, depth + 1, iter); if (ret) @@ -270,7 +308,7 @@ int ctf_visitor_parent_links(FILE *fd, int depth, struct ctf_node *node) ret = ctf_visitor_parent_links(fd, depth + 1, node->u.typealias_target.type_specifier_list); if (ret) return ret; - cds_list_for_each_entry(iter, &node->u.typealias_target.type_declarators, siblings) { + bt_list_for_each_entry(iter, &node->u.typealias_target.type_declarators, siblings) { iter->parent = node; ret = ctf_visitor_parent_links(fd, depth + 1, iter); if (ret) @@ -284,7 +322,7 @@ int ctf_visitor_parent_links(FILE *fd, int depth, struct ctf_node *node) ret = ctf_visitor_parent_links(fd, depth + 1, node->u.typealias_alias.type_specifier_list); if (ret) return ret; - cds_list_for_each_entry(iter, &node->u.typealias_alias.type_declarators, siblings) { + bt_list_for_each_entry(iter, &node->u.typealias_alias.type_declarators, siblings) { iter->parent = node; ret = ctf_visitor_parent_links(fd, depth + 1, iter); if (ret) @@ -304,7 +342,7 @@ int ctf_visitor_parent_links(FILE *fd, int depth, struct ctf_node *node) break; case NODE_TYPE_SPECIFIER_LIST: - cds_list_for_each_entry(iter, &node->u.type_specifier_list.head, siblings) { + bt_list_for_each_entry(iter, &node->u.type_specifier_list.head, siblings) { iter->parent = node; ret = ctf_visitor_parent_links(fd, depth + 1, iter); if (ret) @@ -326,7 +364,7 @@ int ctf_visitor_parent_links(FILE *fd, int depth, struct ctf_node *node) break; case NODE_FLOATING_POINT: - cds_list_for_each_entry(iter, &node->u.floating_point.expressions, siblings) { + bt_list_for_each_entry(iter, &node->u.floating_point.expressions, siblings) { iter->parent = node; ret = ctf_visitor_parent_links(fd, depth + 1, iter); if (ret) @@ -334,7 +372,7 @@ int ctf_visitor_parent_links(FILE *fd, int depth, struct ctf_node *node) } break; case NODE_INTEGER: - cds_list_for_each_entry(iter, &node->u.integer.expressions, siblings) { + bt_list_for_each_entry(iter, &node->u.integer.expressions, siblings) { iter->parent = node; ret = ctf_visitor_parent_links(fd, depth + 1, iter); if (ret) @@ -342,7 +380,7 @@ int ctf_visitor_parent_links(FILE *fd, int depth, struct ctf_node *node) } break; case NODE_STRING: - cds_list_for_each_entry(iter, &node->u.string.expressions, siblings) { + bt_list_for_each_entry(iter, &node->u.string.expressions, siblings) { iter->parent = node; ret = ctf_visitor_parent_links(fd, depth + 1, iter); if (ret) @@ -350,7 +388,7 @@ int ctf_visitor_parent_links(FILE *fd, int depth, struct ctf_node *node) } break; case NODE_ENUMERATOR: - cds_list_for_each_entry(iter, &node->u.enumerator.values, siblings) { + bt_list_for_each_entry(iter, &node->u.enumerator.values, siblings) { iter->parent = node; ret = ctf_visitor_parent_links(fd, depth + 1, iter); if (ret) @@ -365,7 +403,7 @@ int ctf_visitor_parent_links(FILE *fd, int depth, struct ctf_node *node) return ret; } - cds_list_for_each_entry(iter, &node->u._enum.enumerator_list, siblings) { + bt_list_for_each_entry(iter, &node->u._enum.enumerator_list, siblings) { iter->parent = node; ret = ctf_visitor_parent_links(fd, depth + 1, iter); if (ret) @@ -379,7 +417,7 @@ int ctf_visitor_parent_links(FILE *fd, int depth, struct ctf_node *node) node->u.struct_or_variant_declaration.type_specifier_list); if (ret) return ret; - cds_list_for_each_entry(iter, &node->u.struct_or_variant_declaration.type_declarators, siblings) { + bt_list_for_each_entry(iter, &node->u.struct_or_variant_declaration.type_declarators, siblings) { iter->parent = node; ret = ctf_visitor_parent_links(fd, depth + 1, iter); if (ret) @@ -387,7 +425,7 @@ int ctf_visitor_parent_links(FILE *fd, int depth, struct ctf_node *node) } break; case NODE_VARIANT: - cds_list_for_each_entry(iter, &node->u.variant.declaration_list, siblings) { + bt_list_for_each_entry(iter, &node->u.variant.declaration_list, siblings) { iter->parent = node; ret = ctf_visitor_parent_links(fd, depth + 1, iter); if (ret) @@ -395,7 +433,14 @@ int ctf_visitor_parent_links(FILE *fd, int depth, struct ctf_node *node) } break; case NODE_STRUCT: - cds_list_for_each_entry(iter, &node->u._struct.declaration_list, siblings) { + bt_list_for_each_entry(iter, &node->u._struct.declaration_list, siblings) { + iter->parent = node; + ret = ctf_visitor_parent_links(fd, depth + 1, iter); + if (ret) + return ret; + } + bt_list_for_each_entry(iter, &node->u._struct.min_align, + siblings) { iter->parent = node; ret = ctf_visitor_parent_links(fd, depth + 1, iter); if (ret)