RepoMirrors/libabigail
1
0
Fork 0
mirror of git://sourceware.org/git/libabigail.git synced 2024-12-18 16:04:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update diff stats when added symbols are removed from change report

Browse Source 
Until now, when added symbols were removed from the diff output, the
diff stat was not properly updated.  This patch fixes that.

	* include/abg-comparison.h (diff_context_wptr)
	(corpus_diff::diff_stats_sptr): New typedefs.
	(corpus_diff::diff_stats::diff_stats): Make this constructor take
	a diff_context_sptr.  Make the default constructor private.
	* src/abg-comparison.cc (corpus_diff::diff_stats::priv::ctxt_):
	New data member.  This is a weak pointer to a diff_context.
	(corpus_diff::diff_stats::priv::priv): Take a diff_context_sptr
	and initialize the weak pointer ctxt_ to it.
	(corpus_diff::diff_stats::priv::ctxt): New accessor to the
	diff_context hold by the diff_stats.
	(corpus_diff::diff_stats::{num_removed_func_filtered_out,
	num_added_func_filtered_out, num_removed_vars_filtered_out,
	num_added_vars_filtered_out, num_removed_func_syms_filtered_out,
	num_added_func_syms_filtered_out,
	num_removed_var_syms_filtered_out,
	num_added_var_syms_filtered_out}): If the user asked for the added
	[or removed] variables/functions/symbols to be ignored, the
	accessors for the number of filtered added/removed variables/functions/symbols
	return the total number of added/removed
	variables/functions/symbols; that is, say that *all* added/removed
	variables/functions/symbols got filtered out.
	(corpus_diff::priv::diff_stats_): Turn this data member into a
	[shared] pointer to diff_stats.
	(corpus_diff::priv::filters_and_suppr_applied_): Remove this data
	member.  Now that diff_stats_ is a pointer, we don't need this
	boolean anymore.
	(corpus_diff::apply_filters_and_suppressions_before_reporting):
	Adjust to the fact that filters_and_suppr_applied_ is gone, and
	that diff_stats_ is now a pointer.
	(corpus_diff::report): Control un-referenced added symbols
	reporting with
	diff_context::show_added_symbols_unreferenced_by_debug_info()

Signed-off-by: Dodji Seketeli <dodji@redhat.com>
This commit is contained in:
Dodji Seketeli 2015-08-06 13:36:52 +02:00
parent a746f4afee
commit 465b25e0d8
2 changed files with 94 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/abg-comparison.h
View File

@ -245,6 +245,9 @@ class diff_context;
/// Convenience typedef for a shared pointer of @ref diff_context.
typedef shared_ptr<diff_context> diff_context_sptr;
/// Convenience typedef for a weak pointer of @ref diff_context.
typedef weak_ptr<diff_context> diff_context_wptr;
class diff_node_visitor;
struct diff_traversable_base;
@ -2567,6 +2570,9 @@ public:
class diff_stats;
/// A convenience typedef for a shared pointer to @ref diff_stats
typedef shared_ptr<diff_stats> diff_stats_sptr;
corpus_sptr
first_corpus() const;
@ -2683,9 +2689,11 @@ class corpus_diff::diff_stats
priv_sptr priv_;
diff_stats();
public:
diff_stats();
diff_stats(diff_context_sptr);
size_t num_func_removed() const;
void num_func_removed(size_t);

128
src/abg-comparison.cc
View File

