2015-06-16 11:17:03

by Hou Pengyang

Subject: [PATCH] perf unwind: Fix a compile error

When libunwind is on, there is a compile error as :

util/unwind-libunwind.c:363:21: error: 'dso' undeclared (first use in this function)
dso__data_put_fd(dso);

This patch fix it.

Fixes: 4bb11d012ab248d0 ("perf tools: Add dso__data_get/put_fd()")
Signed-off-by: Hou Pengyang <[email protected]>
---
tools/perf/util/unwind-libunwind.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/perf/util/unwind-libunwind.c b/tools/perf/util/unwind-libunwind.c
index f079b63..4c00507 100644
--- a/tools/perf/util/unwind-libunwind.c
+++ b/tools/perf/util/unwind-libunwind.c
@@ -360,7 +360,7 @@ find_proc_info(unw_addr_space_t as, unw_word_t ip, unw_proc_info_t *pi,
unw_word_t base = is_exec ? 0 : map->start;

if (fd >= 0)
- dso__data_put_fd(dso);
+ dso__data_put_fd(map->dso);

memset(&di, 0, sizeof(di));
if (dwarf_find_debug_frame(0, &di, ip, base, map->dso->name,
--
1.8.5.2

2015-06-16 13:48:14

by Arnaldo Carvalho de Melo

Subject: Re: [PATCH] perf unwind: Fix a compile error

Em Tue, Jun 16, 2015 at 11:16:35AM +0000, Hou Pengyang escreveu:
> When libunwind is on, there is a compile error as :
>
> util/unwind-libunwind.c:363:21: error: 'dso' undeclared (first use in this function)
> dso__data_put_fd(dso);
>
> This patch fix it.

Thanks, applied.

- Arnaldo

> Fixes: 4bb11d012ab248d0 ("perf tools: Add dso__data_get/put_fd()")
> Signed-off-by: Hou Pengyang <[email protected]>
> ---
> tools/perf/util/unwind-libunwind.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tools/perf/util/unwind-libunwind.c b/tools/perf/util/unwind-libunwind.c
> index f079b63..4c00507 100644
> --- a/tools/perf/util/unwind-libunwind.c
> +++ b/tools/perf/util/unwind-libunwind.c
> @@ -360,7 +360,7 @@ find_proc_info(unw_addr_space_t as, unw_word_t ip, unw_proc_info_t *pi,
> unw_word_t base = is_exec ? 0 : map->start;
>
> if (fd >= 0)
> - dso__data_put_fd(dso);
> + dso__data_put_fd(map->dso);
>
> memset(&di, 0, sizeof(di));
> if (dwarf_find_debug_frame(0, &di, ip, base, map->dso->name,
> --
> 1.8.5.2

2015-06-17 11:52:26

by Wang Nan

Subject: Re: [PATCH] perf unwind: Fix a compile error

On 2015/6/16 21:47, Arnaldo Carvalho de Melo wrote:
> Em Tue, Jun 16, 2015 at 11:16:35AM +0000, Hou Pengyang escreveu:
>> When libunwind is on, there is a compile error as :
>>
>> util/unwind-libunwind.c:363:21: error: 'dso' undeclared (first use in this function)
>> dso__data_put_fd(dso);
>>
>> This patch fix it.
> Thanks, applied.
>
> - Arnaldo
>

I just realized that I posted this patch several weeks ago and has been
acked. Please see:

http://lkml.kernel.org/r/CAM9d7cjkjcF_7AeZ0d7kyDLWwjutLpJm-MfdDR42tr=iQYnz6g@mail.gmail.com

I'll reply that post to note others about this one.

Anyway, thank you for fixing this problem.

>> Fixes: 4bb11d012ab248d0 ("perf tools: Add dso__data_get/put_fd()")
>> Signed-off-by: Hou Pengyang <[email protected]>
>> ---
>> tools/perf/util/unwind-libunwind.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/tools/perf/util/unwind-libunwind.c b/tools/perf/util/unwind-libunwind.c
>> index f079b63..4c00507 100644
>> --- a/tools/perf/util/unwind-libunwind.c
>> +++ b/tools/perf/util/unwind-libunwind.c
>> @@ -360,7 +360,7 @@ find_proc_info(unw_addr_space_t as, unw_word_t ip, unw_proc_info_t *pi,
>> unw_word_t base = is_exec ? 0 : map->start;
>>
>> if (fd >= 0)
>> - dso__data_put_fd(dso);
>> + dso__data_put_fd(map->dso);
>>
>> memset(&di, 0, sizeof(di));
>> if (dwarf_find_debug_frame(0, &di, ip, base, map->dso->name,
>> --
>> 1.8.5.2

2015-06-17 19:35:47

by Arnaldo Carvalho de Melo

Subject: Re: [PATCH] perf unwind: Fix a compile error

Em Wed, Jun 17, 2015 at 07:51:37PM +0800, Wangnan (F) escreveu:
>
>
> On 2015/6/16 21:47, Arnaldo Carvalho de Melo wrote:
> >Em Tue, Jun 16, 2015 at 11:16:35AM +0000, Hou Pengyang escreveu:
> >>When libunwind is on, there is a compile error as :
> >>
> >>util/unwind-libunwind.c:363:21: error: 'dso' undeclared (first use in this function)
> >> dso__data_put_fd(dso);
> >>
> >>This patch fix it.
> >Thanks, applied.
> >
> >- Arnaldo
>
> I just realized that I posted this patch several weeks ago and has been
> acked. Please see:
>
> http://lkml.kernel.org/r/CAM9d7cjkjcF_7AeZ0d7kyDLWwjutLpJm-MfdDR42tr=iQYnz6g@mail.gmail.com
>
> I'll reply that post to note others about this one.
>
> Anyway, thank you for fixing this problem.

Sorry, some patches sometimes gets lost, I should've applied yours,
sooner, but what matters is that the problem got solved.

Thanks,

- Arnaldo

> >>Fixes: 4bb11d012ab248d0 ("perf tools: Add dso__data_get/put_fd()")
> >>Signed-off-by: Hou Pengyang <[email protected]>
> >>---
> >> tools/perf/util/unwind-libunwind.c | 2 +-
> >> 1 file changed, 1 insertion(+), 1 deletion(-)
> >>
> >>diff --git a/tools/perf/util/unwind-libunwind.c b/tools/perf/util/unwind-libunwind.c
> >>index f079b63..4c00507 100644
> >>--- a/tools/perf/util/unwind-libunwind.c
> >>+++ b/tools/perf/util/unwind-libunwind.c
> >>@@ -360,7 +360,7 @@ find_proc_info(unw_addr_space_t as, unw_word_t ip, unw_proc_info_t *pi,
> >> unw_word_t base = is_exec ? 0 : map->start;
> >> if (fd >= 0)
> >>- dso__data_put_fd(dso);
> >>+ dso__data_put_fd(map->dso);
> >> memset(&di, 0, sizeof(di));
> >> if (dwarf_find_debug_frame(0, &di, ip, base, map->dso->name,
> >>--
> >>1.8.5.2
>

2015-06-18 08:19:12

by tip-bot for Vasyl Gomonovych

Subject: [tip:perf/core] perf unwind: Fix a compile error

Commit-ID: f005813afb89bae92faf254130c544dc68984c6b
Gitweb: http://git.kernel.org/tip/f005813afb89bae92faf254130c544dc68984c6b
Author: Hou Pengyang <[email protected]>
AuthorDate: Tue, 16 Jun 2015 11:16:35 +0000
Committer: Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Tue, 16 Jun 2015 10:40:03 -0300

perf unwind: Fix a compile error

When libunwind is on, there is a compile error as :

util/unwind-libunwind.c:363:21: error: 'dso' undeclared (first use in this function)
dso__data_put_fd(dso);

This patch fixes it.

Signed-off-by: Hou Pengyang <[email protected]>
Cc: Namhyung Kim <[email protected]>
Cc: Wang Nan <[email protected]>
Fixes: 4bb11d012ab248d0 ("perf tools: Add dso__data_get/put_fd()")
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
---
tools/perf/util/unwind-libunwind.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/perf/util/unwind-libunwind.c b/tools/perf/util/unwind-libunwind.c
index f079b63..4c00507 100644
--- a/tools/perf/util/unwind-libunwind.c
+++ b/tools/perf/util/unwind-libunwind.c
@@ -360,7 +360,7 @@ find_proc_info(unw_addr_space_t as, unw_word_t ip, unw_proc_info_t *pi,
unw_word_t base = is_exec ? 0 : map->start;

if (fd >= 0)
- dso__data_put_fd(dso);
+ dso__data_put_fd(map->dso);

memset(&di, 0, sizeof(di));
if (dwarf_find_debug_frame(0, &di, ip, base, map->dso->name,