mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-15 04:31:49 +08:00
926c9e7665
This commit follows on from the earlier commit "libctf, ld, binutils: add textual error/warning reporting for libctf" and converts every error in libctf that was reported using ctf_dprintf to use ctf_err_warn instead, gettextizing them in the process, using N_() where necessary to avoid doing gettext calls unless an error message is actually generated, and rephrasing some error messages for ease of translation. This requires a slight change in the ctf_errwarning_next API: this API is public but has not been in a release yet, so can still change freely. The problem is that many errors are emitted at open time (whether opening of a CTF dict, or opening of a CTF archive): the former of these throws away its incompletely-initialized ctf_file_t rather than return it, and the latter has no ctf_file_t at all. So errors and warnings emitted at open time cannot be stored in the ctf_file_t, and have to go elsewhere. We put them in a static local in ctf-subr.c (which is not very thread-safe: a later commit will improve things here): ctf_err_warn with a NULL fp adds to this list, and the public interface ctf_errwarning_next with a NULL fp retrieves from it. We need a slight exception from the usual iterator rules in this case: with a NULL fp, there is nowhere to store the ECTF_NEXT_END "error" which signifies the end of iteration, so we add a new err parameter to ctf_errwarning_next which is used to report such iteration-related errors. (If an fp is provided -- i.e., if not reporting open errors -- this is optional, but even if it's optional it's still an API change. This is actually useful from a usability POV as well, since ctf_errwarning_next is usually called when there's been an error, so overwriting the error code with ECTF_NEXT_END is not very helpful! So, unusually, ctf_errwarning_next now uses the passed fp for its error code *only* if no errp pointer is passed in, and leaves it untouched otherwise.) ld, objdump and readelf are adapted to call ctf_errwarning_next with a NULL fp to report open errors where appropriate. The ctf_err_warn API also has to change, gaining a new error-number parameter which is used to add the error message corresponding to that error number into the debug stream when LIBCTF_DEBUG is enabled: changing this API is easy at this point since we are already touching all existing calls to gettextize them. We need this because the debug stream should contain the errno's message, but the error reported in the error/warning stream should *not*, because the caller will probably report it themselves at failure time regardless, and reporting it in every error message that leads up to it leads to a ridiculous chattering on failure, which is likely to end up as ridiculous chattering on stderr (trimmed a bit): CTF error: `ld/testsuite/ld-ctf/A.c (0): lookup failure for type 3: flags 1: The parent CTF dictionary is unavailable' CTF error: `ld/testsuite/ld-ctf/A.c (0): struct/union member type hashing error during type hashing for type 80000001, kind 6: The parent CTF dictionary is unavailable' CTF error: `deduplicating link variable emission failed for ld/testsuite/ld-ctf/A.c: The parent CTF dictionary is unavailable' ld/.libs/lt-ld-new: warning: CTF linking failed; output will have no CTF section: `The parent CTF dictionary is unavailable' We only need to be told that the parent CTF dictionary is unavailable *once*, not over and over again! errmsgs are still emitted on warning generation, because warnings do not usually lead to a failure propagated up to the caller and reported there. Debug-stream messages are not translated. If translation is turned on, there will be a mixture of English and translated messages in the debug stream, but rather that than burden the translators with debug-only output. binutils/ChangeLog 2020-08-27 Nick Alcock <nick.alcock@oracle.com> * objdump.c (dump_ctf_archive_member): Move error- reporting... (dump_ctf_errs): ... into this separate function. (dump_ctf): Call it on open errors. * readelf.c (dump_ctf_archive_member): Move error- reporting... (dump_ctf_errs): ... into this separate function. Support calls with NULL fp. Adjust for new err parameter to ctf_errwarning_next. (dump_section_as_ctf): Call it on open errors. include/ChangeLog 2020-08-27 Nick Alcock <nick.alcock@oracle.com> * ctf-api.h (ctf_errwarning_next): New err parameter. ld/ChangeLog 2020-08-27 Nick Alcock <nick.alcock@oracle.com> * ldlang.c (lang_ctf_errs_warnings): Support calls with NULL fp. Adjust for new err parameter to ctf_errwarning_next. Only check for assertion failures when fp is non-NULL. (ldlang_open_ctf): Call it on open errors. * testsuite/ld-ctf/ctf.exp: Always use the C locale to avoid breaking the diags tests. libctf/ChangeLog 2020-08-27 Nick Alcock <nick.alcock@oracle.com> * ctf-subr.c (open_errors): New list. (ctf_err_warn): Calls with NULL fp append to open_errors. Add err parameter, and use it to decorate the debug stream with errmsgs. (ctf_err_warn_to_open): Splice errors from a CTF dict into the open_errors. (ctf_errwarning_next): Calls with NULL fp report from open_errors. New err param to report iteration errors (including end-of-iteration) when fp is NULL. (ctf_assert_fail_internal): Adjust ctf_err_warn call for new err parameter: gettextize. * ctf-impl.h (ctfo_get_vbytes): Add ctf_file_t parameter. (LCTF_VBYTES): Adjust. (ctf_err_warn_to_open): New. (ctf_err_warn): Adjust. (ctf_bundle): Used in only one place: move... * ctf-create.c: ... here. (enumcmp): Use ctf_err_warn, not ctf_dprintf, passing the err number down as needed. Don't emit the errmsg. Gettextize. (membcmp): Likewise. (ctf_add_type_internal): Likewise. (ctf_write_mem): Likewise. (ctf_compress_write): Likewise. Report errors writing the header or body. (ctf_write): Likewise. * ctf-archive.c (ctf_arc_write_fd): Use ctf_err_warn, not ctf_dprintf, and gettextize, as above. (ctf_arc_write): Likewise. (ctf_arc_bufopen): Likewise. (ctf_arc_open_internal): Likewise. * ctf-labels.c (ctf_label_iter): Likewise. * ctf-open-bfd.c (ctf_bfdclose): Likewise. (ctf_bfdopen): Likewise. (ctf_bfdopen_ctfsect): Likewise. (ctf_fdopen): Likewise. * ctf-string.c (ctf_str_write_strtab): Likewise. * ctf-types.c (ctf_type_resolve): Likewise. * ctf-open.c (get_vbytes_common): Likewise. Pass down the ctf dict. (get_vbytes_v1): Pass down the ctf dict. (get_vbytes_v2): Likewise. (flip_ctf): Likewise. (flip_types): Likewise. Use ctf_err_warn, not ctf_dprintf, and gettextize, as above. (upgrade_types_v1): Adjust calls. (init_types): Use ctf_err_warn, not ctf_dprintf, as above. (ctf_bufopen_internal): Likewise. Adjust calls. Transplant errors emitted into individual dicts into the open errors if this turns out to be a failed open in the end. * ctf-dump.c (ctf_dump_format_type): Adjust ctf_err_warn for new err argument. Gettextize. Don't emit the errmsg. (ctf_dump_funcs): Likewise. Collapse err label into its only case. (ctf_dump_type): Likewise. * ctf-link.c (ctf_create_per_cu): Adjust ctf_err_warn for new err argument. Gettextize. Don't emit the errmsg. (ctf_link_one_type): Likewise. (ctf_link_lazy_open): Likewise. (ctf_link_one_input_archive): Likewise. (ctf_link_deduplicating_count_inputs): Likewise. (ctf_link_deduplicating_open_inputs): Likewise. (ctf_link_deduplicating_close_inputs): Likewise. (ctf_link_deduplicating): Likewise. (ctf_link): Likewise. (ctf_link_deduplicating_per_cu): Likewise. Add some missed ctf_set_errnos to obscure error cases. * ctf-dedup.c (ctf_dedup_rhash_type): Adjust ctf_err_warn for new err argument. Gettextize. Don't emit the errmsg. (ctf_dedup_populate_mappings): Likewise. (ctf_dedup_detect_name_ambiguity): Likewise. (ctf_dedup_init): Likewise. (ctf_dedup_multiple_input_dicts): Likewise. (ctf_dedup_conflictify_unshared): Likewise. (ctf_dedup): Likewise. (ctf_dedup_rwalk_one_output_mapping): Likewise. (ctf_dedup_id_to_target): Likewise. (ctf_dedup_emit_type): Likewise. (ctf_dedup_emit_struct_members): Likewise. (ctf_dedup_populate_type_mapping): Likewise. (ctf_dedup_populate_type_mappings): Likewise. (ctf_dedup_emit): Likewise. (ctf_dedup_hash_type): Likewise. Fix a bit of messed-up error status setting. (ctf_dedup_rwalk_one_output_mapping): Likewise. Don't hide unknown-type-kind messages (which signify file corruption).
521 lines
14 KiB
C
521 lines
14 KiB
C
/* CTF string table management.
|
|
Copyright (C) 2019-2020 Free Software Foundation, Inc.
|
|
|
|
This file is part of libctf.
|
|
|
|
libctf is free software; you can redistribute it and/or modify it under
|
|
the terms of the GNU General Public License as published by the Free
|
|
Software Foundation; either version 3, or (at your option) any later
|
|
version.
|
|
|
|
This program is distributed in the hope that it will be useful, but
|
|
WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
|
See the GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; see the file COPYING. If not see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#include <ctf-impl.h>
|
|
#include <string.h>
|
|
|
|
/* Convert an encoded CTF string name into a pointer to a C string, using an
|
|
explicit internal strtab rather than the fp-based one. */
|
|
const char *
|
|
ctf_strraw_explicit (ctf_file_t *fp, uint32_t name, ctf_strs_t *strtab)
|
|
{
|
|
ctf_strs_t *ctsp = &fp->ctf_str[CTF_NAME_STID (name)];
|
|
|
|
if ((CTF_NAME_STID (name) == CTF_STRTAB_0) && (strtab != NULL))
|
|
ctsp = strtab;
|
|
|
|
/* If this name is in the external strtab, and there is a synthetic strtab,
|
|
use it in preference. */
|
|
|
|
if (CTF_NAME_STID (name) == CTF_STRTAB_1
|
|
&& fp->ctf_syn_ext_strtab != NULL)
|
|
return ctf_dynhash_lookup (fp->ctf_syn_ext_strtab,
|
|
(void *) (uintptr_t) name);
|
|
|
|
/* If the name is in the internal strtab, and the offset is beyond the end of
|
|
the ctsp->cts_len but below the ctf_str_prov_offset, this is a provisional
|
|
string added by ctf_str_add*() but not yet built into a real strtab: get
|
|
the value out of the ctf_prov_strtab. */
|
|
|
|
if (CTF_NAME_STID (name) == CTF_STRTAB_0
|
|
&& name >= ctsp->cts_len && name < fp->ctf_str_prov_offset)
|
|
return ctf_dynhash_lookup (fp->ctf_prov_strtab,
|
|
(void *) (uintptr_t) name);
|
|
|
|
if (ctsp->cts_strs != NULL && CTF_NAME_OFFSET (name) < ctsp->cts_len)
|
|
return (ctsp->cts_strs + CTF_NAME_OFFSET (name));
|
|
|
|
/* String table not loaded or corrupt offset. */
|
|
return NULL;
|
|
}
|
|
|
|
/* Convert an encoded CTF string name into a pointer to a C string by looking
|
|
up the appropriate string table buffer and then adding the offset. */
|
|
const char *
|
|
ctf_strraw (ctf_file_t *fp, uint32_t name)
|
|
{
|
|
return ctf_strraw_explicit (fp, name, NULL);
|
|
}
|
|
|
|
/* Return a guaranteed-non-NULL pointer to the string with the given CTF
|
|
name. */
|
|
const char *
|
|
ctf_strptr (ctf_file_t *fp, uint32_t name)
|
|
{
|
|
const char *s = ctf_strraw (fp, name);
|
|
return (s != NULL ? s : "(?)");
|
|
}
|
|
|
|
/* Remove all refs to a given atom. */
|
|
static void
|
|
ctf_str_purge_atom_refs (ctf_str_atom_t *atom)
|
|
{
|
|
ctf_str_atom_ref_t *ref, *next;
|
|
|
|
for (ref = ctf_list_next (&atom->csa_refs); ref != NULL; ref = next)
|
|
{
|
|
next = ctf_list_next (ref);
|
|
ctf_list_delete (&atom->csa_refs, ref);
|
|
free (ref);
|
|
}
|
|
}
|
|
|
|
/* Free an atom (only called on ctf_close().) */
|
|
static void
|
|
ctf_str_free_atom (void *a)
|
|
{
|
|
ctf_str_atom_t *atom = a;
|
|
|
|
ctf_str_purge_atom_refs (atom);
|
|
free (atom);
|
|
}
|
|
|
|
/* Create the atoms table. There is always at least one atom in it, the null
|
|
string. */
|
|
int
|
|
ctf_str_create_atoms (ctf_file_t *fp)
|
|
{
|
|
fp->ctf_str_atoms = ctf_dynhash_create (ctf_hash_string, ctf_hash_eq_string,
|
|
free, ctf_str_free_atom);
|
|
if (fp->ctf_str_atoms == NULL)
|
|
return -ENOMEM;
|
|
|
|
if (!fp->ctf_prov_strtab)
|
|
fp->ctf_prov_strtab = ctf_dynhash_create (ctf_hash_integer,
|
|
ctf_hash_eq_integer,
|
|
NULL, NULL);
|
|
if (!fp->ctf_prov_strtab)
|
|
goto oom_prov_strtab;
|
|
|
|
errno = 0;
|
|
ctf_str_add (fp, "");
|
|
if (errno == ENOMEM)
|
|
goto oom_str_add;
|
|
|
|
return 0;
|
|
|
|
oom_str_add:
|
|
ctf_dynhash_destroy (fp->ctf_prov_strtab);
|
|
fp->ctf_prov_strtab = NULL;
|
|
oom_prov_strtab:
|
|
ctf_dynhash_destroy (fp->ctf_str_atoms);
|
|
fp->ctf_str_atoms = NULL;
|
|
return -ENOMEM;
|
|
}
|
|
|
|
/* Destroy the atoms table. */
|
|
void
|
|
ctf_str_free_atoms (ctf_file_t *fp)
|
|
{
|
|
ctf_dynhash_destroy (fp->ctf_prov_strtab);
|
|
ctf_dynhash_destroy (fp->ctf_str_atoms);
|
|
}
|
|
|
|
/* Add a string to the atoms table, copying the passed-in string. Return the
|
|
atom added. Return NULL only when out of memory (and do not touch the
|
|
passed-in string in that case). Possibly augment the ref list with the
|
|
passed-in ref. Possibly add a provisional entry for this string to the
|
|
provisional strtab. */
|
|
static ctf_str_atom_t *
|
|
ctf_str_add_ref_internal (ctf_file_t *fp, const char *str,
|
|
int add_ref, int make_provisional, uint32_t *ref)
|
|
{
|
|
char *newstr = NULL;
|
|
ctf_str_atom_t *atom = NULL;
|
|
ctf_str_atom_ref_t *aref = NULL;
|
|
|
|
atom = ctf_dynhash_lookup (fp->ctf_str_atoms, str);
|
|
|
|
if (add_ref)
|
|
{
|
|
if ((aref = malloc (sizeof (struct ctf_str_atom_ref))) == NULL)
|
|
return NULL;
|
|
aref->caf_ref = ref;
|
|
}
|
|
|
|
if (atom)
|
|
{
|
|
if (add_ref)
|
|
{
|
|
ctf_list_append (&atom->csa_refs, aref);
|
|
fp->ctf_str_num_refs++;
|
|
}
|
|
return atom;
|
|
}
|
|
|
|
if ((atom = malloc (sizeof (struct ctf_str_atom))) == NULL)
|
|
goto oom;
|
|
memset (atom, 0, sizeof (struct ctf_str_atom));
|
|
|
|
if ((newstr = strdup (str)) == NULL)
|
|
goto oom;
|
|
|
|
if (ctf_dynhash_insert (fp->ctf_str_atoms, newstr, atom) < 0)
|
|
goto oom;
|
|
|
|
atom->csa_str = newstr;
|
|
atom->csa_snapshot_id = fp->ctf_snapshots;
|
|
|
|
if (make_provisional)
|
|
{
|
|
atom->csa_offset = fp->ctf_str_prov_offset;
|
|
|
|
if (ctf_dynhash_insert (fp->ctf_prov_strtab, (void *) (uintptr_t)
|
|
atom->csa_offset, (void *) atom->csa_str) < 0)
|
|
goto oom;
|
|
|
|
fp->ctf_str_prov_offset += strlen (atom->csa_str) + 1;
|
|
}
|
|
|
|
if (add_ref)
|
|
{
|
|
ctf_list_append (&atom->csa_refs, aref);
|
|
fp->ctf_str_num_refs++;
|
|
}
|
|
return atom;
|
|
|
|
oom:
|
|
if (newstr)
|
|
ctf_dynhash_remove (fp->ctf_str_atoms, newstr);
|
|
free (atom);
|
|
free (aref);
|
|
free (newstr);
|
|
return NULL;
|
|
}
|
|
|
|
/* Add a string to the atoms table, without augmenting the ref list for this
|
|
string: return a 'provisional offset' which can be used to return this string
|
|
until ctf_str_write_strtab is called, or 0 on failure. (Everywhere the
|
|
provisional offset is assigned to should be added as a ref using
|
|
ctf_str_add_ref() as well.) */
|
|
uint32_t
|
|
ctf_str_add (ctf_file_t *fp, const char *str)
|
|
{
|
|
ctf_str_atom_t *atom;
|
|
if (!str)
|
|
return 0;
|
|
|
|
atom = ctf_str_add_ref_internal (fp, str, FALSE, TRUE, 0);
|
|
if (!atom)
|
|
return 0;
|
|
|
|
return atom->csa_offset;
|
|
}
|
|
|
|
/* Like ctf_str_add(), but additionally augment the atom's refs list with the
|
|
passed-in ref, whether or not the string is already present. There is no
|
|
attempt to deduplicate the refs list (but duplicates are harmless). */
|
|
uint32_t
|
|
ctf_str_add_ref (ctf_file_t *fp, const char *str, uint32_t *ref)
|
|
{
|
|
ctf_str_atom_t *atom;
|
|
if (!str)
|
|
return 0;
|
|
|
|
atom = ctf_str_add_ref_internal (fp, str, TRUE, TRUE, ref);
|
|
if (!atom)
|
|
return 0;
|
|
|
|
return atom->csa_offset;
|
|
}
|
|
|
|
/* Add an external strtab reference at OFFSET. Returns zero if the addition
|
|
failed, nonzero otherwise. */
|
|
int
|
|
ctf_str_add_external (ctf_file_t *fp, const char *str, uint32_t offset)
|
|
{
|
|
ctf_str_atom_t *atom;
|
|
if (!str)
|
|
return 0;
|
|
|
|
atom = ctf_str_add_ref_internal (fp, str, FALSE, FALSE, 0);
|
|
if (!atom)
|
|
return 0;
|
|
|
|
atom->csa_external_offset = CTF_SET_STID (offset, CTF_STRTAB_1);
|
|
return 1;
|
|
}
|
|
|
|
/* Remove a single ref. */
|
|
void
|
|
ctf_str_remove_ref (ctf_file_t *fp, const char *str, uint32_t *ref)
|
|
{
|
|
ctf_str_atom_ref_t *aref, *anext;
|
|
ctf_str_atom_t *atom = NULL;
|
|
|
|
atom = ctf_dynhash_lookup (fp->ctf_str_atoms, str);
|
|
if (!atom)
|
|
return;
|
|
|
|
for (aref = ctf_list_next (&atom->csa_refs); aref != NULL; aref = anext)
|
|
{
|
|
anext = ctf_list_next (aref);
|
|
if (aref->caf_ref == ref)
|
|
{
|
|
ctf_list_delete (&atom->csa_refs, aref);
|
|
free (aref);
|
|
}
|
|
}
|
|
}
|
|
|
|
/* A ctf_dynhash_iter_remove() callback that removes atoms later than a given
|
|
snapshot ID. */
|
|
static int
|
|
ctf_str_rollback_atom (void *key _libctf_unused_, void *value, void *arg)
|
|
{
|
|
ctf_str_atom_t *atom = (ctf_str_atom_t *) value;
|
|
ctf_snapshot_id_t *id = (ctf_snapshot_id_t *) arg;
|
|
|
|
return (atom->csa_snapshot_id > id->snapshot_id);
|
|
}
|
|
|
|
/* Roll back, deleting all atoms created after a particular ID. */
|
|
void
|
|
ctf_str_rollback (ctf_file_t *fp, ctf_snapshot_id_t id)
|
|
{
|
|
ctf_dynhash_iter_remove (fp->ctf_str_atoms, ctf_str_rollback_atom, &id);
|
|
}
|
|
|
|
/* An adaptor around ctf_purge_atom_refs. */
|
|
static void
|
|
ctf_str_purge_one_atom_refs (void *key _libctf_unused_, void *value,
|
|
void *arg _libctf_unused_)
|
|
{
|
|
ctf_str_atom_t *atom = (ctf_str_atom_t *) value;
|
|
ctf_str_purge_atom_refs (atom);
|
|
}
|
|
|
|
/* Remove all the recorded refs from the atoms table. */
|
|
void
|
|
ctf_str_purge_refs (ctf_file_t *fp)
|
|
{
|
|
if (fp->ctf_str_num_refs > 0)
|
|
ctf_dynhash_iter (fp->ctf_str_atoms, ctf_str_purge_one_atom_refs, NULL);
|
|
fp->ctf_str_num_refs = 0;
|
|
}
|
|
|
|
/* Update a list of refs to the specified value. */
|
|
static void
|
|
ctf_str_update_refs (ctf_str_atom_t *refs, uint32_t value)
|
|
{
|
|
ctf_str_atom_ref_t *ref;
|
|
|
|
for (ref = ctf_list_next (&refs->csa_refs); ref != NULL;
|
|
ref = ctf_list_next (ref))
|
|
*(ref->caf_ref) = value;
|
|
}
|
|
|
|
/* State shared across the strtab write process. */
|
|
typedef struct ctf_strtab_write_state
|
|
{
|
|
/* Strtab we are writing, and the number of strings in it. */
|
|
ctf_strs_writable_t *strtab;
|
|
size_t strtab_count;
|
|
|
|
/* Pointers to (existing) atoms in the atoms table, for qsorting. */
|
|
ctf_str_atom_t **sorttab;
|
|
|
|
/* Loop counter for sorttab population. */
|
|
size_t i;
|
|
|
|
/* The null-string atom (skipped during population). */
|
|
ctf_str_atom_t *nullstr;
|
|
} ctf_strtab_write_state_t;
|
|
|
|
/* Count the number of entries in the strtab, and its length. */
|
|
static void
|
|
ctf_str_count_strtab (void *key _libctf_unused_, void *value,
|
|
void *arg)
|
|
{
|
|
ctf_str_atom_t *atom = (ctf_str_atom_t *) value;
|
|
ctf_strtab_write_state_t *s = (ctf_strtab_write_state_t *) arg;
|
|
|
|
/* We only factor in the length of items that have no offset and have refs:
|
|
other items are in the external strtab, or will simply not be written out
|
|
at all. They still contribute to the total count, though, because we still
|
|
have to sort them. We add in the null string's length explicitly, outside
|
|
this function, since it is explicitly written out even if it has no refs at
|
|
all. */
|
|
|
|
if (s->nullstr == atom)
|
|
{
|
|
s->strtab_count++;
|
|
return;
|
|
}
|
|
|
|
if (!ctf_list_empty_p (&atom->csa_refs))
|
|
{
|
|
if (!atom->csa_external_offset)
|
|
s->strtab->cts_len += strlen (atom->csa_str) + 1;
|
|
s->strtab_count++;
|
|
}
|
|
}
|
|
|
|
/* Populate the sorttab with pointers to the strtab atoms. */
|
|
static void
|
|
ctf_str_populate_sorttab (void *key _libctf_unused_, void *value,
|
|
void *arg)
|
|
{
|
|
ctf_str_atom_t *atom = (ctf_str_atom_t *) value;
|
|
ctf_strtab_write_state_t *s = (ctf_strtab_write_state_t *) arg;
|
|
|
|
/* Skip the null string. */
|
|
if (s->nullstr == atom)
|
|
return;
|
|
|
|
/* Skip atoms with no refs. */
|
|
if (!ctf_list_empty_p (&atom->csa_refs))
|
|
s->sorttab[s->i++] = atom;
|
|
}
|
|
|
|
/* Sort the strtab. */
|
|
static int
|
|
ctf_str_sort_strtab (const void *a, const void *b)
|
|
{
|
|
ctf_str_atom_t **one = (ctf_str_atom_t **) a;
|
|
ctf_str_atom_t **two = (ctf_str_atom_t **) b;
|
|
|
|
return (strcmp ((*one)->csa_str, (*two)->csa_str));
|
|
}
|
|
|
|
/* Write out and return a strtab containing all strings with recorded refs,
|
|
adjusting the refs to refer to the corresponding string. The returned strtab
|
|
may be NULL on error. Also populate the synthetic strtab with mappings from
|
|
external strtab offsets to names, so we can look them up with ctf_strptr().
|
|
Only external strtab offsets with references are added. */
|
|
ctf_strs_writable_t
|
|
ctf_str_write_strtab (ctf_file_t *fp)
|
|
{
|
|
ctf_strs_writable_t strtab;
|
|
ctf_str_atom_t *nullstr;
|
|
uint32_t cur_stroff = 0;
|
|
ctf_strtab_write_state_t s;
|
|
ctf_str_atom_t **sorttab;
|
|
size_t i;
|
|
int any_external = 0;
|
|
|
|
memset (&strtab, 0, sizeof (struct ctf_strs_writable));
|
|
memset (&s, 0, sizeof (struct ctf_strtab_write_state));
|
|
s.strtab = &strtab;
|
|
|
|
nullstr = ctf_dynhash_lookup (fp->ctf_str_atoms, "");
|
|
if (!nullstr)
|
|
{
|
|
ctf_err_warn (fp, 0, ECTF_INTERNAL, _("null string not found in strtab"));
|
|
strtab.cts_strs = NULL;
|
|
return strtab;
|
|
}
|
|
|
|
s.nullstr = nullstr;
|
|
ctf_dynhash_iter (fp->ctf_str_atoms, ctf_str_count_strtab, &s);
|
|
strtab.cts_len++; /* For the null string. */
|
|
|
|
ctf_dprintf ("%lu bytes of strings in strtab.\n",
|
|
(unsigned long) strtab.cts_len);
|
|
|
|
/* Sort the strtab. Force the null string to be first. */
|
|
sorttab = calloc (s.strtab_count, sizeof (ctf_str_atom_t *));
|
|
if (!sorttab)
|
|
goto oom;
|
|
|
|
sorttab[0] = nullstr;
|
|
s.i = 1;
|
|
s.sorttab = sorttab;
|
|
ctf_dynhash_iter (fp->ctf_str_atoms, ctf_str_populate_sorttab, &s);
|
|
|
|
qsort (&sorttab[1], s.strtab_count - 1, sizeof (ctf_str_atom_t *),
|
|
ctf_str_sort_strtab);
|
|
|
|
if ((strtab.cts_strs = malloc (strtab.cts_len)) == NULL)
|
|
goto oom_sorttab;
|
|
|
|
if (!fp->ctf_syn_ext_strtab)
|
|
fp->ctf_syn_ext_strtab = ctf_dynhash_create (ctf_hash_integer,
|
|
ctf_hash_eq_integer,
|
|
NULL, NULL);
|
|
if (!fp->ctf_syn_ext_strtab)
|
|
goto oom_strtab;
|
|
|
|
/* Update all refs: also update the strtab appropriately. */
|
|
for (i = 0; i < s.strtab_count; i++)
|
|
{
|
|
if (sorttab[i]->csa_external_offset)
|
|
{
|
|
/* External strtab entry: populate the synthetic external strtab.
|
|
|
|
This is safe because you cannot ctf_rollback to before the point
|
|
when a ctf_update is done, and the strtab is written at ctf_update
|
|
time. So any atoms we reference here are sure to stick around
|
|
until ctf_file_close. */
|
|
|
|
any_external = 1;
|
|
ctf_str_update_refs (sorttab[i], sorttab[i]->csa_external_offset);
|
|
if (ctf_dynhash_insert (fp->ctf_syn_ext_strtab,
|
|
(void *) (uintptr_t)
|
|
sorttab[i]->csa_external_offset,
|
|
(void *) sorttab[i]->csa_str) < 0)
|
|
goto oom_strtab;
|
|
sorttab[i]->csa_offset = sorttab[i]->csa_external_offset;
|
|
}
|
|
else
|
|
{
|
|
/* Internal strtab entry with refs: actually add to the string
|
|
table. */
|
|
|
|
ctf_str_update_refs (sorttab[i], cur_stroff);
|
|
sorttab[i]->csa_offset = cur_stroff;
|
|
strcpy (&strtab.cts_strs[cur_stroff], sorttab[i]->csa_str);
|
|
cur_stroff += strlen (sorttab[i]->csa_str) + 1;
|
|
}
|
|
}
|
|
free (sorttab);
|
|
|
|
if (!any_external)
|
|
{
|
|
ctf_dynhash_destroy (fp->ctf_syn_ext_strtab);
|
|
fp->ctf_syn_ext_strtab = NULL;
|
|
}
|
|
|
|
/* All the provisional strtab entries are now real strtab entries, and
|
|
ctf_strptr() will find them there. The provisional offset now starts right
|
|
beyond the new end of the strtab. */
|
|
|
|
ctf_dynhash_empty (fp->ctf_prov_strtab);
|
|
fp->ctf_str_prov_offset = strtab.cts_len + 1;
|
|
return strtab;
|
|
|
|
oom_strtab:
|
|
free (strtab.cts_strs);
|
|
strtab.cts_strs = NULL;
|
|
oom_sorttab:
|
|
free (sorttab);
|
|
oom:
|
|
return strtab;
|
|
}
|