File yast2-gtk-progress-speedup.patch of Package yast2-gtk

Overview Repositories Revisions Requests Users Attributes Meta

File yast2-gtk-progress-speedup.patch of Package yast2-gtk (Revision 4f0a1d2784088223edacfd4dbd32602f)

Currently displaying revision 4f0a1d2784088223edacfd4dbd32602f , Show latest

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 40654)
+++ ChangeLog	(revision 41241)
@@ -1,3 +1,13 @@
+2007-10-03 Michael Meeks <michael.meeks@novell.com>
+
+	* src/YGPackageSelector.cc: don't re-render the progress bar
+	so much when building the package tree: ~20% speedup.
+
+	* src/YGPackageSelector.cc (PackageSelector): turn off searching
+	description, too slow.	
+	(fastGetSummary): implement cache for summaries - hugely
+	accelerates searching etc. at cost of some memory.
+
 2007-08-26 Michael Meeks <michael.meeks@novell.com>
 
 	* src/YGPackageSelector.cc (does_package_match_one):
Index: src/YGPackageSelector.cc
===================================================================
--- src/YGPackageSelector.cc	(revision 40654)
+++ src/YGPackageSelector.cc	(revision 41241)
@@ -19,6 +19,8 @@
 #include "ygtkratiobox.h"
 #include "ygtkfindentry.h"
 
+#include <map>
+
 //#define DISABLE_PACKAGE_SELECTOR
 
 #ifndef DISABLE_PACKAGE_SELECTOR
@@ -67,6 +69,16 @@ inline ZyppPattern tryCastToZyppPattern 
 inline ZyppLanguage tryCastToZyppLanguage (ZyppObject obj)
 	{ return zypp::dynamic_pointer_cast <const zypp::Language> (obj); }
 
+static zypp::Text
+fastGetSummary (ZyppObject obj)
+{
+ static std::map<std::string, zypp::Text> name_to_summary;
+ std::string &summary = name_to_summary[ obj->name() ];
+ if (summary.length() <= 0)
+ summary = obj->summary();
+ return summary;
+}
+
 // Computer icon comes from Tango, but may not be installed, or not initialized.
 #include "computer.xpm"
 
@@ -320,7 +332,7 @@ static string getSourceName (zypp::Sourc
 				return "";
 			}
 			found = true;
-			ret = product->summary();
+			ret = fastGetSummary (product);
 		}
 	}
 
@@ -1126,8 +1138,8 @@ public:
 		 G_CALLBACK (view_languages_mode_cb), this);
 
 		// default search fields
-		name_opt = summary_opt = descr_opt = provides_opt = true;
-		requires_opt = false;
+		name_opt = summary_opt = provides_opt = true;
+		requires_opt = descr_opt = false;
 
 		GtkWidget *search_hbox, *search_label;
 		search_hbox = gtk_hbox_new (FALSE, 0);
@@ -1353,7 +1365,7 @@ public:
 		GtkTreeModel *model = GTK_TREE_MODEL (store);
 		g_object_set_data (G_OBJECT (model), "detail-package", GINT_TO_POINTER (1));
 
-		SET_PROGRESS (zyppPool().size <zypp::Package>(), 10)
+		SET_PROGRESS (zyppPool().size <zypp::Package>(), 50)
 		GtkTreeIter iter;
 		for (ZyppPool::const_iterator it = zyppPool().byKindBegin <zypp::Package>();
 		 it != zyppPool().byKindEnd <zypp::Package>(); it++)
@@ -1377,7 +1389,7 @@ public:
 		// we need to create the categories tree as we iterate packages
 		map <string, GtkTreePath *> tree;
 
-		SET_PROGRESS (zyppPool().size <zypp::Package>(), 5)
+		SET_PROGRESS (zyppPool().size <zypp::Package>(), 50)
 		GtkTreeIter iter, parent_iter;
 		for (ZyppPool::const_iterator it = zyppPool().byKindBegin <zypp::Package>();
 		 it != zyppPool().byKindEnd <zypp::Package>(); it++)
@@ -1453,7 +1465,7 @@ public:
 		// we need to create a categories tree for the patterns
 		map <string, GtkTreeIter> tree;
 
