This flag was meant as an optimization to avoid reserializing dicts
unnecessarily. It was critically necessary back when serialization was
done by ctf_update() and you had to call that every time you wanted any
new modifications to the type table to be usable by other types, but
that has been unnecessary for years now, and serialization is only done
once when writing out, which one would naturally assume would always
serialize the dict. Worse, it never really worked: it only tracked
newly-added types, not things like added symbols which might equally
well require reserialization, and it gets in the way of an upcoming
change. Delete entirely.
libctf/
* ctf-create.c (ctf_create): Drop LCTF_DIRTY.
(ctf_discard): Likewise.
(ctf_rollback): Likewise.
(ctf_add_generic): Likewise.
(ctf_set_array): Likewise.
(ctf_add_enumerator): Likewise.
(ctf_add_member_offset): Likewise.
(ctf_add_variable_forced): Likewise.
* ctf-link.c (ctf_link_intern_extern_string): Likewise.
(ctf_link_add_strtab): Likewise.
* ctf-serialize.c (ctf_serialize): Likewise.
* ctf-impl.h (LCTF_DIRTY): Likewise.
(LCTF_LINKING): Renumber.
---
libctf/ctf-create.c | 15 ---------------
libctf/ctf-impl.h | 3 +--
libctf/ctf-link.c | 2 --
libctf/ctf-serialize.c | 5 -----
4 files changed, 1 insertion(+), 24 deletions(-)
@@ -148,7 +148,6 @@ ctf_create (int *errp)
fp->ctf_names = names;
fp->ctf_dtoldid = 0;
fp->ctf_snapshot_lu = 0;
- fp->ctf_flags |= LCTF_DIRTY;
/* Make sure the ptrtab starts out at a reasonable size. */
@@ -347,10 +346,6 @@ ctf_discard (ctf_dict_t *fp)
{ fp->ctf_dtoldid,
fp->ctf_snapshot_lu + 1 };
- /* Update required? */
- if (!(fp->ctf_flags & LCTF_DIRTY))
- return 0;
-
return (ctf_rollback (fp, last_update));
}
@@ -415,9 +410,6 @@ ctf_rollback (ctf_dict_t *fp, ctf_snapshot_id_t id)
fp->ctf_typemax = id.dtd_id;
fp->ctf_snapshots = id.snapshot_id;
- if (fp->ctf_snapshots == fp->ctf_snapshot_lu)
- fp->ctf_flags &= ~LCTF_DIRTY;
-
return 0;
}
@@ -482,8 +474,6 @@ ctf_add_generic (ctf_dict_t *fp, uint32_t flag, const char *name, int kind,
if (ctf_dtd_insert (fp, dtd, flag, kind) < 0)
goto err; /* errno is set for us. */
- fp->ctf_flags |= LCTF_DIRTY;
-
*rp = dtd;
return type;
@@ -729,7 +719,6 @@ ctf_set_array (ctf_dict_t *fp, ctf_id_t type, const ctf_arinfo_t *arp)
return (ctf_set_errno (ofp, ECTF_BADID));
vlen = (ctf_array_t *) dtd->dtd_vlen;
- fp->ctf_flags |= LCTF_DIRTY;
vlen->cta_contents = (uint32_t) arp->ctr_contents;
vlen->cta_index = (uint32_t) arp->ctr_index;
vlen->cta_nelems = arp->ctr_nelems;
@@ -1113,8 +1102,6 @@ ctf_add_enumerator (ctf_dict_t *fp, ctf_id_t enid, const char *name,
dtd->dtd_data.ctt_info = CTF_TYPE_INFO (kind, root, vlen + 1);
- fp->ctf_flags |= LCTF_DIRTY;
-
return 0;
}
@@ -1296,7 +1283,6 @@ ctf_add_member_offset (ctf_dict_t *fp, ctf_id_t souid, const char *name,
dtd->dtd_data.ctt_lsizelo = CTF_SIZE_TO_LSIZE_LO (ssize);
dtd->dtd_data.ctt_info = CTF_TYPE_INFO (kind, root, vlen + 1);
- fp->ctf_flags |= LCTF_DIRTY;
return 0;
}
@@ -1365,7 +1351,6 @@ ctf_add_variable_forced (ctf_dict_t *fp, const char *name, ctf_id_t ref)
return -1; /* errno is set for us. */
}
- fp->ctf_flags |= LCTF_DIRTY;
return 0;
}
@@ -589,8 +589,7 @@ struct ctf_next
((fp)->ctf_dictops->ctfo_get_vbytes(fp, kind, size, vlen))
#define LCTF_CHILD 0x0001 /* CTF dict is a child. */
-#define LCTF_DIRTY 0x0002 /* CTF dict has been modified. */
-#define LCTF_LINKING 0x0004 /* CTF link is underway: respect ctf_link_flags. */
+#define LCTF_LINKING 0x0002 /* CTF link is underway: respect ctf_link_flags. */
extern ctf_dynhash_t *ctf_name_table (ctf_dict_t *, int);
extern const ctf_type_t *ctf_lookup_by_id (ctf_dict_t **, ctf_id_t);
@@ -1568,7 +1568,6 @@ ctf_link_intern_extern_string (void *key _libctf_unused_, void *value,
ctf_dict_t *fp = (ctf_dict_t *) value;
ctf_link_out_string_cb_arg_t *arg = (ctf_link_out_string_cb_arg_t *) arg_;
- fp->ctf_flags |= LCTF_DIRTY;
if (!ctf_str_add_external (fp, arg->str, arg->offset))
arg->err = ENOMEM;
}
@@ -1596,7 +1595,6 @@ ctf_link_add_strtab (ctf_dict_t *fp, ctf_link_strtab_string_f *add_string,
{
ctf_link_out_string_cb_arg_t iter_arg = { str, offset, 0 };
- fp->ctf_flags |= LCTF_DIRTY;
if (!ctf_str_add_external (fp, str, offset))
err = ENOMEM;
@@ -980,10 +980,6 @@ ctf_serialize (ctf_dict_t *fp)
if (fp->ctf_stypes > 0)
return (ctf_set_errno (fp, ECTF_RDONLY));
- /* Update required? */
- if (!(fp->ctf_flags & LCTF_DIRTY))
- return 0;
-
/* The strtab refs table must be empty at this stage. Any refs already added
will be corrupted by any modifications, including reserialization, after
strtab finalization is complete. Only this function, and functions it
@@ -1156,7 +1152,6 @@ ctf_serialize (ctf_dict_t *fp)
nfp->ctf_parent = fp->ctf_parent;
nfp->ctf_parent_unreffed = fp->ctf_parent_unreffed;
nfp->ctf_refcnt = fp->ctf_refcnt;
- nfp->ctf_flags |= fp->ctf_flags & ~LCTF_DIRTY;
if (nfp->ctf_dynbase == NULL)
nfp->ctf_dynbase = buf; /* Make sure buf is freed on close. */
nfp->ctf_dthash = fp->ctf_dthash;