From: Stevie Alvarez <stevie.6strings@gmail.com>
To: linux-trace-devel@vger.kernel.org
Cc: Stevie Alvarez <stevie.6strings@gmail.com>,
Steven Rostedt <rostedt@goodmis.org>,
Ross Zwisler <zwisler@google.com>
Subject: [PATCH v4 5/5] histograms: Add traceeval insert
Date: Wed, 9 Aug 2023 13:53:38 -0400 [thread overview]
Message-ID: <20230809175340.3066-6-stevie.6strings@gmail.com> (raw)
In-Reply-To: <20230809175340.3066-1-stevie.6strings@gmail.com>
From: Stevie Alvarez (Google) <stevie.6strings@gmail.com>
traceeval_insert() updates the provided struct traceeval's histogram.
If an entry that exists with a keys field that match the keys argument,
the entries vals field are updated with a copy of the vals argument.
If such an entry does not exist, a new entry is added to the histogram,
with respect to the keys and vals arguments.
Signed-off-by: Stevie Alvarez (Google) <stevie.6strings@gmail.com>
---
include/traceeval-hist.h | 4 ++
src/histograms.c | 114 +++++++++++++++++++++++++++++++++++++++
2 files changed, 118 insertions(+)
diff --git a/include/traceeval-hist.h b/include/traceeval-hist.h
index 82cfbb1..08e0696 100644
--- a/include/traceeval-hist.h
+++ b/include/traceeval-hist.h
@@ -134,6 +134,10 @@ struct traceeval *traceeval_init(const struct traceeval_type *keys,
void traceeval_release(struct traceeval *teval);
+int traceeval_insert(struct traceeval *teval,
+ const union traceeval_data *keys,
+ const union traceeval_data *vals);
+
int traceeval_query(struct traceeval *teval, const union traceeval_data *keys,
union traceeval_data **results);
diff --git a/src/histograms.c b/src/histograms.c
index 1b6e3a0..a159892 100644
--- a/src/histograms.c
+++ b/src/histograms.c
@@ -688,3 +688,117 @@ void traceeval_results_release(struct traceeval *teval,
data_release(teval->nr_val_types, &results, teval->val_types);
}
+
+/*
+ * Create a new entry in @teval with respect to @keys and @vals.
+ *
+ * Returns 0 on success, -1 on error.
+ */
+static int create_entry(struct traceeval *teval,
+ const union traceeval_data *keys,
+ const union traceeval_data *vals)
+{
+ union traceeval_data *new_keys;
+ union traceeval_data *new_vals;
+ struct entry *tmp_map;
+ struct hist_table *hist = teval->hist;
+
+ /* copy keys */
+ if (copy_traceeval_data_set(teval->nr_key_types, teval->key_types,
+ keys, &new_keys) == -1)
+ return -1;
+
+ /* copy vals */
+ if (copy_traceeval_data_set(teval->nr_val_types, teval->val_types,
+ vals, &new_vals) == -1)
+ goto fail_vals;
+
+ /* create new entry */
+ tmp_map = realloc(hist->map, ++hist->nr_entries * sizeof(*tmp_map));
+ if (!tmp_map)
+ goto fail;
+ tmp_map->keys = new_keys;
+ tmp_map->vals = new_vals;
+ hist->map = tmp_map;
+
+ return 0;
+
+fail:
+ data_release(teval->nr_val_types, &new_vals, teval->val_types);
+
+fail_vals:
+ data_release(teval->nr_key_types, &new_keys, teval->key_types);
+ return -1;
+}
+
+/*
+ * Update @entry's vals field with a copy of @vals, with respect to @teval.
+ *
+ * Frees the old vals field of @entry, unless an error occurs.
+ *
+ * Return 0 on success, -1 on error.
+ */
+static int update_entry(struct traceeval *teval, struct entry *entry,
+ const union traceeval_data *vals)
+{
+ union traceeval_data *new_vals;
+
+ if (copy_traceeval_data_set(teval->nr_val_types, teval->val_types,
+ vals, &new_vals) == -1)
+ return -1;
+
+ clean_data_set(entry->vals, teval->val_types, teval->nr_val_types);
+ entry->vals = new_vals;
+ return 0;
+}
+
+/*
+ * traceeval_insert - insert an item into the traceeval descriptor
+ * @teval: The descriptor to insert into
+ * @keys: The list of keys that defines what is being inserted.
+ * @vals: The list of values that defines what is being inserted.
+ *
+ * The @keys is an array that holds the data in the order of the keys
+ * passed into traceeval_init(). That is, if traceeval_init() had
+ * keys = { { .type = TRACEEVAL_STRING }, { .type = TRACEEVAL_NUMBER_8 },
+ * { .type = TRACEEVAL_NONE } }; then the @keys array passed in must
+ * be a string (char *) followed by a 8 byte number (char).
+ *
+ * The @keys and @vals are only examined to where it expects data. That is,
+ * if the traceeval_init() keys had 3 items where the first two was defining
+ * data, and the last one was the TRACEEVAL_TYPE_NONE, then the @keys
+ * here only needs to be an array of 2, inserting the two items defined
+ * by traceeval_init(). The same goes for @vals.
+ *
+ * If an entry with keys that match @keys exists, it's vals field is freed and
+ * set to a copy of @vals. This process calls dyn_release() on any data of
+ * type TRACEEVAL_TYPE_DYNAMIC.
+ * Otherwise, a new entry is created with copies of @keys and @vals.
+ *
+ * For all elements of @keys and @vals that correspond to a struct
+ * traceeval_type of type TRACEEVAL_TYPE_STRING, the string field must be set
+ * a valid pointer or NULL.
+ *
+ * On error, @teval is left unchanged.
+ *
+ * Returns 0 on success, and -1 on error.
+ */
+int traceeval_insert(struct traceeval *teval,
+ const union traceeval_data *keys,
+ const union traceeval_data *vals)
+{
+ struct entry *entry;
+ int check;
+
+ entry = NULL;
+ check = get_entry(teval, keys, &entry);
+
+ if (check == -1)
+ return check;
+
+ /* insert key-value pair */
+ if (check == 0)
+ return create_entry(teval, keys, vals);
+ else
+ return update_entry(teval, entry, vals);
+}
--
2.41.0
next prev parent reply other threads:[~2023-08-09 17:53 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-09 17:53 [PATCH v4 0/5] histograms: Fix memory leak, logic bugs, legibility Stevie Alvarez
2023-08-09 17:53 ` [PATCH v4 1/5] histograms: Initial histograms interface Stevie Alvarez
2023-08-09 18:53 ` Steven Rostedt
2023-08-09 17:53 ` [PATCH v4 2/5] histograms: Add traceeval initialize and release Stevie Alvarez
2023-08-09 19:04 ` Steven Rostedt
2023-08-09 17:53 ` [PATCH v4 3/5] histograms: Add traceeval compare Stevie Alvarez
2023-08-09 17:53 ` [PATCH v4 4/5] histograms: Add traceeval query Stevie Alvarez
2023-08-09 19:57 ` Steven Rostedt
2023-08-11 2:00 ` Steven Rostedt
2023-08-09 17:53 ` Stevie Alvarez [this message]
2023-08-10 2:57 ` [PATCH v4 5/5] histograms: Add traceeval insert Steven Rostedt
2023-08-09 18:30 ` [PATCH v4 0/5] histograms: Fix memory leak, logic bugs, legibility Steven Rostedt
2023-08-10 21:16 ` Ross Zwisler
2023-08-17 22:08 ` 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=20230809175340.3066-6-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).