RepoMirrors/libabigail
1
0
Fork 0
mirror of git://sourceware.org/git/libabigail.git synced 2024-12-17 23:44:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix logs in abipkgdiff and add some more

Browse Source 
* tools/abipkgdiff.cc (compare): Fix logs to make them more
	readable in a multithreaded context.
	(create_maps_of_package_content): Likewise.  Add logs about the
	number of elf files found in a given directory.  Add logs about
	skipping files.

Signed-off-by: Dodji Seketeli <dodji@redhat.com>
This commit is contained in:
Dodji Seketeli 2016-03-25 12:30:35 +01:00
parent 67435cf6cd
commit b1af2c72b8
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
tools/abipkgdiff.cc
View File

@ -983,7 +983,7 @@ compare(const elf_file& elf1,
emit_prefix("abipkgdiff", cerr)
<< " DONE reading file "
<< elf1.path
<< " ...\n";
<< "\n";
if (verbose)
emit_prefix("abipkgdiff", cerr)
@ -1020,7 +1020,7 @@ compare(const elf_file& elf1,
if (verbose)
emit_prefix("abipkgdiff", cerr)
<< " DONE reading file " << elf2.path << " ...\n";
<< " DONE reading file " << elf2.path << "\n";
if (verbose)
emit_prefix("abipkgdiff", cerr)
@ -1130,7 +1130,7 @@ create_maps_of_package_content(package& package,
<< package.path()
<< " extracted to "
<< package.extracted_dir_path()
<< " ...";
<< " ...\n";
if (ftw(package.extracted_dir_path().c_str(), callback, 16))
{
@ -1140,6 +1140,11 @@ create_maps_of_package_content(package& package,
return false;
}
if (verbose)
emit_prefix("abipkgdiff", cerr)
<< "Found " << elf_file_paths->size() << " files in "
<< package.extracted_dir_path() << "\n";
for (vector<string>::const_iterator file =
elf_file_paths->begin();
file != elf_file_paths->end();
@ -1149,14 +1154,24 @@ create_maps_of_package_content(package& package,
if (opts.compare_dso_only)
{
if (e->type != abigail::dwarf_reader::ELF_TYPE_DSO)
{
if (verbose)
emit_prefix("abipkgdiff", cerr)
<< "skipping non-DSO file " << e->path << "\n";
continue;
}
}
else
{
if (e->type != abigail::dwarf_reader::ELF_TYPE_DSO
&& e->type != abigail::dwarf_reader::ELF_TYPE_EXEC)
{
if (verbose)
emit_prefix("abipkgdiff", cerr)
<< "skipping non-DSO non-executable file " << e->path << "\n";
continue;
}
}
if (e->soname.empty())
package.path_elf_file_sptr_map()[e->name] = e;
@ -1168,7 +1183,8 @@ create_maps_of_package_content(package& package,
delete elf_file_paths;
if (verbose)
emit_prefix("abipkgdiff", cerr) << " DONE\n";
emit_prefix("abipkgdiff", cerr)
<< " Analysis of " << package.path() << " DONE\n";
return true;
}