-		SET_PROGRESS (zyppPool().size <zypp::Pattern>(), 1)
+		SET_PROGRESS (zyppPool().size <zypp::Pattern>(), 5)
 		for (ZyppPool::const_iterator it = zyppPool().byKindBegin <zypp::Pattern>();
 		 it != zyppPool().byKindEnd <zypp::Pattern>(); it++) {
 			ZyppSelectable selectable = *it;
@@ -1474,7 +1486,7 @@ public:
 				else
 					category_iter = cat_it->second;
 
-				string name = "" + object->summary() + "";
+				string name = "" + fastGetSummary (object) + "";
 				gtk_tree_store_append (store, &pattern_iter, &category_iter);
 				loadPackageRow (model, &pattern_iter, selectable);
 
@@ -1510,7 +1522,7 @@ public:
 		GtkTreeModel *model = GTK_TREE_MODEL (store);
 		g_object_set_data (G_OBJECT (model), "detail-package", GINT_TO_POINTER (0));
 
-		SET_PROGRESS (zyppPool().size <zypp::Language>(), 2)
+		SET_PROGRESS (zyppPool().size <zypp::Language>(), 20)
 		for (ZyppPool::const_iterator it = zyppPool().byKindBegin <zypp::Language>();
 		 it != zyppPool().byKindEnd <zypp::Language>(); it++) {
 			ZyppSelectable langsel = *it;
@@ -1638,13 +1650,13 @@ public:
 		if (available_obj) {
 			if (detailed)
 				availableName = "" + name + " (" + available_obj->edition().version() +
-				 ")\n" + YGUtils::escape_markup (available_obj->summary()) +
+				 ")\n" + YGUtils::escape_markup (fastGetSummary (available_obj)) +
 				 "";
 			else {
 				ZyppPattern pattern = tryCastToZyppPattern (available_obj);
 				ZyppLanguage lang = tryCastToZyppLanguage (available_obj);
 				if (pattern)
-					availableName = "" + available_obj->summary() + "";
+					availableName = "" + fastGetSummary (available_obj) + "";
 				else if (lang)
 					availableName = "" + available_obj->description() + "";
 				else
@@ -1654,13 +1666,13 @@ public:
 		if (install_obj) {
 			if (detailed)
 				installedName = "" + name + " (" + install_obj->edition().version() +
-				 ")\n" + YGUtils::escape_markup (install_obj->summary()) +
+				 ")\n" + YGUtils::escape_markup (fastGetSummary (install_obj)) +
 				 "";
 			else {
 				ZyppPattern pattern = tryCastToZyppPattern (install_obj);
 				ZyppLanguage lang = tryCastToZyppLanguage (install_obj);
 				if (pattern)
-					installedName = "" + install_obj->summary() + "";
+					installedName = "" + fastGetSummary (install_obj) + "";
 				else if (lang)
 					installedName = "" + install_obj->description() + "";
 				else
@@ -1791,8 +1803,6 @@ public:
 return FALSE;
 
 if (sel->name() == *cl->pThis->m_search_queries.begin()) {
- fprintf (stderr, "bingo !\n");
-
 cl->found = true;
 gtk_tree_selection_select_iter
 (gtk_tree_view_get_selection (cl->view), iter);
@@ -1825,7 +1835,11 @@ public:
 	static gboolean search_cb (gpointer data)
 	{
 		IMPL
+
+ // This is potentially very slow ...
+#ifdef IMPL_DEBUG
 fprintf (stderr, "search start...\n");
+#endif
 		PackageSelector *pThis = (PackageSelector *) data;
 		pThis->search_timeout_id = 0;
 
@@ -1846,7 +1860,9 @@ public:
 
 pThis->highlight_exact_matches ();
 
+#ifdef IMPL_DEBUG
 fprintf (stderr, "search done...\n");
+#endif
 		return FALSE;
 	}
 
@@ -1910,7 +1926,7 @@ public:
 if (summary_opt || descr_opt || provides_opt || requires_opt)
 obj = sel->theObj();
 
- if (summary_opt && YGUtils::contains (obj->summary(), key))
+ if (summary_opt && YGUtils::contains (fastGetSummary (obj), key))
 return TRUE;
 if (descr_opt && YGUtils::contains (obj->description(), key))
 return TRUE;

Places

File yast2-gtk-progress-speedup.patch of Package yast2-gtk (Revision 4f0a1d2784088223edacfd4dbd32602f)

Places