This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[patch] Accelerate filenames matching
- From: Jan Kratochvil <jan dot kratochvil at redhat dot com>
- To: gdb-patches at sourceware dot org
- Cc: Doug Evans <dje at google dot com>
- Date: Tue, 12 Mar 2013 14:26:40 +0100
- Subject: [patch] Accelerate filenames matching
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;
}
}
}