From: Stevie Alvarez <stevie.6strings@gmail.com>
To: linux-trace-devel@vger.kernel.org
Cc: "Stevie Alvarez (Google)" <stevie.6strings@gmail.com>,
Steven Rostedt <rostedt@goodmis.org>,
Ross Zwisler <zwisler@google.com>
Subject: [PATCH v2 3/5] histograms: Add traceeval release
Date: Thu, 3 Aug 2023 18:54:01 -0400 [thread overview]
Message-ID: <20230803225413.40697-4-stevie.6strings@gmail.com> (raw)
In-Reply-To: <20230803225413.40697-1-stevie.6strings@gmail.com>
From: "Stevie Alvarez (Google)" <stevie.6strings@gmail.com>
traceeval_release() deconstructs a given struct traceeval instance. It
frees any data allocated to the heap within the entries to the histogram,
and the names allocated for the struct traceeval_type key-value
definitions.
Signed-off-by: Stevie Alvarez (Google) <stevie.6strings@gmail.com>
---
include/traceeval-hist.h | 2 +
src/histograms.c | 84 ++++++++++++++++++++++++++++++++++++++++
2 files changed, 86 insertions(+)
diff --git a/include/traceeval-hist.h b/include/traceeval-hist.h
index 5bea025..cd74d3e 100644
--- a/include/traceeval-hist.h
+++ b/include/traceeval-hist.h
@@ -130,4 +130,6 @@ struct traceeval;
struct traceeval *traceeval_init(const struct traceeval_type *keys,
const struct traceeval_type *vals);
+void traceeval_release(struct traceeval *teval);
+
#endif /* __LIBTRACEEVAL_HIST_H__ */
diff --git a/src/histograms.c b/src/histograms.c
index be17b89..95243b0 100644
--- a/src/histograms.c
+++ b/src/histograms.c
@@ -221,3 +221,87 @@ fail_init_unalloced:
print_err(err_msg);
return NULL;
}
+
+/*
+ * Free any specified dynamic data in @data.
+ */
+static void clean_data(union traceeval_data *data, struct traceeval_type *defs,
+ size_t size)
+{
+ size_t i;
+
+ if (!data || !defs)
+ return;
+
+ for (i = 0; i < size; i++) {
+ switch (defs[i].type) {
+ case TRACEEVAL_TYPE_STRING:
+ free(data[i].string);
+ break;
+ case TRACEEVAL_TYPE_DYNAMIC:
+ if (defs[i].dyn_release)
+ defs[i].dyn_release(data[i].dyn_data, &defs[i]);
+ break;
+ default:
+ break;
+ }
+ }
+}
+
+/*
+ * Free all possible data stored within the entry.
+ */
+static void clean_entry(struct entry *entry, struct traceeval *teval)
+{
+ if (!entry)
+ return;
+
+ /* free dynamic traceeval_data */
+ clean_data(entry->keys, teval->key_types, teval->nr_key_types);
+ clean_data(entry->vals, teval->val_types, teval->nr_val_types);
+ free(entry->keys);
+ free(entry->vals);
+}
+
+/*
+ * Free the hist_table allocated to a traceeval instance.
+ */
+static void hist_table_release(struct traceeval *teval)
+{
+ struct hist_table *hist = teval->hist;
+
+ if (!hist)
+ return;
+
+ for (size_t i = 0; i < hist->nr_entries; i++) {
+ clean_entry(&hist->map[i], teval);
+ }
+
+ free(hist->map);
+ free(hist);
+ teval->hist = NULL;
+}
+
+/*
+ * traceeval_release - release a traceeval descriptor
+ * @teval: An instance of traceeval returned by traceeval_init()
+ *
+ * When the caller of traceeval_init() is done with the returned @teval,
+ * it must call traceeval_release().
+ *
+ * This frees all internally allocated data of @teval and will call the
+ * corresponding dyn_release() functions registered for keys and values of
+ * type TRACEEVAL_TYPE_DYNAMIC.
+ */
+void traceeval_release(struct traceeval *teval)
+{
+ if (!teval)
+ return;
+
+ hist_table_release(teval);
+ type_release(teval->key_types, teval->nr_key_types);
+ type_release(teval->val_types, teval->nr_val_types);
+ teval->key_types = NULL;
+ teval->val_types = NULL;
+ free(teval);
+}
--
2.41.0
next prev parent reply other threads:[~2023-08-03 22:54 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-03 22:53 [PATCH v2 0/5] histograms: bug fixes and convention compliance Stevie Alvarez
2023-08-03 22:53 ` [PATCH v2 1/5] histograms: Initial histograms interface Stevie Alvarez
2023-08-04 13:50 ` Steven Rostedt
2023-08-04 17:41 ` Stevie Alvarez
2023-08-04 17:57 ` Steven Rostedt
2023-08-04 18:25 ` Stevie Alvarez
2023-08-03 22:54 ` [PATCH v2 2/5] histograms: Add traceeval initialize Stevie Alvarez
2023-08-04 14:40 ` Steven Rostedt
2023-08-04 18:23 ` Stevie Alvarez
2023-08-04 19:20 ` Steven Rostedt
2023-08-03 22:54 ` Stevie Alvarez [this message]
2023-08-04 14:55 ` [PATCH v2 3/5] histograms: Add traceeval release Steven Rostedt
2023-08-03 22:54 ` [PATCH v2 4/5] histograms: Add traceeval compare Stevie Alvarez
2023-08-04 15:24 ` Steven Rostedt
2023-08-07 23:40 ` Ross Zwisler
2023-08-03 22:54 ` [PATCH v2 5/5] histograms: Initial unit tests Stevie Alvarez
2023-08-04 12:37 ` [PATCH v2 0/5] histograms: bug fixes and convention compliance Steven Rostedt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230803225413.40697-4-stevie.6strings@gmail.com \
--to=stevie.6strings@gmail.com \
--cc=linux-trace-devel@vger.kernel.org \
--cc=rostedt@goodmis.org \
--cc=zwisler@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.