| Message ID | 20240114171723.14092-32-dev@benjarobin.fr (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | Fix kernelshark issues introduced by the migration to Qt6 | expand |
On 1/14/24 19:17, Benjamin ROBIN wrote: > Most of them have been fixed, but a few still remain. > > Signed-off-by: Benjamin ROBIN <dev@benjarobin.fr> > --- > examples/configio.c | 3 ++- > examples/datafilter.c | 9 ++++++--- > examples/datahisto.c | 2 +- > src/libkshark-collection.c | 14 ++++++++------ > src/libkshark-configio.c | 6 ++++-- > src/libkshark-hash.c | 5 +++-- > src/libkshark-model.c | 16 +++++++++------- > src/libkshark-tepdata.c | 2 +- > src/libkshark.c | 17 +++++++++-------- > src/plugins/sched_events.c | 2 +- > 10 files changed, 44 insertions(+), 32 deletions(-) > > diff --git a/examples/configio.c b/examples/configio.c > index 9710d53..575211d 100644 > --- a/examples/configio.c > +++ b/examples/configio.c > @@ -8,7 +8,8 @@ int main(int argc, char **argv) > struct kshark_config_doc *conf, *filter, *hello; > struct kshark_context *kshark_ctx; > struct kshark_data_stream *stream; > - int sd, *ids = NULL, i; > + int sd, *ids = NULL; > + size_t i; > > /* Create a new kshark session. */ > kshark_ctx = NULL; > diff --git a/examples/datafilter.c b/examples/datafilter.c > index 8e86d9c..21a38fe 100644 > --- a/examples/datafilter.c > +++ b/examples/datafilter.c > @@ -23,6 +23,7 @@ int main(int argc, char **argv) > struct kshark_entry **data = NULL; > int *pids, *evt_ids; > char *entry_str; > + int rt; 'sd' should be of type int. No need to declare 'rt'. > > /* Create a new kshark session. */ > kshark_ctx = NULL; > @@ -31,15 +32,17 @@ int main(int argc, char **argv) > > /* Open a trace data file produced by trace-cmd. */ > if (argc > 1) > - sd = kshark_open(kshark_ctx, argv[1]); > + rt = kshark_open(kshark_ctx, argv[1]); > else > - sd = kshark_open(kshark_ctx, default_file); > + rt = kshark_open(kshark_ctx, default_file); > > - if (sd < 0) { > + if (rt < 0) { > kshark_free(kshark_ctx); > return 1; > } > > + sd = (size_t)rt; > + > /* Load the content of the file into an array of entries. */ > n_rows = kshark_load_entries(kshark_ctx, sd, &data); > > diff --git a/examples/datahisto.c b/examples/datahisto.c > index 568072d..b54b9e9 100644 > --- a/examples/datahisto.c > +++ b/examples/datahisto.c > @@ -70,7 +70,7 @@ void dump_bin(struct kshark_trace_histo *histo, int bin, int sd, > > void dump_histo(struct kshark_trace_histo *histo, int sd, const char *type, int val) > { > - size_t bin; > + int bin; > > for (bin = 0; bin < histo->n_bins; ++bin) > dump_bin(histo, bin, sd, type, val); > diff --git a/src/libkshark-collection.c b/src/libkshark-collection.c > index 915983b..2ce113f 100644 > --- a/src/libkshark-collection.c > +++ b/src/libkshark-collection.c > @@ -518,14 +518,16 @@ static int > map_collection_front_request(const struct kshark_entry_collection *col, > struct kshark_entry_request *req) > { > - size_t req_first, req_end; > - ssize_t col_index; > + size_t req_first, req_end, col_index; > + ssize_t r; We are trying to use self explanatory variable names if possible. In many places in the code for variables like this one we use 'ret'. > int req_count; > > - col_index = map_collection_request_init(col, req, true, &req_end); > - if (col_index == KS_EMPTY_BIN) > + r = map_collection_request_init(col, req, true, &req_end); > + if (r == KS_EMPTY_BIN) > return 0; > > + col_index = (size_t)r; > + > /* > * Now loop over the intervals of the collection going forwards till > * the end of the inputted request and create a separate request for > @@ -746,7 +748,7 @@ kshark_find_data_collection(struct kshark_entry_collection *col, > while (col) { > if (col->cond == cond && > col->stream_id == sd && > - col->n_val == n_val && > + (size_t)col->n_val == n_val && > val_compare(col->values, values, n_val)) > return col; > > @@ -899,7 +901,7 @@ void kshark_unregister_data_collection(struct kshark_entry_collection **col, > for (list = *col; list; list = list->next) { > if (list->cond == cond && > list->stream_id == sd && > - list->n_val == n_val && > + (size_t)list->n_val == n_val && > val_compare(list->values, values, n_val)) { > *last = list->next; > kshark_free_data_collection(list); > diff --git a/src/libkshark-configio.c b/src/libkshark-configio.c > index 49f957b..0694e19 100644 > --- a/src/libkshark-configio.c > +++ b/src/libkshark-configio.c > @@ -1117,7 +1117,8 @@ static bool kshark_event_filter_to_json(struct kshark_data_stream *stream, > json_object *jfilter_data, *jname; > struct kshark_hash_id *filter; > char *name_str; > - int i, *ids; > + int *ids; > + size_t i; > > filter = kshark_get_filter(stream, filter_type); > if (!filter) > @@ -1286,7 +1287,8 @@ static bool kshark_filter_array_to_json(struct kshark_hash_id *filter, > struct json_object *jobj) > { > json_object *jfilter_data, *jpid = NULL; > - int i, *ids; > + int *ids; > + size_t i; > > /* > * If this Json document already contains a description of the filter, > diff --git a/src/libkshark-hash.c b/src/libkshark-hash.c > index 89c021b..d4f0a31 100644 > --- a/src/libkshark-hash.c > +++ b/src/libkshark-hash.c > @@ -169,7 +169,7 @@ void kshark_hash_id_clear(struct kshark_hash_id *hash) > { > struct kshark_hash_id_item *item, *next; > size_t size; > - int i; > + size_t i; > > if (!hash || ! hash->hash) > return; > @@ -212,7 +212,8 @@ int *kshark_hash_ids(struct kshark_hash_id *hash) > { > struct kshark_hash_id_item *item; > size_t size = hash_size(hash); > - int count = 0, i; > + size_t i; > + int count = 0; > int *ids; > > if (!hash->count) > diff --git a/src/libkshark-model.c b/src/libkshark-model.c > index 4cd9f6a..2918567 100644 > --- a/src/libkshark-model.c > +++ b/src/libkshark-model.c > @@ -97,6 +97,8 @@ static void ksmodel_set_in_range_bining(struct kshark_trace_histo *histo, > int64_t corrected_range, delta_range, range = max - min; > struct kshark_entry *last; > > + assert(min <= max); Having this assert() makes it safe to declare 'range' as size_t. > + > if (n <= 0) { > histo->n_bins = histo->bin_size = 0; > histo->min = min; > @@ -110,7 +112,7 @@ static void ksmodel_set_in_range_bining(struct kshark_trace_histo *histo, > } > > /* The size of the bin must be >= 1, hence the range must be >= n. */ > - if (range < n) { > + if ((size_t)range < n) { > range = n; > max = min + n; > } > @@ -119,7 +121,7 @@ static void ksmodel_set_in_range_bining(struct kshark_trace_histo *histo, > * If the number of bins changes, allocate memory for the descriptor of > * the model. > */ > - if (n != histo->n_bins) { I think the problem here is that the function argument 'n' is declared with wrong type. It must match the type of histo->n_bins which is int. > + if (n != (size_t)histo->n_bins) { > if (!ksmodel_histo_alloc(histo, n)) { > ksmodel_clear(histo); > return; > @@ -282,7 +284,7 @@ static void ksmodel_set_next_bin_edge(struct kshark_trace_histo *histo, > * case we have to increase the size of the very last bin in order to > * make sure that the last entry of the dataset will fall into it. > */ > - if (next_bin == histo->n_bins - 1) > + if (next_bin == (size_t)(histo->n_bins - 1)) > ++time_max; > > /* > @@ -544,7 +546,7 @@ void ksmodel_shift_forward(struct kshark_trace_histo *histo, size_t n) > void ksmodel_shift_backward(struct kshark_trace_histo *histo, size_t n) > { > size_t last_row = 0; > - int bin; > + size_t bin; > > if (!histo->data_size) > return; > @@ -561,7 +563,7 @@ void ksmodel_shift_backward(struct kshark_trace_histo *histo, size_t n) > histo->min -= n * histo->bin_size; > histo->max -= n * histo->bin_size; > > - if (n >= histo->n_bins) { > + if (n >= (size_t)histo->n_bins) { > /* > * No overlap between the new and the old range. Recalculate > * all bins from scratch. First calculate the new range. > @@ -649,7 +651,7 @@ void ksmodel_jump_to(struct kshark_trace_histo *histo, int64_t ts) > static void ksmodel_zoom(struct kshark_trace_histo *histo, > double r, int mark, bool zoom_in) > { > - size_t range, min, max, delta_min; > + int64_t range, min, max, delta_min; > double delta_tot; > > if (!histo->data_size) > @@ -668,7 +670,7 @@ static void ksmodel_zoom(struct kshark_trace_histo *histo, > * Avoid overzooming. If needed, adjust the Scale factor to a the value > * which provides bin_size >= 5. > */ > - if (zoom_in && (size_t) (range * (1. - r)) < histo->n_bins * 5) > + if (zoom_in && (int)(range * (1. - r)) < (histo->n_bins * 5)) > r = 1. - (histo->n_bins * 5.) / range; > > /* > diff --git a/src/libkshark-tepdata.c b/src/libkshark-tepdata.c > index a178de6..4171fab 100644 > --- a/src/libkshark-tepdata.c > +++ b/src/libkshark-tepdata.c > @@ -239,7 +239,7 @@ static int get_next_pid(struct kshark_data_stream *stream, > ret = tep_read_number_field(get_sched_next(stream), > record->data, &val); > > - return ret ? : val; > + return ret ? : (int)val; > } > > static void register_command(struct kshark_data_stream *stream, > diff --git a/src/libkshark.c b/src/libkshark.c > index 44e553f..698b8d6 100644 > --- a/src/libkshark.c > +++ b/src/libkshark.c > @@ -1371,9 +1371,10 @@ void kshark_clear_all_filters(struct kshark_context *kshark_ctx, > { > struct kshark_data_stream *stream; > int *stream_ids, i; > + size_t j; > > - for (i = 0; i < n_entries; ++i) > - set_all_visible(&data[i]->visible); > + for (j = 0; j < n_entries; ++j) > + set_all_visible(&data[j]->visible); > > stream_ids = kshark_all_streams(kshark_ctx); > for (i = 0; i < kshark_ctx->n_streams; i++) { > @@ -1942,7 +1943,7 @@ kshark_merge_data_entries(struct kshark_entry_data_set *buffers, int n_buffers) > return NULL; > } > > - for (i = 0; i < n_buffers; ++i) { > + for (i = 0; i < (size_t)n_buffers; ++i) { > count[i] = 0; > if (buffers[i].n_rows > 0) > tot += buffers[i].n_rows; > @@ -2111,7 +2112,7 @@ kshark_merge_data_matrices(struct kshark_matrix_data_set *buffers, int n_buffers > { > struct kshark_matrix_data_set merged_data; > size_t i, tot = 0, count[n_buffers]; Note that 'n_buffers' must be size_t as well. Better fix this. > - int i_first; > + int i_first, j; > bool status; > > merged_data.n_rows = -1; > @@ -2121,10 +2122,10 @@ kshark_merge_data_matrices(struct kshark_matrix_data_set *buffers, int n_buffers > goto end; > } > > - for (i = 0; i < n_buffers; ++i) { > - count[i] = 0; > - if (buffers[i].n_rows > 0) > - tot += buffers[i].n_rows; > + for (j = 0; j < n_buffers; ++j) { > + count[j] = 0; > + if (buffers[j].n_rows > 0) > + tot += buffers[j].n_rows; > } > > status = kshark_data_matrix_alloc(tot, &merged_data.event_array, > diff --git a/src/plugins/sched_events.c b/src/plugins/sched_events.c > index c3a4f47..a605fca 100644 > --- a/src/plugins/sched_events.c > +++ b/src/plugins/sched_events.c > @@ -115,7 +115,7 @@ static void plugin_sched_swith_action(struct kshark_data_stream *stream, > ret = tep_read_number_field(plugin_ctx->sched_switch_next_field, > record->data, &next_pid); > > - if (ret == 0 && next_pid >= 0) { > + if (ret == 0) { > plugin_sched_set_pid(&ks_field, entry->pid); > > ret = tep_read_number_field(plugin_ctx->sched_switch_prev_state_field,
diff --git a/examples/configio.c b/examples/configio.c index 9710d53..575211d 100644 --- a/examples/configio.c +++ b/examples/configio.c @@ -8,7 +8,8 @@ int main(int argc, char **argv) struct kshark_config_doc *conf, *filter, *hello; struct kshark_context *kshark_ctx; struct kshark_data_stream *stream; - int sd, *ids = NULL, i; + int sd, *ids = NULL; + size_t i; /* Create a new kshark session. */ kshark_ctx = NULL; diff --git a/examples/datafilter.c b/examples/datafilter.c index 8e86d9c..21a38fe 100644 --- a/examples/datafilter.c +++ b/examples/datafilter.c @@ -23,6 +23,7 @@ int main(int argc, char **argv) struct kshark_entry **data = NULL; int *pids, *evt_ids; char *entry_str; + int rt; /* Create a new kshark session. */ kshark_ctx = NULL; @@ -31,15 +32,17 @@ int main(int argc, char **argv) /* Open a trace data file produced by trace-cmd. */ if (argc > 1) - sd = kshark_open(kshark_ctx, argv[1]); + rt = kshark_open(kshark_ctx, argv[1]); else - sd = kshark_open(kshark_ctx, default_file); + rt = kshark_open(kshark_ctx, default_file); - if (sd < 0) { + if (rt < 0) { kshark_free(kshark_ctx); return 1; } + sd = (size_t)rt; + /* Load the content of the file into an array of entries. */ n_rows = kshark_load_entries(kshark_ctx, sd, &data); diff --git a/examples/datahisto.c b/examples/datahisto.c index 568072d..b54b9e9 100644 --- a/examples/datahisto.c +++ b/examples/datahisto.c @@ -70,7 +70,7 @@ void dump_bin(struct kshark_trace_histo *histo, int bin, int sd, void dump_histo(struct kshark_trace_histo *histo, int sd, const char *type, int val) { - size_t bin; + int bin; for (bin = 0; bin < histo->n_bins; ++bin) dump_bin(histo, bin, sd, type, val); diff --git a/src/libkshark-collection.c b/src/libkshark-collection.c index 915983b..2ce113f 100644 --- a/src/libkshark-collection.c +++ b/src/libkshark-collection.c @@ -518,14 +518,16 @@ static int map_collection_front_request(const struct kshark_entry_collection *col, struct kshark_entry_request *req) { - size_t req_first, req_end; - ssize_t col_index; + size_t req_first, req_end, col_index; + ssize_t r; int req_count; - col_index = map_collection_request_init(col, req, true, &req_end); - if (col_index == KS_EMPTY_BIN) + r = map_collection_request_init(col, req, true, &req_end); + if (r == KS_EMPTY_BIN) return 0; + col_index = (size_t)r; + /* * Now loop over the intervals of the collection going forwards till * the end of the inputted request and create a separate request for @@ -746,7 +748,7 @@ kshark_find_data_collection(struct kshark_entry_collection *col, while (col) { if (col->cond == cond && col->stream_id == sd && - col->n_val == n_val && + (size_t)col->n_val == n_val && val_compare(col->values, values, n_val)) return col; @@ -899,7 +901,7 @@ void kshark_unregister_data_collection(struct kshark_entry_collection **col, for (list = *col; list; list = list->next) { if (list->cond == cond && list->stream_id == sd && - list->n_val == n_val && + (size_t)list->n_val == n_val && val_compare(list->values, values, n_val)) { *last = list->next; kshark_free_data_collection(list); diff --git a/src/libkshark-configio.c b/src/libkshark-configio.c index 49f957b..0694e19 100644 --- a/src/libkshark-configio.c +++ b/src/libkshark-configio.c @@ -1117,7 +1117,8 @@ static bool kshark_event_filter_to_json(struct kshark_data_stream *stream, json_object *jfilter_data, *jname; struct kshark_hash_id *filter; char *name_str; - int i, *ids; + int *ids; + size_t i; filter = kshark_get_filter(stream, filter_type); if (!filter) @@ -1286,7 +1287,8 @@ static bool kshark_filter_array_to_json(struct kshark_hash_id *filter, struct json_object *jobj) { json_object *jfilter_data, *jpid = NULL; - int i, *ids; + int *ids; + size_t i; /* * If this Json document already contains a description of the filter, diff --git a/src/libkshark-hash.c b/src/libkshark-hash.c index 89c021b..d4f0a31 100644 --- a/src/libkshark-hash.c +++ b/src/libkshark-hash.c @@ -169,7 +169,7 @@ void kshark_hash_id_clear(struct kshark_hash_id *hash) { struct kshark_hash_id_item *item, *next; size_t size; - int i; + size_t i; if (!hash || ! hash->hash) return; @@ -212,7 +212,8 @@ int *kshark_hash_ids(struct kshark_hash_id *hash) { struct kshark_hash_id_item *item; size_t size = hash_size(hash); - int count = 0, i; + size_t i; + int count = 0; int *ids; if (!hash->count) diff --git a/src/libkshark-model.c b/src/libkshark-model.c index 4cd9f6a..2918567 100644 --- a/src/libkshark-model.c +++ b/src/libkshark-model.c @@ -97,6 +97,8 @@ static void ksmodel_set_in_range_bining(struct kshark_trace_histo *histo, int64_t corrected_range, delta_range, range = max - min; struct kshark_entry *last; + assert(min <= max); + if (n <= 0) { histo->n_bins = histo->bin_size = 0; histo->min = min; @@ -110,7 +112,7 @@ static void ksmodel_set_in_range_bining(struct kshark_trace_histo *histo, } /* The size of the bin must be >= 1, hence the range must be >= n. */ - if (range < n) { + if ((size_t)range < n) { range = n; max = min + n; } @@ -119,7 +121,7 @@ static void ksmodel_set_in_range_bining(struct kshark_trace_histo *histo, * If the number of bins changes, allocate memory for the descriptor of * the model. */ - if (n != histo->n_bins) { + if (n != (size_t)histo->n_bins) { if (!ksmodel_histo_alloc(histo, n)) { ksmodel_clear(histo); return; @@ -282,7 +284,7 @@ static void ksmodel_set_next_bin_edge(struct kshark_trace_histo *histo, * case we have to increase the size of the very last bin in order to * make sure that the last entry of the dataset will fall into it. */ - if (next_bin == histo->n_bins - 1) + if (next_bin == (size_t)(histo->n_bins - 1)) ++time_max; /* @@ -544,7 +546,7 @@ void ksmodel_shift_forward(struct kshark_trace_histo *histo, size_t n) void ksmodel_shift_backward(struct kshark_trace_histo *histo, size_t n) { size_t last_row = 0; - int bin; + size_t bin; if (!histo->data_size) return; @@ -561,7 +563,7 @@ void ksmodel_shift_backward(struct kshark_trace_histo *histo, size_t n) histo->min -= n * histo->bin_size; histo->max -= n * histo->bin_size; - if (n >= histo->n_bins) { + if (n >= (size_t)histo->n_bins) { /* * No overlap between the new and the old range. Recalculate * all bins from scratch. First calculate the new range. @@ -649,7 +651,7 @@ void ksmodel_jump_to(struct kshark_trace_histo *histo, int64_t ts) static void ksmodel_zoom(struct kshark_trace_histo *histo, double r, int mark, bool zoom_in) { - size_t range, min, max, delta_min; + int64_t range, min, max, delta_min; double delta_tot; if (!histo->data_size) @@ -668,7 +670,7 @@ static void ksmodel_zoom(struct kshark_trace_histo *histo, * Avoid overzooming. If needed, adjust the Scale factor to a the value * which provides bin_size >= 5. */ - if (zoom_in && (size_t) (range * (1. - r)) < histo->n_bins * 5) + if (zoom_in && (int)(range * (1. - r)) < (histo->n_bins * 5)) r = 1. - (histo->n_bins * 5.) / range; /* diff --git a/src/libkshark-tepdata.c b/src/libkshark-tepdata.c index a178de6..4171fab 100644 --- a/src/libkshark-tepdata.c +++ b/src/libkshark-tepdata.c @@ -239,7 +239,7 @@ static int get_next_pid(struct kshark_data_stream *stream, ret = tep_read_number_field(get_sched_next(stream), record->data, &val); - return ret ? : val; + return ret ? : (int)val; } static void register_command(struct kshark_data_stream *stream, diff --git a/src/libkshark.c b/src/libkshark.c index 44e553f..698b8d6 100644 --- a/src/libkshark.c +++ b/src/libkshark.c @@ -1371,9 +1371,10 @@ void kshark_clear_all_filters(struct kshark_context *kshark_ctx, { struct kshark_data_stream *stream; int *stream_ids, i; + size_t j; - for (i = 0; i < n_entries; ++i) - set_all_visible(&data[i]->visible); + for (j = 0; j < n_entries; ++j) + set_all_visible(&data[j]->visible); stream_ids = kshark_all_streams(kshark_ctx); for (i = 0; i < kshark_ctx->n_streams; i++) { @@ -1942,7 +1943,7 @@ kshark_merge_data_entries(struct kshark_entry_data_set *buffers, int n_buffers) return NULL; } - for (i = 0; i < n_buffers; ++i) { + for (i = 0; i < (size_t)n_buffers; ++i) { count[i] = 0; if (buffers[i].n_rows > 0) tot += buffers[i].n_rows; @@ -2111,7 +2112,7 @@ kshark_merge_data_matrices(struct kshark_matrix_data_set *buffers, int n_buffers { struct kshark_matrix_data_set merged_data; size_t i, tot = 0, count[n_buffers]; - int i_first; + int i_first, j; bool status; merged_data.n_rows = -1; @@ -2121,10 +2122,10 @@ kshark_merge_data_matrices(struct kshark_matrix_data_set *buffers, int n_buffers goto end; } - for (i = 0; i < n_buffers; ++i) { - count[i] = 0; - if (buffers[i].n_rows > 0) - tot += buffers[i].n_rows; + for (j = 0; j < n_buffers; ++j) { + count[j] = 0; + if (buffers[j].n_rows > 0) + tot += buffers[j].n_rows; } status = kshark_data_matrix_alloc(tot, &merged_data.event_array, diff --git a/src/plugins/sched_events.c b/src/plugins/sched_events.c index c3a4f47..a605fca 100644 --- a/src/plugins/sched_events.c +++ b/src/plugins/sched_events.c @@ -115,7 +115,7 @@ static void plugin_sched_swith_action(struct kshark_data_stream *stream, ret = tep_read_number_field(plugin_ctx->sched_switch_next_field, record->data, &next_pid); - if (ret == 0 && next_pid >= 0) { + if (ret == 0) { plugin_sched_set_pid(&ks_field, entry->pid); ret = tep_read_number_field(plugin_ctx->sched_switch_prev_state_field,
Most of them have been fixed, but a few still remain. Signed-off-by: Benjamin ROBIN <dev@benjarobin.fr> --- examples/configio.c | 3 ++- examples/datafilter.c | 9 ++++++--- examples/datahisto.c | 2 +- src/libkshark-collection.c | 14 ++++++++------ src/libkshark-configio.c | 6 ++++-- src/libkshark-hash.c | 5 +++-- src/libkshark-model.c | 16 +++++++++------- src/libkshark-tepdata.c | 2 +- src/libkshark.c | 17 +++++++++-------- src/plugins/sched_events.c | 2 +- 10 files changed, 44 insertions(+), 32 deletions(-)