apt-pkg/depcache.cc:

- Call opProgress->Update() less often too avoid spending too
  much time in it (it shows up relatively high in the callgrind logs).
  But do call it more often than just for each percent so that the
  UI frontends can use the OpProgress::Update() calling to do e.g. UI
  updates

diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc
index 5c011d743e20a3807b4b77af679cb518b824f817..13abbe5ed2ae5c7bedf29e1614a2708ccdc5f21f 100644 (file)
--- a/apt-pkg/depcache.cc
+++ b/apt-pkg/depcache.cc
@@ -127,12 +127,9 @@ bool pkgDepCache::Init(OpProgress *Prog)
    /* Set the current state of everything. In this state all of the
       packages are kept exactly as is. See AllUpgrade */
    int Done = 0;
    /* Set the current state of everything. In this state all of the
       packages are kept exactly as is. See AllUpgrade */
    int Done = 0;

-   int Update_interval = Head().PackageCount/100;
-   if (Update_interval == 0)
-      Update_interval = 1;

    for (PkgIterator I = PkgBegin(); I.end() != true; I++,Done++)
    {
    for (PkgIterator I = PkgBegin(); I.end() != true; I++,Done++)
    {

-      if (Prog != 0 && Done%Update_interval == 0)
+      if (Prog != 0 && Done%20 == 0)

         Prog->Progress(Done);
       
       // Find the proper cache slot
         Prog->Progress(Done);
       
       // Find the proper cache slot


@@ -615,12 +612,9 @@ void pkgDepCache::Update(OpProgress *Prog)
    
    // Perform the depends pass
    int Done = 0;
    
    // Perform the depends pass
    int Done = 0;

-   int Update_interval = Head().PackageCount;
-   if (Update_interval == 0)
-      Update_interval = 1;

    for (PkgIterator I = PkgBegin(); I.end() != true; I++,Done++)
    {
    for (PkgIterator I = PkgBegin(); I.end() != true; I++,Done++)
    {

-      if (Prog != 0 && Done%Update_interval == 0)
+      if (Prog != 0 && Done%20 == 0)

         Prog->Progress(Done);
       for (VerIterator V = I.VersionList(); V.end() != true; V++)
       {
         Prog->Progress(Done);
       for (VerIterator V = I.VersionList(); V.end() != true; V++)
       {