@@ -957,6 +957,145 @@ ssize_t kshark_load_data_records(struct kshark_context *kshark_ctx,
return -ENOMEM;
}
+static inline void free_ptr(void *ptr)
+{
+ if (ptr)
+ free(*(void **)ptr);
+}
+
+static bool data_matrix_alloc(size_t n_rows, uint64_t **offset_array,
+ uint16_t **cpu_array,
+ uint64_t **ts_array,
+ uint16_t **pid_array,
+ int **event_array)
+{
+ if (offset_array) {
+ *offset_array = calloc(n_rows, sizeof(**offset_array));
+ if (!*offset_array)
+ return false;
+ }
+
+ if (cpu_array) {
+ *cpu_array = calloc(n_rows, sizeof(**cpu_array));
+ if (!*cpu_array)
+ goto free_offset;
+ }
+
+ if (ts_array) {
+ *ts_array = calloc(n_rows, sizeof(**ts_array));
+ if (!*ts_array)
+ goto free_cpu;
+ }
+
+ if (pid_array) {
+ *pid_array = calloc(n_rows, sizeof(**pid_array));
+ if (!*pid_array)
+ goto free_ts;
+ }
+
+ if (event_array) {
+ *event_array = calloc(n_rows, sizeof(**event_array));
+ if (!*event_array)
+ goto free_pid;
+ }
+
+ return true;
+
+ free_pid:
+ free_ptr(pid_array);
+ free_ts:
+ free_ptr(ts_array);
+ free_cpu:
+ free_ptr(cpu_array);
+ free_offset:
+ free_ptr(offset_array);
+
+ fprintf(stderr, "Failed to allocate memory during data loading.\n");
+ return false;
+}
+
+/**
+ * @brief Load the content of the trace data file into a table / matrix made
+ * of columns / arrays of data. The user is responsible for freeing the
+ * elements of the outputted array
+ *
+ * @param kshark_ctx: Input location for the session context pointer.
+ * @param offset_array: Output location for the array of record offsets.
+ * @param cpu_array: Output location for the array of CPU Ids.
+ * @param ts_array: Output location for the array of timestamps.
+ * @param pid_array: Output location for the array of Process Ids.
+ * @param event_array: Output location for the array of Event Ids.
+ *
+ * @returns The size of the outputted arrays in the case of success, or a
+ * negative error code on failure.
+ */
+size_t kshark_load_data_matrix(struct kshark_context *kshark_ctx,
+ uint64_t **offset_array,
+ uint16_t **cpu_array,
+ uint64_t **ts_array,
+ uint16_t **pid_array,
+ int **event_array)
+{
+ enum rec_type type = REC_ENTRY;
+ struct rec_list **rec_list;
+ size_t count, total = 0;
+ bool status;
+ int n_cpus;
+
+ total = get_records(kshark_ctx, &rec_list, type);
+ if (total < 0)
+ goto fail;
+
+ n_cpus = tracecmd_cpus(kshark_ctx->handle);
+
+ status = data_matrix_alloc(total, offset_array,
+ cpu_array,
+ ts_array,
+ pid_array,
+ event_array);
+ if (!status)
+ goto fail_free;
+
+ for (count = 0; count < total; count++) {
+ int next_cpu;
+
+ next_cpu = pick_next_cpu(rec_list, n_cpus, type);
+ if (next_cpu >= 0) {
+ struct rec_list *rec = rec_list[next_cpu];
+ struct kshark_entry *e = &rec->entry;
+
+ if (offset_array)
+ (*offset_array)[count] = e->offset;
+
+ if (cpu_array)
+ (*cpu_array)[count] = e->cpu;
+
+ if (ts_array)
+ (*ts_array)[count] = e->ts;
+
+ if (pid_array)
+ (*pid_array)[count] = e->pid;
+
+ if (event_array)
+ (*event_array)[count] = e->event_id;
+
+ rec_list[next_cpu] = rec_list[next_cpu]->next;
+ free(rec);
+ }
+ }
+
+ /* There should be no entries left in rec_list. */
+ free_rec_list(rec_list, n_cpus, type);
+ return total;
+
+ fail_free:
+ free_rec_list(rec_list, n_cpus, type);
+
+ fail:
+ fprintf(stderr, "Failed to allocate memory during data loading.\n");
+ return -ENOMEM;
+}
+
static const char *kshark_get_latency(struct tep_handle *pe,
struct tep_record *record)
{
@@ -149,6 +149,13 @@ ssize_t kshark_load_data_entries(struct kshark_context *kshark_ctx,
ssize_t kshark_load_data_records(struct kshark_context *kshark_ctx,
struct tep_record ***data_rows);
+size_t kshark_load_data_matrix(struct kshark_context *kshark_ctx,
+ uint64_t **offset_array,
+ uint16_t **cpu_array,
+ uint64_t **ts_array,
+ uint16_t **pid_array,
+ int **event_array);
+
ssize_t kshark_get_task_pids(struct kshark_context *kshark_ctx, int **pids);
void kshark_close(struct kshark_context *kshark_ctx);
The new function loads the content of the trace data file into a table / matrix, made of columns / arrays of data having various integer types. Later those arrays will be wrapped as NumPy arrays. Signed-off-by: Yordan Karadzhov <ykaradzhov@vmware.com> --- kernel-shark/src/libkshark.c | 139 +++++++++++++++++++++++++++++++++++ kernel-shark/src/libkshark.h | 7 ++ 2 files changed, 146 insertions(+)