6c3a38777b
libctf has no intrinsic support for the GCC unnamed structure member extension. This principally means that you can't look up named members inside unnamed struct or union members via ctf_member_info: you have to tiresomely find out the type ID of the unnamed members via iteration, then look in each of these. This is ridiculous. Fix it by extending ctf_member_info so that it recurses into unnamed members for you: this is still unambiguous because GCC won't let you create ambiguously-named members even in the presence of this extension. For consistency, and because the release hasn't happened and we can still do this, break the ctf_member_next API and add flags: we specify one flag, CTF_MN_RECURSE, which if set causes ctf_member_next to automatically recurse into unnamed members for you, returning not only the members themselves but all their contained members, so that you can use ctf_member_next to identify every member that it would be valid to call ctf_member_info with. New lookup tests are added for all of this. include/ChangeLog 2021-01-05 Nick Alcock <nick.alcock@oracle.com> * ctf-api.h (CTF_MN_RECURSE): New. (ctf_member_next): Add flags argument. libctf/ChangeLog 2021-01-05 Nick Alcock <nick.alcock@oracle.com> * ctf-impl.h (struct ctf_next) <u.ctn_next>: Move to... <ctn_next>: ... here. * ctf-util.c (ctf_next_destroy): Unconditionally destroy it. * ctf-lookup.c (ctf_symbol_next): Adjust accordingly. * ctf-types.c (ctf_member_iter): Reimplement in terms of... (ctf_member_next): ... this. Support recursive unnamed member iteration (off by default). (ctf_member_info): Look up members in unnamed sub-structs. * ctf-dedup.c (ctf_dedup_rhash_type): Adjust ctf_member_next call. (ctf_dedup_emit_struct_members): Likewise. * testsuite/libctf-lookup/struct-iteration-ctf.c: Test empty unnamed members, and a normal member after the end. * testsuite/libctf-lookup/struct-iteration.c: Verify that ctf_member_count is consistent with the number of successful returns from a non-recursive ctf_member_next. * testsuite/libctf-lookup/struct-iteration-*: New, test iteration over struct members. * testsuite/libctf-lookup/struct-lookup.c: New test. * testsuite/libctf-lookup/struct-lookup.lk: New test.
93 lines
2.3 KiB
C
93 lines
2.3 KiB
C
#include <ctf-api.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
|
|
static int
|
|
print_struct (const char *name, ctf_id_t membtype, unsigned long offset,
|
|
void *fp_)
|
|
{
|
|
ctf_dict_t *fp = (ctf_dict_t *) fp_;
|
|
char *type_name = ctf_type_aname (fp, membtype);
|
|
|
|
printf ("iter test: %s, offset %lx, has type %lx/%s\n",
|
|
name, offset, membtype, type_name);
|
|
free (type_name);
|
|
|
|
return 0;
|
|
}
|
|
|
|
int
|
|
main (int argc, char *argv[])
|
|
{
|
|
ctf_dict_t *fp;
|
|
ctf_archive_t *ctf;
|
|
ctf_id_t type;
|
|
ctf_next_t *i = NULL;
|
|
const char *name;
|
|
ctf_id_t membtype;
|
|
ssize_t offset;
|
|
ssize_t icount = 0;
|
|
int err;
|
|
|
|
if (argc != 2)
|
|
{
|
|
fprintf (stderr, "Syntax: %s PROGRAM\n", argv[0]);
|
|
exit(1);
|
|
}
|
|
|
|
if ((ctf = ctf_open (argv[1], NULL, &err)) == NULL)
|
|
goto open_err;
|
|
if ((fp = ctf_dict_open (ctf, NULL, &err)) == NULL)
|
|
goto open_err;
|
|
|
|
/* Iterate over the structure members with each iterator type in turn. */
|
|
|
|
if ((type = ctf_lookup_by_name (fp, "struct foo_t") ) == CTF_ERR)
|
|
goto err;
|
|
|
|
if (ctf_member_iter (fp, type, print_struct, fp) < 0)
|
|
goto ierr;
|
|
|
|
while ((offset = ctf_member_next (fp, type, &i, &name, &membtype,
|
|
CTF_MN_RECURSE)) >= 0)
|
|
{
|
|
char *type_name = ctf_type_aname (fp, membtype);
|
|
|
|
printf ("next test: %s, offset %lx, has type %lx/%s\n",
|
|
name, offset, membtype, type_name);
|
|
free (type_name);
|
|
}
|
|
if (ctf_errno (fp) != ECTF_NEXT_END)
|
|
goto nerr;
|
|
|
|
/* Now make sure the count of members does not include any recursive
|
|
members. */
|
|
while ((offset = ctf_member_next (fp, type, &i, &name, &membtype, 0)) >= 0)
|
|
icount++;
|
|
|
|
if (ctf_errno (fp) != ECTF_NEXT_END)
|
|
goto nerr;
|
|
|
|
if (icount != ctf_member_count (fp, type))
|
|
printf ("member counts differ: %li by direct iteration, "
|
|
"%li by ctf_member_count\n", icount, ctf_member_count (fp, type));
|
|
|
|
ctf_dict_close (fp);
|
|
ctf_close (ctf);
|
|
|
|
return 0;
|
|
|
|
open_err:
|
|
fprintf (stderr, "%s: cannot open: %s\n", argv[0], ctf_errmsg (err));
|
|
return 1;
|
|
err:
|
|
fprintf (stderr, "Lookup failed: %s\n", ctf_errmsg (ctf_errno (fp)));
|
|
return 1;
|
|
ierr:
|
|
fprintf (stderr, "_iter iteration failed: %s\n", ctf_errmsg (ctf_errno (fp)));
|
|
return 1;
|
|
nerr:
|
|
fprintf (stderr, "_next iteration failed: %s\n", ctf_errmsg (ctf_errno (fp)));
|
|
return 1;
|
|
}
|