[Aptitude-svn-commit] r4121 - in branches/aptitude-0.3/aptitude: . src

[Daniel Burrows]

Author: dburrows
Date: Tue Sep 20 02:39:37 2005
New Revision: 4121

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/broken_indicator.cc
Log:
Display statistics about the resolver while it's running interactively.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Tue Sep 20 02:39:37 2005
@@ -1,5 +1,9 @@
 2005-09-19  Daniel Burrows  <dburrows at debian.org>
 
+	* src/broken_indicator.cc:
+
+	  Display the resolver statistics while it's running.
+
 	* src/generic/resolver_manager.cc, src/generic/resolver_manager.h:
 
 	  Expose the resolver's queue counts in the state snapshot.

Modified: branches/aptitude-0.3/aptitude/src/broken_indicator.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/broken_indicator.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/broken_indicator.cc	Tue Sep 20 02:39:37 2005
@@ -209,7 +209,12 @@
 
 	vector<fragment_column_entry> columns;
 
-	columns.push_back(fragment_column_entry(true, 1, fragment_column_entry::top, hardwrapbox(text_fragment("Resolving dependencies"))));
+	columns.push_back(fragment_column_entry(true, 1, fragment_column_entry::top, hardwrapbox(fragf(ssprintf(_("Resolving dependencies%%nopen: %d; closed: %d; defer=%d; conflict=%d"),
+															state.open_size, state.closed_size,
+															state.deferred_size, state.conflicts_size).c_str()))));
+
+	columns.push_back(fragment_column_entry(false, 1, fragment_column_entry::top, NULL));
+
 	columns.push_back(fragment_column_entry(false, 1, fragment_column_entry::top, text_fragment(spin_string(state))));
 
 	set_fragment(fragment_columns(columns));
@@ -322,16 +327,21 @@
 	fragments.push_back(join_fragments(suggestions,
 					   L","));
 
-	vector<fragment_column_entry> columns;
-	columns.push_back(fragment_column_entry(true, 1, fragment_column_entry::top, hardwrapbox(sequence_fragment(fragments))));
+	if(state.background_thread_active)
+	  {
+	    vector<fragment_column_entry> columns;
+	    columns.push_back(fragment_column_entry(true, 1, fragment_column_entry::top, hardwrapbox(sequence_fragment(fragments))));
 
-	columns.push_back(fragment_column_entry(false, 1, fragment_column_entry::top, NULL));
+	    columns.push_back(fragment_column_entry(false, 1, fragment_column_entry::top, NULL));
 
-	columns.push_back(fragment_column_entry(false, 1, fragment_column_entry::top, text_fragment(spin_string(state))));
+	    columns.push_back(fragment_column_entry(false, 1, fragment_column_entry::top, text_fragment(spin_string(state))));
 
 
-	fragments.clear();
-	fragments.push_back(fragment_columns(columns));
+	    fragments.clear();
+	    fragments.push_back(fragment_columns(columns));
+	  }
+	else
+	  fragments.push_back(newline_fragment());
 	fragments.push_back(hardwrapbox(key_hint_fragment()));
 
 	fragment *f=sequence_fragment(fragments);