diff options
Diffstat (limited to 'libctf/ctf-impl.h')
| -rw-r--r-- | libctf/ctf-impl.h | 54 |
1 files changed, 36 insertions, 18 deletions
diff --git a/libctf/ctf-impl.h b/libctf/ctf-impl.h index 211099e..d284717 100644 --- a/libctf/ctf-impl.h +++ b/libctf/ctf-impl.h @@ -89,11 +89,17 @@ typedef struct ctf_dmodel size_t ctd_long; /* Size of long in bytes. */ } ctf_dmodel_t; +typedef struct ctf_names +{ + ctf_hash_t *ctn_readonly; /* Hash table when readonly. */ + ctf_dynhash_t *ctn_writable; /* Hash table when writable. */ +} ctf_names_t; + typedef struct ctf_lookup { const char *ctl_prefix; /* String prefix for this lookup. */ size_t ctl_len; /* Length of prefix string in bytes. */ - ctf_hash_t *ctl_hash; /* Pointer to hash table for lookup. */ + ctf_names_t *ctl_hash; /* Pointer to hash table for lookup. */ } ctf_lookup_t; typedef struct ctf_fileops @@ -152,9 +158,8 @@ typedef struct ctf_dmdef typedef struct ctf_dtdef { ctf_list_t dtd_list; /* List forward/back pointers. */ - char *dtd_name; /* Name associated with definition (if any). */ ctf_id_t dtd_type; /* Type identifier for this definition. */ - ctf_type_t dtd_data; /* Type node: name left unpopulated. */ + ctf_type_t dtd_data; /* Type node, including name. */ union { ctf_list_t dtu_members; /* struct, union, or enum */ @@ -193,7 +198,8 @@ typedef struct ctf_str_atom { const char *csa_str; /* Backpointer to string (hash key). */ ctf_list_t csa_refs; /* This string's refs. */ - uint32_t csa_offset; /* External strtab offset, if any. */ + uint32_t csa_offset; /* Strtab offset, if any. */ + uint32_t csa_external_offset; /* External strtab offset, if any. */ unsigned long csa_snapshot_id; /* Snapshot ID at time of creation. */ } ctf_str_atom_t; @@ -235,17 +241,20 @@ struct ctf_file ctf_sect_t ctf_data; /* CTF data from object file. */ ctf_sect_t ctf_symtab; /* Symbol table from object file. */ ctf_sect_t ctf_strtab; /* String table from object file. */ + ctf_dynhash_t *ctf_prov_strtab; /* Maps provisional-strtab offsets + to names. */ ctf_dynhash_t *ctf_syn_ext_strtab; /* Maps ext-strtab offsets to names. */ void *ctf_data_mmapped; /* CTF data we mmapped, to free later. */ size_t ctf_data_mmapped_len; /* Length of CTF data we mmapped. */ - ctf_hash_t *ctf_structs; /* Hash table of struct types. */ - ctf_hash_t *ctf_unions; /* Hash table of union types. */ - ctf_hash_t *ctf_enums; /* Hash table of enum types. */ - ctf_hash_t *ctf_names; /* Hash table of remaining type names. */ - ctf_lookup_t ctf_lookups[5]; /* Pointers to hashes for name lookup. */ + ctf_names_t ctf_structs; /* Hash table of struct types. */ + ctf_names_t ctf_unions; /* Hash table of union types. */ + ctf_names_t ctf_enums; /* Hash table of enum types. */ + ctf_names_t ctf_names; /* Hash table of remaining type names. */ + ctf_lookup_t ctf_lookups[5]; /* Pointers to nametabs for name lookup. */ ctf_strs_t ctf_str[2]; /* Array of string table base and bounds. */ ctf_dynhash_t *ctf_str_atoms; /* Hash table of ctf_str_atoms_t. */ uint64_t ctf_str_num_refs; /* Number of refs to cts_str_atoms. */ + uint32_t ctf_str_prov_offset; /* Latest provisional offset assigned so far. */ unsigned char *ctf_base; /* CTF file pointer. */ unsigned char *ctf_dynbase; /* Freeable CTF file pointer. */ unsigned char *ctf_buf; /* Uncompressed CTF data buffer. */ @@ -254,6 +263,7 @@ struct ctf_file unsigned long ctf_nsyms; /* Number of entries in symtab xlate table. */ uint32_t *ctf_txlate; /* Translation table for type IDs. */ uint32_t *ctf_ptrtab; /* Translation table for pointer-to lookups. */ + size_t ctf_ptrtab_len; /* Num types storable in ptrtab currently. */ struct ctf_varent *ctf_vars; /* Sorted variable->type mapping. */ unsigned long ctf_nvars; /* Number of variables in ctf_vars. */ unsigned long ctf_typemax; /* Maximum valid type ID number. */ @@ -270,11 +280,9 @@ struct ctf_file int ctf_errno; /* Error code for most recent error. */ int ctf_version; /* CTF data version. */ ctf_dynhash_t *ctf_dthash; /* Hash of dynamic type definitions. */ - ctf_dynhash_t *ctf_dtbyname; /* DTDs, indexed by name. */ ctf_list_t ctf_dtdefs; /* List of dynamic type definitions. */ ctf_dynhash_t *ctf_dvhash; /* Hash of dynamic variable mappings. */ ctf_list_t ctf_dvdefs; /* List of dynamic variable definitions. */ - unsigned long ctf_dtnextid; /* Next dynamic type id to assign. */ unsigned long ctf_dtoldid; /* Oldest id that has been committed. */ unsigned long ctf_snapshots; /* ctf_snapshot() plus ctf_update() count. */ unsigned long ctf_snapshot_lu; /* ctf_snapshot() call count at last update. */ @@ -320,7 +328,10 @@ struct ctf_archive_internal (id)) #define LCTF_INDEX_TO_TYPEPTR(fp, i) \ - ((ctf_type_t *)((uintptr_t)(fp)->ctf_buf + (fp)->ctf_txlate[(i)])) + ((fp->ctf_flags & LCTF_RDWR) ? \ + &(ctf_dtd_lookup (fp, LCTF_INDEX_TO_TYPE \ + (fp, i, fp->ctf_flags & LCTF_CHILD))->dtd_data) : \ + (ctf_type_t *)((uintptr_t)(fp)->ctf_buf + (fp)->ctf_txlate[(i)])) #define LCTF_INFO_KIND(fp, info) ((fp)->ctf_fileops->ctfo_get_kind(info)) #define LCTF_INFO_ISROOT(fp, info) ((fp)->ctf_fileops->ctfo_get_root(info)) @@ -340,7 +351,11 @@ static inline ssize_t ctf_get_ctt_size (const ctf_file_t *fp, #define LCTF_RDWR 0x0002 /* CTF container is writable */ #define LCTF_DIRTY 0x0004 /* CTF container has been modified */ +extern ctf_names_t *ctf_name_table (ctf_file_t *, int); extern const ctf_type_t *ctf_lookup_by_id (ctf_file_t **, ctf_id_t); +extern ctf_id_t ctf_lookup_by_rawname (ctf_file_t *, int, const char *); +extern ctf_id_t ctf_lookup_by_rawhash (ctf_file_t *, ctf_names_t *, const char *); +extern void ctf_set_ctl_hashes (ctf_file_t *); typedef unsigned int (*ctf_hash_fun) (const void *ptr); extern unsigned int ctf_hash_integer (const void *ptr); @@ -381,8 +396,9 @@ extern void ctf_dynhash_iter_remove (ctf_dynhash_t *, ctf_hash_iter_remove_f, extern void ctf_list_append (ctf_list_t *, void *); extern void ctf_list_prepend (ctf_list_t *, void *); extern void ctf_list_delete (ctf_list_t *, void *); +extern int ctf_list_empty_p (ctf_list_t *lp); -extern int ctf_dtd_insert (ctf_file_t *, ctf_dtdef_t *); +extern int ctf_dtd_insert (ctf_file_t *, ctf_dtdef_t *, int); extern void ctf_dtd_delete (ctf_file_t *, ctf_dtdef_t *); extern ctf_dtdef_t *ctf_dtd_lookup (const ctf_file_t *, ctf_id_t); extern ctf_dtdef_t *ctf_dynamic_type (const ctf_file_t *, ctf_id_t); @@ -410,9 +426,10 @@ extern const char *ctf_strraw_explicit (ctf_file_t *, uint32_t, ctf_strs_t *); extern int ctf_str_create_atoms (ctf_file_t *); extern void ctf_str_free_atoms (ctf_file_t *); -extern const char *ctf_str_add (ctf_file_t *, const char *); -extern const char *ctf_str_add_ref (ctf_file_t *, const char *, uint32_t *ref); -extern const char *ctf_str_add_external (ctf_file_t *, const char *, uint32_t offset); +extern uint32_t ctf_str_add (ctf_file_t *, const char *); +extern uint32_t ctf_str_add_ref (ctf_file_t *, const char *, uint32_t *ref); +extern int ctf_str_add_external (ctf_file_t *, const char *, uint32_t offset); +extern void ctf_str_remove_ref (ctf_file_t *, const char *, uint32_t *ref); extern void ctf_str_rollback (ctf_file_t *, ctf_snapshot_id_t); extern void ctf_str_purge_refs (ctf_file_t *); extern ctf_strs_writable_t ctf_str_write_strtab (ctf_file_t *); @@ -426,10 +443,11 @@ extern unsigned long ctf_set_errno (ctf_file_t *, int); extern ctf_file_t *ctf_simple_open_internal (const char *, size_t, const char *, size_t, size_t, const char *, size_t, - ctf_dynhash_t *, int *); + ctf_dynhash_t *, int, int *); extern ctf_file_t *ctf_bufopen_internal (const ctf_sect_t *, const ctf_sect_t *, const ctf_sect_t *, ctf_dynhash_t *, - int *); + int, int *); +extern int ctf_serialize (ctf_file_t *); _libctf_malloc_ extern void *ctf_mmap (size_t length, size_t offset, int fd); |