* [PATCH 1/2] kernel-shark-qt: Deal with the "no tasks" case in kshark_get_task_pids()
@ 2018-07-11 13:37 Yordan Karadzhov (VMware)
2018-07-11 13:37 ` [PATCH 2/2] kernel-shark-qt: Fix the default value of the Event Visible flag Yordan Karadzhov (VMware)
2018-07-11 14:02 ` [PATCH 1/2] kernel-shark-qt: Deal with the "no tasks" case in kshark_get_task_pids() Steven Rostedt
0 siblings, 2 replies; 9+ messages in thread
From: Yordan Karadzhov (VMware) @ 2018-07-11 13:37 UTC (permalink / raw)
To: rostedt; +Cc: linux-trace-devel, Yordan Karadzhov (VMware)
kshark_get_task_pids() should not return a "memory allocation" error
in the case when it is called before having trace data loaded.
Signed-off-by: Yordan Karadzhov (VMware) <y.karadz@gmail.com>
---
kernel-shark-qt/src/libkshark.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/kernel-shark-qt/src/libkshark.c b/kernel-shark-qt/src/libkshark.c
index 668b6df..75b88c9 100644
--- a/kernel-shark-qt/src/libkshark.c
+++ b/kernel-shark-qt/src/libkshark.c
@@ -303,6 +303,12 @@ ssize_t kshark_get_task_pids(struct kshark_context *kshark_ctx, int **pids)
}
}
+ if (!pid_count) {
+ free(*pids);
+ *pids = NULL;
+ return pid_count;
+ }
+
temp_pids = realloc(*pids, pid_count * sizeof(int));
if (!temp_pids)
goto fail;
--
2.17.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 2/2] kernel-shark-qt: Fix the default value of the Event Visible flag
2018-07-11 13:37 [PATCH 1/2] kernel-shark-qt: Deal with the "no tasks" case in kshark_get_task_pids() Yordan Karadzhov (VMware)
@ 2018-07-11 13:37 ` Yordan Karadzhov (VMware)
2018-07-11 14:04 ` Steven Rostedt
2018-07-11 14:02 ` [PATCH 1/2] kernel-shark-qt: Deal with the "no tasks" case in kshark_get_task_pids() Steven Rostedt
1 sibling, 1 reply; 9+ messages in thread
From: Yordan Karadzhov (VMware) @ 2018-07-11 13:37 UTC (permalink / raw)
To: rostedt; +Cc: linux-trace-devel, Yordan Karadzhov (VMware)
This patch fixes a simpel bug in the way the "Event Visible" flag of the
kshark_entries is set when the data is loadded.
Signed-off-by: Yordan Karadzhov (VMware) <y.karadz@gmail.com>
---
kernel-shark-qt/src/libkshark.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel-shark-qt/src/libkshark.c b/kernel-shark-qt/src/libkshark.c
index 75b88c9..3299752 100644
--- a/kernel-shark-qt/src/libkshark.c
+++ b/kernel-shark-qt/src/libkshark.c
@@ -600,7 +600,7 @@ static size_t get_records(struct kshark_context *kshark_ctx,
kshark_set_entry_values(kshark_ctx, rec, entry);
pid = entry->pid;
/* Apply event filtering. */
- ret = FILTER_NONE;
+ ret = FILTER_MATCH;
if (adv_filter->filters)
ret = pevent_filter_match(adv_filter, rec);
--
2.17.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 1/2] kernel-shark-qt: Deal with the "no tasks" case in kshark_get_task_pids()
2018-07-11 13:37 [PATCH 1/2] kernel-shark-qt: Deal with the "no tasks" case in kshark_get_task_pids() Yordan Karadzhov (VMware)
2018-07-11 13:37 ` [PATCH 2/2] kernel-shark-qt: Fix the default value of the Event Visible flag Yordan Karadzhov (VMware)
@ 2018-07-11 14:02 ` Steven Rostedt
2018-07-11 14:08 ` Yordan Karadzhov (VMware)
1 sibling, 1 reply; 9+ messages in thread
From: Steven Rostedt @ 2018-07-11 14:02 UTC (permalink / raw)
To: Yordan Karadzhov (VMware); +Cc: linux-trace-devel
On Wed, 11 Jul 2018 16:37:08 +0300
"Yordan Karadzhov (VMware)" <y.karadz@gmail.com> wrote:
> kshark_get_task_pids() should not return a "memory allocation" error
> in the case when it is called before having trace data loaded.
>
> Signed-off-by: Yordan Karadzhov (VMware) <y.karadz@gmail.com>
> ---
> kernel-shark-qt/src/libkshark.c | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/kernel-shark-qt/src/libkshark.c b/kernel-shark-qt/src/libkshark.c
> index 668b6df..75b88c9 100644
> --- a/kernel-shark-qt/src/libkshark.c
> +++ b/kernel-shark-qt/src/libkshark.c
> @@ -303,6 +303,12 @@ ssize_t kshark_get_task_pids(struct kshark_context *kshark_ctx, int **pids)
> }
> }
>
> + if (!pid_count) {
> + free(*pids);
> + *pids = NULL;
> + return pid_count;
> + }
> +
> temp_pids = realloc(*pids, pid_count * sizeof(int));
> if (!temp_pids)
> goto fail;
What about doing it this way:
diff --git a/kernel-shark-qt/src/libkshark.c b/kernel-shark-qt/src/libkshark.c
index 668b6df8..34daa25e 100644
--- a/kernel-shark-qt/src/libkshark.c
+++ b/kernel-shark-qt/src/libkshark.c
@@ -303,12 +303,17 @@ ssize_t kshark_get_task_pids(struct kshark_context *kshark_ctx, int **pids)
}
}
- temp_pids = realloc(*pids, pid_count * sizeof(int));
- if (!temp_pids)
- goto fail;
+ if (pid_count) {
+ temp_pids = realloc(*pids, pid_count * sizeof(int));
+ if (!temp_pids)
+ goto fail;
- /* Paranoid: In the unlikely case of shrinking *pids, realloc moves it */
- *pids = temp_pids;
+ /* Paranoid: In the unlikely case of shrinking *pids, realloc moves it */
+ *pids = temp_pids;
+ } else {
+ free(*pids);
+ *pids = NULL;
+ }
return pid_count;
?
-- Steve
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 2/2] kernel-shark-qt: Fix the default value of the Event Visible flag
2018-07-11 13:37 ` [PATCH 2/2] kernel-shark-qt: Fix the default value of the Event Visible flag Yordan Karadzhov (VMware)
@ 2018-07-11 14:04 ` Steven Rostedt
0 siblings, 0 replies; 9+ messages in thread
From: Steven Rostedt @ 2018-07-11 14:04 UTC (permalink / raw)
To: Yordan Karadzhov (VMware); +Cc: linux-trace-devel
On Wed, 11 Jul 2018 16:37:09 +0300
"Yordan Karadzhov (VMware)" <y.karadz@gmail.com> wrote:
> This patch fixes a simpel bug in the way the "Event Visible" flag of the
> kshark_entries is set when the data is loadded.
>
> Signed-off-by: Yordan Karadzhov (VMware) <y.karadz@gmail.com>
> ---
Applied. Thanks Yordan!
-- Steve
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/2] kernel-shark-qt: Deal with the "no tasks" case in kshark_get_task_pids()
2018-07-11 14:02 ` [PATCH 1/2] kernel-shark-qt: Deal with the "no tasks" case in kshark_get_task_pids() Steven Rostedt
@ 2018-07-11 14:08 ` Yordan Karadzhov (VMware)
2018-08-03 13:06 ` Yordan Karadzhov (VMware)
0 siblings, 1 reply; 9+ messages in thread
From: Yordan Karadzhov (VMware) @ 2018-07-11 14:08 UTC (permalink / raw)
To: Steven Rostedt; +Cc: linux-trace-devel
On 11.07.2018 17:02, Steven Rostedt wrote:
> On Wed, 11 Jul 2018 16:37:08 +0300
> "Yordan Karadzhov (VMware)" <y.karadz@gmail.com> wrote:
>
>> kshark_get_task_pids() should not return a "memory allocation" error
>> in the case when it is called before having trace data loaded.
>>
>> Signed-off-by: Yordan Karadzhov (VMware) <y.karadz@gmail.com>
>> ---
>> kernel-shark-qt/src/libkshark.c | 6 ++++++
>> 1 file changed, 6 insertions(+)
>>
>> diff --git a/kernel-shark-qt/src/libkshark.c b/kernel-shark-qt/src/libkshark.c
>> index 668b6df..75b88c9 100644
>> --- a/kernel-shark-qt/src/libkshark.c
>> +++ b/kernel-shark-qt/src/libkshark.c
>> @@ -303,6 +303,12 @@ ssize_t kshark_get_task_pids(struct kshark_context *kshark_ctx, int **pids)
>> }
>> }
>>
>> + if (!pid_count) {
>> + free(*pids);
>> + *pids = NULL;
>> + return pid_count;
>> + }
>> +
>> temp_pids = realloc(*pids, pid_count * sizeof(int));
>> if (!temp_pids)
>> goto fail;
>
> What about doing it this way:
>
> diff --git a/kernel-shark-qt/src/libkshark.c b/kernel-shark-qt/src/libkshark.c
> index 668b6df8..34daa25e 100644
> --- a/kernel-shark-qt/src/libkshark.c
> +++ b/kernel-shark-qt/src/libkshark.c
> @@ -303,12 +303,17 @@ ssize_t kshark_get_task_pids(struct kshark_context *kshark_ctx, int **pids)
> }
> }
>
> - temp_pids = realloc(*pids, pid_count * sizeof(int));
> - if (!temp_pids)
> - goto fail;
> + if (pid_count) {
> + temp_pids = realloc(*pids, pid_count * sizeof(int));
> + if (!temp_pids)
> + goto fail;
>
> - /* Paranoid: In the unlikely case of shrinking *pids, realloc moves it */
> - *pids = temp_pids;
> + /* Paranoid: In the unlikely case of shrinking *pids, realloc moves it */
> + *pids = temp_pids;
> + } else {
> + free(*pids);
> + *pids = NULL;
> + }
>
> return pid_count;
>
Yes, this way is better.
Thanks!
Yordan
>
> ?
>
> -- Steve
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/2] kernel-shark-qt: Deal with the "no tasks" case in kshark_get_task_pids()
2018-07-11 14:08 ` Yordan Karadzhov (VMware)
@ 2018-08-03 13:06 ` Yordan Karadzhov (VMware)
2018-08-03 17:46 ` Steven Rostedt
0 siblings, 1 reply; 9+ messages in thread
From: Yordan Karadzhov (VMware) @ 2018-08-03 13:06 UTC (permalink / raw)
To: Steven Rostedt; +Cc: linux-trace-devel
Hi Steven,
Should I send this patch again?
Thanks!
Yordan
On 11.07.2018 17:08, Yordan Karadzhov (VMware) wrote:
>>
>> What about doing it this way:
>>
>> diff --git a/kernel-shark-qt/src/libkshark.c
>> b/kernel-shark-qt/src/libkshark.c
>> index 668b6df8..34daa25e 100644
>> --- a/kernel-shark-qt/src/libkshark.c
>> +++ b/kernel-shark-qt/src/libkshark.c
>> @@ -303,12 +303,17 @@ ssize_t kshark_get_task_pids(struct
>> kshark_context *kshark_ctx, int **pids)
>> }
>> }
>> - temp_pids = realloc(*pids, pid_count * sizeof(int));
>> - if (!temp_pids)
>> - goto fail;
>> + if (pid_count) {
>> + temp_pids = realloc(*pids, pid_count * sizeof(int));
>> + if (!temp_pids)
>> + goto fail;
>> - /* Paranoid: In the unlikely case of shrinking *pids, realloc
>> moves it */
>> - *pids = temp_pids;
>> + /* Paranoid: In the unlikely case of shrinking *pids, realloc
>> moves it */
>> + *pids = temp_pids;
>> + } else {
>> + free(*pids);
>> + *pids = NULL;
>> + }
>> return pid_count;
>
> Yes, this way is better.
>
> Thanks!
> Yordan
>
>
>>
>> ?
>>
>> -- Steve
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/2] kernel-shark-qt: Deal with the "no tasks" case in kshark_get_task_pids()
2018-08-03 13:06 ` Yordan Karadzhov (VMware)
@ 2018-08-03 17:46 ` Steven Rostedt
2018-08-03 18:18 ` Steven Rostedt
0 siblings, 1 reply; 9+ messages in thread
From: Steven Rostedt @ 2018-08-03 17:46 UTC (permalink / raw)
To: Yordan Karadzhov (VMware); +Cc: linux-trace-devel
On Fri, 3 Aug 2018 16:06:24 +0300
"Yordan Karadzhov (VMware)" <y.karadz@gmail.com> wrote:
> Hi Steven,
> Should I send this patch again?
Yes, with the updates.
Thanks!
-- Steve
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/2] kernel-shark-qt: Deal with the "no tasks" case in kshark_get_task_pids()
2018-08-03 17:46 ` Steven Rostedt
@ 2018-08-03 18:18 ` Steven Rostedt
2018-08-03 18:22 ` Steven Rostedt
0 siblings, 1 reply; 9+ messages in thread
From: Steven Rostedt @ 2018-08-03 18:18 UTC (permalink / raw)
To: Yordan Karadzhov (VMware); +Cc: linux-trace-devel
On Fri, 3 Aug 2018 13:46:22 -0400
Steven Rostedt <rostedt@goodmis.org> wrote:
> On Fri, 3 Aug 2018 16:06:24 +0300
> "Yordan Karadzhov (VMware)" <y.karadz@gmail.com> wrote:
>
> > Hi Steven,
> > Should I send this patch again?
>
> Yes, with the updates.
>
I take this back. I'll do the updates and apply your other patches on
top.
Thanks!
-- Steve
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/2] kernel-shark-qt: Deal with the "no tasks" case in kshark_get_task_pids()
2018-08-03 18:18 ` Steven Rostedt
@ 2018-08-03 18:22 ` Steven Rostedt
0 siblings, 0 replies; 9+ messages in thread
From: Steven Rostedt @ 2018-08-03 18:22 UTC (permalink / raw)
To: Yordan Karadzhov (VMware); +Cc: linux-trace-devel
On Fri, 3 Aug 2018 14:18:27 -0400
Steven Rostedt <rostedt@goodmis.org> wrote:
> On Fri, 3 Aug 2018 13:46:22 -0400
> Steven Rostedt <rostedt@goodmis.org> wrote:
>
> > On Fri, 3 Aug 2018 16:06:24 +0300
> > "Yordan Karadzhov (VMware)" <y.karadz@gmail.com> wrote:
> >
> > > Hi Steven,
> > > Should I send this patch again?
> >
> > Yes, with the updates.
> >
>
> I take this back. I'll do the updates and apply your other patches on
> top.
>
And this is what I get when I work on too many projects at once. I
already have the update applied to my local tree :-p.
-- Steve
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2018-08-03 20:19 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-07-11 13:37 [PATCH 1/2] kernel-shark-qt: Deal with the "no tasks" case in kshark_get_task_pids() Yordan Karadzhov (VMware)
2018-07-11 13:37 ` [PATCH 2/2] kernel-shark-qt: Fix the default value of the Event Visible flag Yordan Karadzhov (VMware)
2018-07-11 14:04 ` Steven Rostedt
2018-07-11 14:02 ` [PATCH 1/2] kernel-shark-qt: Deal with the "no tasks" case in kshark_get_task_pids() Steven Rostedt
2018-07-11 14:08 ` Yordan Karadzhov (VMware)
2018-08-03 13:06 ` Yordan Karadzhov (VMware)
2018-08-03 17:46 ` Steven Rostedt
2018-08-03 18:18 ` Steven Rostedt
2018-08-03 18:22 ` Steven Rostedt
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.