* [patch] Accelerate filenames matching
@ 2013-03-12 13:26 Jan Kratochvil
2013-03-12 15:19 ` Joel Brobecker
2013-03-12 17:48 ` Doug Evans
0 siblings, 2 replies; 5+ messages in thread
From: Jan Kratochvil @ 2013-03-12 13:26 UTC (permalink / raw)
To: gdb-patches; +Cc: Doug Evans
Hi,
I have read Doug's IRC line:
xdje: In dw2_map_symtabs_matching_filename, in the case where compare_filenames_for_search succeeds, is there a point to falling through and trying again with the real path if dw2_map_expand_apply returns 0?
So here is the fix. It could call the callback multiple times which may be
considered a bug (I have not checked if it may be a problem for any of the
callbacks).
No regressions on {x86_64,x86_64-m32,i686}-fedora19pre-linux-gnu.
Thanks,
Jan
gdb/
2013-03-12 Doug Evans <dje@google.com>
Jan Kratochvil <jan.kratochvil@redhat.com>
* dwarf2read.c (dw2_map_symtabs_matching_filename): Put continue after
any successful compare_filenames_for_search or FILENAME_CMP.
* psymtab.c (partial_map_symtabs_matching_filename): Likewise.
* symtab.c (iterate_over_some_symtabs): Likewise.
diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index faee1a8..47e4958 100644
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -3079,6 +3079,7 @@ dw2_map_symtabs_matching_filename (struct objfile *objfile, const char *name,
if (dw2_map_expand_apply (objfile, per_cu, name, real_path,
callback, data))
return 1;
+ continue;
}
/* Before we invoke realpath, which can get expensive when many
@@ -3093,6 +3094,7 @@ dw2_map_symtabs_matching_filename (struct objfile *objfile, const char *name,
if (dw2_map_expand_apply (objfile, per_cu, name, real_path,
callback, data))
return 1;
+ continue;
}
if (real_path != NULL)
@@ -3105,6 +3107,7 @@ dw2_map_symtabs_matching_filename (struct objfile *objfile, const char *name,
if (dw2_map_expand_apply (objfile, per_cu, name, real_path,
callback, data))
return 1;
+ continue;
}
}
}
diff --git a/gdb/psymtab.c b/gdb/psymtab.c
index 2965e9f..7b118c5 100644
--- a/gdb/psymtab.c
+++ b/gdb/psymtab.c
@@ -183,6 +183,7 @@ partial_map_symtabs_matching_filename (struct objfile *objfile,
if (partial_map_expand_apply (objfile, name, real_path,
pst, callback, data))
return 1;
+ continue;
}
/* Before we invoke realpath, which can get expensive when many
@@ -196,6 +197,7 @@ partial_map_symtabs_matching_filename (struct objfile *objfile,
if (partial_map_expand_apply (objfile, name, real_path,
pst, callback, data))
return 1;
+ continue;
}
/* If the user gave us an absolute path, try to find the file in
@@ -209,6 +211,7 @@ partial_map_symtabs_matching_filename (struct objfile *objfile,
if (partial_map_expand_apply (objfile, name, real_path,
pst, callback, data))
return 1;
+ continue;
}
}
}
diff --git a/gdb/symtab.c b/gdb/symtab.c
index c0e5884..c9dcf7a 100644
--- a/gdb/symtab.c
+++ b/gdb/symtab.c
@@ -212,6 +212,7 @@ iterate_over_some_symtabs (const char *name,
{
if (callback (s, data))
return 1;
+ continue;
}
/* Before we invoke realpath, which can get expensive when many
@@ -224,6 +225,7 @@ iterate_over_some_symtabs (const char *name,
{
if (callback (s, data))
return 1;
+ continue;
}
/* If the user gave us an absolute path, try to find the file in
@@ -239,6 +241,7 @@ iterate_over_some_symtabs (const char *name,
{
if (callback (s, data))
return 1;
+ continue;
}
}
}
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [patch] Accelerate filenames matching
2013-03-12 13:26 [patch] Accelerate filenames matching Jan Kratochvil
@ 2013-03-12 15:19 ` Joel Brobecker
2013-03-12 15:29 ` Jan Kratochvil
2013-03-12 17:48 ` Doug Evans
1 sibling, 1 reply; 5+ messages in thread
From: Joel Brobecker @ 2013-03-12 15:19 UTC (permalink / raw)
To: Jan Kratochvil; +Cc: gdb-patches, Doug Evans
> gdb/
> 2013-03-12 Doug Evans <dje@google.com>
> Jan Kratochvil <jan.kratochvil@redhat.com>
>
> * dwarf2read.c (dw2_map_symtabs_matching_filename): Put continue after
> any successful compare_filenames_for_search or FILENAME_CMP.
> * psymtab.c (partial_map_symtabs_matching_filename): Likewise.
> * symtab.c (iterate_over_some_symtabs): Likewise.
Do we want this patch for 7.6?
> diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
> index faee1a8..47e4958 100644
> --- a/gdb/dwarf2read.c
> +++ b/gdb/dwarf2read.c
> @@ -3079,6 +3079,7 @@ dw2_map_symtabs_matching_filename (struct objfile *objfile, const char *name,
> if (dw2_map_expand_apply (objfile, per_cu, name, real_path,
> callback, data))
> return 1;
> + continue;
> }
>
> /* Before we invoke realpath, which can get expensive when many
> @@ -3093,6 +3094,7 @@ dw2_map_symtabs_matching_filename (struct objfile *objfile, const char *name,
> if (dw2_map_expand_apply (objfile, per_cu, name, real_path,
> callback, data))
> return 1;
> + continue;
> }
>
> if (real_path != NULL)
> @@ -3105,6 +3107,7 @@ dw2_map_symtabs_matching_filename (struct objfile *objfile, const char *name,
> if (dw2_map_expand_apply (objfile, per_cu, name, real_path,
> callback, data))
> return 1;
> + continue;
> }
> }
> }
> diff --git a/gdb/psymtab.c b/gdb/psymtab.c
> index 2965e9f..7b118c5 100644
> --- a/gdb/psymtab.c
> +++ b/gdb/psymtab.c
> @@ -183,6 +183,7 @@ partial_map_symtabs_matching_filename (struct objfile *objfile,
> if (partial_map_expand_apply (objfile, name, real_path,
> pst, callback, data))
> return 1;
> + continue;
> }
>
> /* Before we invoke realpath, which can get expensive when many
> @@ -196,6 +197,7 @@ partial_map_symtabs_matching_filename (struct objfile *objfile,
> if (partial_map_expand_apply (objfile, name, real_path,
> pst, callback, data))
> return 1;
> + continue;
> }
>
> /* If the user gave us an absolute path, try to find the file in
> @@ -209,6 +211,7 @@ partial_map_symtabs_matching_filename (struct objfile *objfile,
> if (partial_map_expand_apply (objfile, name, real_path,
> pst, callback, data))
> return 1;
> + continue;
> }
> }
> }
> diff --git a/gdb/symtab.c b/gdb/symtab.c
> index c0e5884..c9dcf7a 100644
> --- a/gdb/symtab.c
> +++ b/gdb/symtab.c
> @@ -212,6 +212,7 @@ iterate_over_some_symtabs (const char *name,
> {
> if (callback (s, data))
> return 1;
> + continue;
> }
>
> /* Before we invoke realpath, which can get expensive when many
> @@ -224,6 +225,7 @@ iterate_over_some_symtabs (const char *name,
> {
> if (callback (s, data))
> return 1;
> + continue;
> }
>
> /* If the user gave us an absolute path, try to find the file in
> @@ -239,6 +241,7 @@ iterate_over_some_symtabs (const char *name,
> {
> if (callback (s, data))
> return 1;
> + continue;
> }
> }
> }
--
Joel
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [patch] Accelerate filenames matching
2013-03-12 15:19 ` Joel Brobecker
@ 2013-03-12 15:29 ` Jan Kratochvil
0 siblings, 0 replies; 5+ messages in thread
From: Jan Kratochvil @ 2013-03-12 15:29 UTC (permalink / raw)
To: Joel Brobecker; +Cc: gdb-patches, Doug Evans
On Tue, 12 Mar 2013 16:19:12 +0100, Joel Brobecker wrote:
> > gdb/
> > 2013-03-12 Doug Evans <dje@google.com>
> > Jan Kratochvil <jan.kratochvil@redhat.com>
> >
> > * dwarf2read.c (dw2_map_symtabs_matching_filename): Put continue after
> > any successful compare_filenames_for_search or FILENAME_CMP.
> > * psymtab.c (partial_map_symtabs_matching_filename): Likewise.
> > * symtab.c (iterate_over_some_symtabs): Likewise.
>
> Do we want this patch for 7.6?
I do not think so, the behavior was already this way in 7.4 and I am not aware
of any issues with it.
Jan
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [patch] Accelerate filenames matching
2013-03-12 13:26 [patch] Accelerate filenames matching Jan Kratochvil
2013-03-12 15:19 ` Joel Brobecker
@ 2013-03-12 17:48 ` Doug Evans
2013-03-14 16:37 ` [commit] " Jan Kratochvil
1 sibling, 1 reply; 5+ messages in thread
From: Doug Evans @ 2013-03-12 17:48 UTC (permalink / raw)
To: Jan Kratochvil; +Cc: gdb-patches
On Tue, Mar 12, 2013 at 6:26 AM, Jan Kratochvil
<jan.kratochvil@redhat.com> wrote:
> Hi,
>
> I have read Doug's IRC line:
> xdje: In dw2_map_symtabs_matching_filename, in the case where compare_filenames_for_search succeeds, is there a point to falling through and trying again with the real path if dw2_map_expand_apply returns 0?
>
> So here is the fix. It could call the callback multiple times which may be
> considered a bug (I have not checked if it may be a problem for any of the
> callbacks).
>
> No regressions on {x86_64,x86_64-m32,i686}-fedora19pre-linux-gnu.
>
>
> Thanks,
> Jan
>
>
> gdb/
> 2013-03-12 Doug Evans <dje@google.com>
> Jan Kratochvil <jan.kratochvil@redhat.com>
>
> * dwarf2read.c (dw2_map_symtabs_matching_filename): Put continue after
> any successful compare_filenames_for_search or FILENAME_CMP.
> * psymtab.c (partial_map_symtabs_matching_filename): Likewise.
> * symtab.c (iterate_over_some_symtabs): Likewise.
If there are no regressions, 'tis fine with me.
Thanks!
^ permalink raw reply [flat|nested] 5+ messages in thread* [commit] [patch] Accelerate filenames matching
2013-03-12 17:48 ` Doug Evans
@ 2013-03-14 16:37 ` Jan Kratochvil
0 siblings, 0 replies; 5+ messages in thread
From: Jan Kratochvil @ 2013-03-14 16:37 UTC (permalink / raw)
To: Doug Evans; +Cc: gdb-patches
On Tue, 12 Mar 2013 18:48:14 +0100, Doug Evans wrote:
> > gdb/
> > 2013-03-12 Doug Evans <dje@google.com>
> > Jan Kratochvil <jan.kratochvil@redhat.com>
> >
> > * dwarf2read.c (dw2_map_symtabs_matching_filename): Put continue after
> > any successful compare_filenames_for_search or FILENAME_CMP.
> > * psymtab.c (partial_map_symtabs_matching_filename): Likewise.
> > * symtab.c (iterate_over_some_symtabs): Likewise.
>
> If there are no regressions, 'tis fine with me.
> Thanks!
Checked in:
http://sourceware.org/ml/gdb-cvs/2013-03/msg00137.html
Jan
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2013-03-14 16:37 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-03-12 13:26 [patch] Accelerate filenames matching Jan Kratochvil
2013-03-12 15:19 ` Joel Brobecker
2013-03-12 15:29 ` Jan Kratochvil
2013-03-12 17:48 ` Doug Evans
2013-03-14 16:37 ` [commit] " Jan Kratochvil
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox