@@ -27,18 +27,22 @@ void dump_bin(struct kshark_trace_histo *histo, int bin,
if (strcmp(type, "cpu") == 0) {
e_front = ksmodel_get_entry_front(histo, bin, true,
kshark_match_cpu, val,
+ NULL,
&i_front);
e_back = ksmodel_get_entry_back(histo, bin, true,
kshark_match_cpu, val,
+ NULL,
&i_back);
} else if (strcmp(type, "task") == 0) {
e_front = ksmodel_get_entry_front(histo, bin, true,
kshark_match_pid, val,
+ NULL,
&i_front);
e_back = ksmodel_get_entry_back(histo, bin, true,
kshark_match_pid, val,
+ NULL,
&i_back);
} else {
i_front = ksmodel_first_index_at_bin(histo, bin);
@@ -869,6 +869,7 @@ ssize_t ksmodel_first_index_at_pid(struct kshark_trace_histo *histo,
* @param func: Matching condition function.
* @param val: Matching condition value, used by the Matching condition
* function.
+ * @param col: Optional input location for Data collection.
* @param index: Optional output location for the index of the requested
* entry inside the array.
*
@@ -878,6 +879,7 @@ const struct kshark_entry *
ksmodel_get_entry_front(struct kshark_trace_histo *histo,
int bin, bool vis_only,
matching_condition_func func, int val,
+ struct kshark_entry_collection *col,
ssize_t *index)
{
struct kshark_entry_request *req;
@@ -892,7 +894,12 @@ ksmodel_get_entry_front(struct kshark_trace_histo *histo,
if (!req)
return NULL;
- entry = kshark_get_entry_front(req, histo->data, index);
+ if (col && col->size)
+ entry = kshark_get_collection_entry_front(&req, histo->data,
+ col, index);
+ else
+ entry = kshark_get_entry_front(req, histo->data, index);
+
free(req);
return entry;
@@ -909,6 +916,7 @@ ksmodel_get_entry_front(struct kshark_trace_histo *histo,
* @param func: Matching condition function.
* @param val: Matching condition value, used by the Matching condition
* function.
+ * @param col: Optional input location for Data collection.
* @param index: Optional output location for the index of the requested
* entry inside the array.
*
@@ -918,6 +926,7 @@ const struct kshark_entry *
ksmodel_get_entry_back(struct kshark_trace_histo *histo,
int bin, bool vis_only,
matching_condition_func func, int val,
+ struct kshark_entry_collection *col,
ssize_t *index)
{
struct kshark_entry_request *req;
@@ -932,7 +941,12 @@ ksmodel_get_entry_back(struct kshark_trace_histo *histo,
if (!req)
return NULL;
- entry = kshark_get_entry_back(req, histo->data, index);
+ if (col && col->size)
+ entry = kshark_get_collection_entry_back(&req, histo->data,
+ col, index);
+ else
+ entry = kshark_get_entry_back(req, histo->data, index);
+
free(req);
return entry;
@@ -963,6 +977,7 @@ static int ksmodel_get_entry_pid(const struct kshark_entry *entry)
* @param bin: Bin id.
* @param cpu: CPU Id.
* @param vis_only: If true, a visible entry is requested.
+ * @param col: Optional input location for Data collection.
* @param index: Optional output location for the index of the requested
* entry inside the array.
*
@@ -971,6 +986,7 @@ static int ksmodel_get_entry_pid(const struct kshark_entry *entry)
*/
int ksmodel_get_pid_front(struct kshark_trace_histo *histo,
int bin, int cpu, bool vis_only,
+ struct kshark_entry_collection *col,
ssize_t *index)
{
const struct kshark_entry *entry;
@@ -980,7 +996,8 @@ int ksmodel_get_pid_front(struct kshark_trace_histo *histo,
entry = ksmodel_get_entry_front(histo, bin, vis_only,
kshark_match_cpu, cpu,
- index);
+ col, index);
+
return ksmodel_get_entry_pid(entry);
}
@@ -993,6 +1010,7 @@ int ksmodel_get_pid_front(struct kshark_trace_histo *histo,
* @param bin: Bin id.
* @param cpu: CPU Id.
* @param vis_only: If true, a visible entry is requested.
+ * @param col: Optional input location for Data collection.
* @param index: Optional output location for the index of the requested
* entry inside the array.
*
@@ -1001,6 +1019,7 @@ int ksmodel_get_pid_front(struct kshark_trace_histo *histo,
*/
int ksmodel_get_pid_back(struct kshark_trace_histo *histo,
int bin, int cpu, bool vis_only,
+ struct kshark_entry_collection *col,
ssize_t *index)
{
const struct kshark_entry *entry;
@@ -1010,7 +1029,7 @@ int ksmodel_get_pid_back(struct kshark_trace_histo *histo,
entry = ksmodel_get_entry_back(histo, bin, vis_only,
kshark_match_cpu, cpu,
- index);
+ col, index);
return ksmodel_get_entry_pid(entry);
}
@@ -1040,6 +1059,7 @@ static int ksmodel_get_entry_cpu(const struct kshark_entry *entry)
* @param bin: Bin id.
* @param pid: Process Id.
* @param vis_only: If true, a visible entry is requested.
+ * @param col: Optional input location for Data collection.
* @param index: Optional output location for the index of the requested
* entry inside the array.
*
@@ -1048,6 +1068,7 @@ static int ksmodel_get_entry_cpu(const struct kshark_entry *entry)
*/
int ksmodel_get_cpu_front(struct kshark_trace_histo *histo,
int bin, int pid, bool vis_only,
+ struct kshark_entry_collection *col,
ssize_t *index)
{
const struct kshark_entry *entry;
@@ -1057,6 +1078,7 @@ int ksmodel_get_cpu_front(struct kshark_trace_histo *histo,
entry = ksmodel_get_entry_front(histo, bin, vis_only,
kshark_match_pid, pid,
+ col,
index);
return ksmodel_get_entry_cpu(entry);
}
@@ -1070,6 +1092,7 @@ int ksmodel_get_cpu_front(struct kshark_trace_histo *histo,
* @param bin: Bin id.
* @param pid: Process Id.
* @param vis_only: If true, a visible entry is requested.
+ * @param col: Optional input location for Data collection.
* @param index: Optional output location for the index of the requested
* entry inside the array.
*
@@ -1078,6 +1101,7 @@ int ksmodel_get_cpu_front(struct kshark_trace_histo *histo,
*/
int ksmodel_get_cpu_back(struct kshark_trace_histo *histo,
int bin, int pid, bool vis_only,
+ struct kshark_entry_collection *col,
ssize_t *index)
{
const struct kshark_entry *entry;
@@ -1087,6 +1111,7 @@ int ksmodel_get_cpu_back(struct kshark_trace_histo *histo,
entry = ksmodel_get_entry_back(histo, bin, vis_only,
kshark_match_pid, pid,
+ col,
index);
return ksmodel_get_entry_cpu(entry);
@@ -1098,13 +1123,16 @@ int ksmodel_get_cpu_back(struct kshark_trace_histo *histo,
* @param histo: Input location for the model descriptor.
* @param bin: Bin id.
* @param cpu: Cpu Id.
+ * @param col: Optional input location for Data collection.
* @param index: Optional output location for the index of the requested
* entry inside the array.
*
* @returns True, if a visible entry exists in this bin. Else false.
*/
bool ksmodel_cpu_visible_event_exist(struct kshark_trace_histo *histo,
- int bin, int cpu, ssize_t *index)
+ int bin, int cpu,
+ struct kshark_entry_collection *col,
+ ssize_t *index)
{
struct kshark_entry_request *req;
const struct kshark_entry *entry;
@@ -1126,7 +1154,12 @@ bool ksmodel_cpu_visible_event_exist(struct kshark_trace_histo *histo,
*/
req->vis_mask = KS_EVENT_VIEW_FILTER_MASK;
- entry = kshark_get_entry_front(req, histo->data, index);
+ if (col && col->size)
+ entry = kshark_get_collection_entry_front(&req, histo->data,
+ col, index);
+ else
+ entry = kshark_get_entry_front(req, histo->data, index);
+
free(req);
if (!entry || !entry->visible) {
@@ -1143,13 +1176,16 @@ bool ksmodel_cpu_visible_event_exist(struct kshark_trace_histo *histo,
* @param histo: Input location for the model descriptor.
* @param bin: Bin id.
* @param pid: Process Id of the task.
+ * @param col: Optional input location for Data collection.
* @param index: Optional output location for the index of the requested
* entry inside the array.
*
* @returns True, if a visible entry exists in this bin. Else false.
*/
bool ksmodel_task_visible_event_exist(struct kshark_trace_histo *histo,
- int bin, int pid, ssize_t *index)
+ int bin, int pid,
+ struct kshark_entry_collection *col,
+ ssize_t *index)
{
struct kshark_entry_request *req;
const struct kshark_entry *entry;
@@ -1171,7 +1207,12 @@ bool ksmodel_task_visible_event_exist(struct kshark_trace_histo *histo,
*/
req->vis_mask = KS_EVENT_VIEW_FILTER_MASK;
- entry = kshark_get_entry_front(req, histo->data, index);
+ if (col && col->size)
+ entry = kshark_get_collection_entry_front(&req, histo->data,
+ col, index);
+ else
+ entry = kshark_get_entry_front(req, histo->data, index);
+
free(req);
if (!entry || !entry->visible) {
@@ -108,35 +108,45 @@ const struct kshark_entry *
ksmodel_get_entry_front(struct kshark_trace_histo *histo,
int bin, bool vis_only,
matching_condition_func func, int val,
+ struct kshark_entry_collection *col,
ssize_t *index);
const struct kshark_entry *
ksmodel_get_entry_back(struct kshark_trace_histo *histo,
int bin, bool vis_only,
matching_condition_func func, int val,
+ struct kshark_entry_collection *col,
ssize_t *index);
int ksmodel_get_pid_front(struct kshark_trace_histo *histo,
int bin, int cpu, bool vis_only,
+ struct kshark_entry_collection *col,
ssize_t *index);
int ksmodel_get_pid_back(struct kshark_trace_histo *histo,
int bin, int cpu, bool vis_only,
+ struct kshark_entry_collection *col,
ssize_t *index);
int ksmodel_get_cpu_front(struct kshark_trace_histo *histo,
int bin, int pid, bool vis_only,
+ struct kshark_entry_collection *col,
ssize_t *index);
int ksmodel_get_cpu_back(struct kshark_trace_histo *histo,
int bin, int pid, bool vis_only,
+ struct kshark_entry_collection *col,
ssize_t *index);
bool ksmodel_cpu_visible_event_exist(struct kshark_trace_histo *histo,
- int bin, int cpu, ssize_t *index);
+ int bin, int cpu,
+ struct kshark_entry_collection *col,
+ ssize_t *index);
bool ksmodel_task_visible_event_exist(struct kshark_trace_histo *histo,
- int bin, int pid, ssize_t *index);
+ int bin, int pid,
+ struct kshark_entry_collection *col,
+ ssize_t *index);
static inline double ksmodel_bin_time(struct kshark_trace_histo *histo,
int bin)
This patch optimizes the search instruments of the model by adding the possibility of using Data collections. Signed-off-by: Yordan Karadzhov (VMware) <y.karadz@gmail.com> --- kernel-shark-qt/examples/datahisto.c | 4 ++ kernel-shark-qt/src/libkshark-model.c | 57 +++++++++++++++++++++++---- kernel-shark-qt/src/libkshark-model.h | 14 ++++++- 3 files changed, 65 insertions(+), 10 deletions(-)