@ -12111,29 +12111,31 @@ class corpus_diff::diff_stats::priv
{
friend class corpus_diff::diff_stats;
size_t num_func_removed;
size_t num_removed_func_filtered_out;
size_t num_func_added;
size_t num_added_func_filtered_out;
size_t num_func_changed;
size_t num_changed_func_filtered_out;
size_t num_vars_removed;
size_t num_removed_vars_filtered_out;
size_t num_vars_added;
size_t num_added_vars_filtered_out;
size_t num_vars_changed;
size_t num_changed_vars_filtered_out;
size_t num_func_syms_removed;
size_t num_removed_func_syms_filtered_out;
size_t num_func_syms_added;
size_t num_added_func_syms_filtered_out;
size_t num_var_syms_removed;
size_t num_removed_var_syms_filtered_out;
size_t num_var_syms_added;
size_t num_added_var_syms_filtered_out;
diff_context_wptr ctxt_;
size_t num_func_removed;
size_t num_removed_func_filtered_out;
size_t num_func_added;
size_t num_added_func_filtered_out;
size_t num_func_changed;
size_t num_changed_func_filtered_out;
size_t num_vars_removed;
size_t num_removed_vars_filtered_out;
size_t num_vars_added;
size_t num_added_vars_filtered_out;
size_t num_vars_changed;
size_t num_changed_vars_filtered_out;
size_t num_func_syms_removed;
size_t num_removed_func_syms_filtered_out;
size_t num_func_syms_added;
size_t num_added_func_syms_filtered_out;
size_t num_var_syms_removed;
size_t num_removed_var_syms_filtered_out;
size_t num_var_syms_added;
size_t num_added_var_syms_filtered_out;
priv()
: num_func_removed(),
priv(diff_context_sptr ctxt)
: ctxt_(ctxt),
num_func_removed(),
num_removed_func_filtered_out(),
num_func_added(),
num_added_func_filtered_out(),
@ -12154,11 +12156,15 @@ class corpus_diff::diff_stats::priv
num_var_syms_added(),
num_added_var_syms_filtered_out()
{}
diff_context_sptr
ctxt()
{return ctxt_.expired() ? diff_context_sptr() : diff_context_sptr(ctxt_);}
}; // end class corpus_diff::diff_stats::priv
/// Default constructor for the @ref diff_stat type.
corpus_diff::diff_stats::diff_stats()
: priv_(new priv)
/// Constructor for the @ref diff_stat type.
corpus_diff::diff_stats::diff_stats(diff_context_sptr ctxt)
: priv_(new priv(ctxt))
{}
/// Getter for the number of functions removed.
@ -12182,7 +12188,11 @@ corpus_diff::diff_stats::num_func_removed(size_t n)
/// out.
size_t
corpus_diff::diff_stats::num_removed_func_filtered_out() const
{return priv_->num_removed_func_filtered_out;}
{
if (priv_->ctxt() && !priv_->ctxt()->show_deleted_fns())
return num_func_removed();
return priv_->num_removed_func_filtered_out;
}
/// Setter for the number of removed functions that have been filtered
/// out.
@ -12224,7 +12234,11 @@ corpus_diff::diff_stats::num_func_added(size_t n)
/// @return the number of added function that have been filtered out.
size_t
corpus_diff::diff_stats::num_added_func_filtered_out() const
{return priv_->num_added_func_filtered_out;}
{
if (priv_->ctxt() && !priv_->ctxt()->show_added_fns())
return num_func_added();
return priv_->num_added_func_filtered_out;
}
/// Setter for the number of added function that have been filtered
/// out.
@ -12315,7 +12329,11 @@ corpus_diff::diff_stats::num_vars_removed(size_t n)
/// @return the number removed variables that have been filtered out.
size_t
corpus_diff::diff_stats::num_removed_vars_filtered_out() const
{return priv_->num_removed_vars_filtered_out;}
{
if (priv_->ctxt() && !priv_->ctxt()->show_deleted_vars())
return num_vars_removed();
return priv_->num_removed_vars_filtered_out;
}
/// Setter for the number of removed variables that have been filtered
/// out.
@ -12359,7 +12377,11 @@ corpus_diff::diff_stats::num_vars_added(size_t n)
/// @return the number of added variables that have been filtered out.
size_t
corpus_diff::diff_stats::num_added_vars_filtered_out() const
{return priv_->num_added_vars_filtered_out;}
{
if (priv_->ctxt() && !priv_->ctxt()->show_added_vars())
return num_vars_added();
return priv_->num_added_vars_filtered_out;
}
/// Setter for the number of added variables that have been filtered
/// out.
@ -12455,7 +12477,12 @@ corpus_diff::diff_stats::num_func_syms_removed(size_t n)
/// debug info, that have been filtered out.
size_t
corpus_diff::diff_stats::num_removed_func_syms_filtered_out() const
{return priv_->num_removed_func_syms_filtered_out;}
{
if (priv_->ctxt()
&& !priv_->ctxt()->show_symbols_unreferenced_by_debug_info())
return num_func_syms_removed();
return priv_->num_removed_func_syms_filtered_out;
}
/// Setter for the number of removed function symbols, not referenced
/// by debug info, that have been filtered out.
@ -12508,7 +12535,13 @@ corpus_diff::diff_stats::num_func_syms_added(size_t n)
/// any debug info, that have been filtered out.
size_t
corpus_diff::diff_stats::num_added_func_syms_filtered_out() const
{return priv_->num_added_func_syms_filtered_out;}
{
if (priv_->ctxt()
&& !(priv_->ctxt()->show_added_symbols_unreferenced_by_debug_info()
&& priv_->ctxt()->show_symbols_unreferenced_by_debug_info()))
return num_func_syms_added();
return priv_->num_added_func_syms_filtered_out;
}
/// Setter for the number of added function symbols, not referenced by
/// any debug info, that have been filtered out.
@ -12561,7 +12594,12 @@ corpus_diff::diff_stats::num_var_syms_removed(size_t n)
/// by any debug info, that have been filtered out.
size_t
corpus_diff::diff_stats::num_removed_var_syms_filtered_out() const
{return priv_->num_removed_var_syms_filtered_out;}
{
if (priv_->ctxt()
&& !priv_->ctxt()->show_symbols_unreferenced_by_debug_info())
return num_var_syms_removed();
return priv_->num_removed_var_syms_filtered_out;
}
/// Setter for the number of removed variable symbols, not referenced
/// by any debug info, that have been filtered out.
@ -12614,7 +12652,13 @@ corpus_diff::diff_stats::num_var_syms_added(size_t n)
/// any debug info, that have been filtered out.
size_t
corpus_diff::diff_stats::num_added_var_syms_filtered_out() const
{return priv_->num_added_var_syms_filtered_out;}
{
if (priv_->ctxt()
&& !(priv_->ctxt()->show_added_symbols_unreferenced_by_debug_info()
&& priv_->ctxt()->show_symbols_unreferenced_by_debug_info()))
return num_var_syms_added();
return priv_->num_added_var_syms_filtered_out;
}
/// Setter for the number of added variable symbols, not referenced by
/// any debug info, that have been filtered out.
@ -12651,8 +12695,7 @@ struct corpus_diff::priv
diff_context_sptr ctxt_;
corpus_sptr first_;
corpus_sptr second_;
corpus_diff::diff_stats diff_stats_;
bool filters_and_suppr_applied_;
corpus_diff::diff_stats_sptr diff_stats_;
bool sonames_equal_;
bool architectures_equal_;
edit_script fns_edit_script_;
@ -12682,7 +12725,6 @@ struct corpus_diff::priv
priv()
: finished_(false),
filters_and_suppr_applied_(false),
sonames_equal_(false),
architectures_equal_(false)
{}
@ -14276,15 +14318,13 @@ show_linkage_name_and_aliases(ostream& out,
const corpus_diff::diff_stats&
corpus_diff::apply_filters_and_suppressions_before_reporting()
{
if (priv_->filters_and_suppr_applied_)
return priv_->diff_stats_;
if (priv_->diff_stats_)
return *priv_->diff_stats_;
apply_suppressions(this);
priv_->apply_filters_and_compute_diff_stats(priv_->diff_stats_);
priv_->filters_and_suppr_applied_ = true;
return priv_->diff_stats_;
priv_->diff_stats_.reset(new diff_stats(priv_->ctxt_));
priv_->apply_filters_and_compute_diff_stats(*priv_->diff_stats_);
return *priv_->diff_stats_;
}
/// Report the diff in a serialized form.
@ -14635,6 +14675,7 @@ corpus_diff::report(ostream& out, const string& indent) const
// Report added function symbols not referenced by any debug info.
if (context()->show_symbols_unreferenced_by_debug_info()
&& context()->show_added_symbols_unreferenced_by_debug_info()
&& priv_->added_unrefed_fn_syms_.size())
{
if (s.net_num_added_func_syms() == 1)
@ -14705,6 +14746,7 @@ corpus_diff::report(ostream& out, const string& indent) const
// Report added variable symbols not referenced by any debug info.
if (context()->show_symbols_unreferenced_by_debug_info()
&& context()->show_added_symbols_unreferenced_by_debug_info()
&& priv_->added_unrefed_var_syms_.size())
{
if (s.net_num_added_var_syms() == 1)