[v2] traceeval: Add way to extract the number of elements

Commit Message

Steven Rostedt Oct. 3, 2023, 1:42 p.m. UTC

From: "Steven Rostedt (Google)" <[e-mail]>

Add traceeval_count() that will return the number of elements in the
traceeval. This can be useful for allocating an array to store the
elements. By getting the count, the allocation can be done first and
then iterated to load the elements into the array.

Signed-off-by: Steven Rostedt (Google) <[e-mail]>
---
Changes since v1: https://lore.kernel.org/linux-trace-devel/[e-mail]

 - Do not use "update_counter" for count, but create a new nr_elements
   to keep track of the number of elements in the traceeval (Ross Zwisler)

 include/traceeval-hist.h |  2 ++
 src/eval-local.h         |  1 +
 src/histograms.c         | 17 +++++++++++++++++
 3 files changed, 20 insertions(+)

Comments

Ross Zwisler Oct. 3, 2023, 3:29 p.m. UTC | #1

On Tue, Oct 03, 2023 at 09:42:06AM -0400, Steven Rostedt wrote:
> From: "Steven Rostedt (Google)" <[e-mail]>
> 
> Add traceeval_count() that will return the number of elements in the
> traceeval. This can be useful for allocating an array to store the
> elements. By getting the count, the allocation can be done first and
> then iterated to load the elements into the array.
> 
> Signed-off-by: Steven Rostedt (Google) <[e-mail]>

Reviewed-by: Ross Zwisler <[e-mail]>

Patch

diff --git a/include/traceeval-hist.h b/include/traceeval-hist.h
index 0c29977671a3..65a905034773 100644
--- a/include/traceeval-hist.h
+++ b/include/traceeval-hist.h
@@ -204,6 +204,8 @@  int traceeval_query_size(struct traceeval *teval, const struct traceeval_data *k
 void traceeval_results_release(struct traceeval *teval,
 			       const struct traceeval_data *results);
 
+size_t traceeval_count(struct traceeval *teval);
+
 #define traceeval_stat(teval, keys, type)				\
 	traceeval_stat_size(teval, keys, TRACEEVAL_ARRAY_SIZE(keys), type)
 
diff --git a/src/eval-local.h b/src/eval-local.h
index f0917b6a45e9..805ec25ff1f4 100644
--- a/src/eval-local.h
+++ b/src/eval-local.h
@@ -69,6 +69,7 @@  struct traceeval {
 	size_t				nr_key_types;
 	size_t				nr_val_types;
 	size_t				update_counter;
+	size_t				nr_elements;
 	size_t				sizeof_type;
 	size_t				sizeof_data;
 };
diff --git a/src/histograms.c b/src/histograms.c
index bfeb162fffe4..483abaf802dc 100644
--- a/src/histograms.c
+++ b/src/histograms.c
@@ -786,6 +786,7 @@  static int create_entry(struct traceeval *teval,
 	entry->vals = new_vals;
 
 	teval->update_counter++;
+	teval->nr_elements++;
 
 	return 0;
 
@@ -1002,11 +1003,26 @@  int traceeval_remove_size(struct traceeval *teval,
 	hash_remove(hist, &entry->hash);
 	free_entry(teval, entry);
 
+	/* update_counter is used to know if there was an update. */
 	teval->update_counter++;
 
+	/* nr_elements keeps track of the number of stored elemnets */
+	teval->nr_elements--;
+
 	return 1;
 }
 
+/**
+ * traceeval_count - Return the number of elements in the traceeval
+ * @teval: The traceeval handle to get the count from
+ *
+ * Returns the number of elements stored by unique keys in the @teval.
+ */
+size_t traceeval_count(struct traceeval *teval)
+{
+	return teval->nr_elements;
+}
+
 /**
  * traceeval_iterator_put - release a given iterator
  * @iter: The iterartor to release
@@ -1457,6 +1473,7 @@  int traceeval_iterator_remove(struct traceeval_iterator *iter)
 	/* The entry no longer exists */
 	iter->entries[iter->next - 1] = NULL;
 	teval->update_counter++;
+	teval->nr_elements--;
 
 	return 1;
 }