Minimal CD swaps

Author: jgg
Date: 2000-01-16 08:45:46 GMT
Minimal CD swaps

diff --git a/apt-pkg/makefile b/apt-pkg/makefile
index ef09c0ef74101c168d175ea156bfa6cca7c334de..e74ca064c90a2fdc6a54ae7ea6fba70952a741a4 100644 (file)
--- a/apt-pkg/makefile
+++ b/apt-pkg/makefile
@@ -11,7 +11,7 @@ include ../buildlib/defaults.mak
 
 # The library name
 LIBRARY=apt-pkg
 
 # The library name
 LIBRARY=apt-pkg

-MAJOR=2.6
+MAJOR=2.7

 MINOR=0
 SLIBS=$(PTHREADLIB)
 
 MINOR=0
 SLIBS=$(PTHREADLIB)
 

diff --git a/apt-pkg/orderlist.cc b/apt-pkg/orderlist.cc
index fbd21d4009dd18c2fe3a045e20ddd6c2da695144..b46056128b98050c05a88fbcd83bd2be481599f9 100644 (file)
--- a/apt-pkg/orderlist.cc
+++ b/apt-pkg/orderlist.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: orderlist.cc,v 1.10 2000/01/16 05:36:17 jgg Exp $
+// $Id: orderlist.cc,v 1.11 2000/01/16 08:45:47 jgg Exp $

 /* ######################################################################
 
    Order List - Represents and Manipulates an ordered list of packages.
 /* ######################################################################
 
    Order List - Represents and Manipulates an ordered list of packages.


@@ -45,6 +45,14 @@
    The rules listed above may never be violated and are called Critical.
    When a critical rule is violated then a loop condition is recorded
    and will have to be delt with in the caller.
    The rules listed above may never be violated and are called Critical.
    When a critical rule is violated then a loop condition is recorded
    and will have to be delt with in the caller.

+
+   The ordering keeps two lists, the main list and the 'After List'. The
+   purpose of the after list is to allow packages to be delayed. This is done
+   by setting the after flag on the package. Any package which requires this
+   package to be ordered before will inherit the after flag and so on. This
+   is used for CD swap ordering where all packages on a second CD have the 
+   after flag set. This forces them and all their dependents to be ordered
+   toward the end.

    
    ##################################################################### */
                                                                        /*}}}*/
    
    ##################################################################### */
                                                                        /*}}}*/


@@ -75,7 +83,7 @@ pkgOrderList::pkgOrderList(pkgDepCache &Cache) : Cache(Cache)
    /* Construct the arrays, egcs 1.0.1 bug requires the package count
       hack */
    unsigned long Size = Cache.HeaderP->PackageCount;
    /* Construct the arrays, egcs 1.0.1 bug requires the package count
       hack */
    unsigned long Size = Cache.HeaderP->PackageCount;

-   Flags = new unsigned char[Size];
+   Flags = new unsigned short[Size];

    End = List = new Package *[Size];
    memset(Flags,0,sizeof(*Flags)*Size);
 }
    End = List = new Package *[Size];
    memset(Flags,0,sizeof(*Flags)*Size);
 }


@@ -117,13 +125,15 @@ bool pkgOrderList::DoRun()
    // Temp list
    unsigned long Size = Cache.HeaderP->PackageCount;
    Package **NList = new Package *[Size];
    // Temp list
    unsigned long Size = Cache.HeaderP->PackageCount;
    Package **NList = new Package *[Size];

-
+   AfterList = new Package *[Size];
+   AfterEnd = AfterList;
+   

    Depth = 0;
    WipeFlags(Added | AddPending | Loop | InList);
 
    for (iterator I = List; I != End; I++)
       Flag(*I,InList);
    Depth = 0;
    WipeFlags(Added | AddPending | Loop | InList);
 
    for (iterator I = List; I != End; I++)
       Flag(*I,InList);

-   
+

    // Rebuild the main list into the temp list.
    iterator OldEnd = End;
    End = NList;
    // Rebuild the main list into the temp list.
    iterator OldEnd = End;
    End = NList;


@@ -132,11 +142,17 @@ bool pkgOrderList::DoRun()
       {
         End = OldEnd;
         delete [] NList;
       {
         End = OldEnd;
         delete [] NList;

+        delete [] AfterList;

         return false;
       }
    
         return false;
       }
    

+   // Copy the after list to the end of the main list
+   for (Package **I = AfterList; I != AfterEnd; I++)
+      *End++ = *I;
+   

    // Swap the main list to the new list
    delete [] List;
    // Swap the main list to the new list
    delete [] List;

+   delete [] AfterList;

    List = NList;
    return true;
 }
    List = NList;
    return true;
 }


@@ -176,6 +192,20 @@ bool pkgOrderList::OrderUnpack(string *FileList)
 {
    this->FileList = FileList;
 
 {
    this->FileList = FileList;
 

+   // Setup the after flags
+   if (FileList != 0)
+   {
+      WipeFlags(After);
+      
+      // Set the inlist flag
+      for (iterator I = List; I != End; I++)
+      {
+        PkgIterator P(Cache,*I);
+        if (IsMissing(P) == true && IsNow(P) == true)
+            Flag(*I,After);
+      }
+   }
+   

    Primary = &pkgOrderList::DepUnPackCrit;
    Secondary = &pkgOrderList::DepConfigure;
    RevDepends = &pkgOrderList::DepUnPackDep;
    Primary = &pkgOrderList::DepUnPackCrit;
    Secondary = &pkgOrderList::DepConfigure;
    RevDepends = &pkgOrderList::DepUnPackDep;


@@ -209,7 +239,8 @@ bool pkgOrderList::OrderUnpack(string *FileList)
    for (iterator I = List; I != End; I++)
    {
       PkgIterator P(Cache,*I);
    for (iterator I = List; I != End; I++)
    {
       PkgIterator P(Cache,*I);

-      cout << P.Name() << ' ' << IsMissing(P) << endl;
+      if (IsNow(P) == true)
+        cout << P.Name() << ' ' << IsMissing(P) << ',' << IsFlag(P,After) << endl;

    }*/
 
    return true;
    }*/
 
    return true;


@@ -316,12 +347,12 @@ int pkgOrderList::OrderCompareA(const void *a, const void *b)
       return -1*Res;
    
    // We order missing files to toward the end
       return -1*Res;
    
    // We order missing files to toward the end

-   if (Me->FileList != 0)
+/*   if (Me->FileList != 0)

    {
       if ((Res = BoolCompare(Me->IsMissing(A),
                             Me->IsMissing(B))) != 0)
         return Res;
    {
       if ((Res = BoolCompare(Me->IsMissing(A),
                             Me->IsMissing(B))) != 0)
         return Res;

-   }
+   }*/

    
    if (A.State() != pkgCache::PkgIterator::NeedsNothing && 
        B.State() == pkgCache::PkgIterator::NeedsNothing)
    
    if (A.State() != pkgCache::PkgIterator::NeedsNothing && 
        B.State() == pkgCache::PkgIterator::NeedsNothing)


@@ -511,8 +542,10 @@ bool pkgOrderList::VisitNode(PkgIterator Pkg)
    if (IsFlag(Pkg,Added) == false)
    {
       Flag(Pkg,Added,Added | AddPending);
    if (IsFlag(Pkg,Added) == false)
    {
       Flag(Pkg,Added,Added | AddPending);

-      *End = Pkg;
-      End++;
+      if (IsFlag(Pkg,After) == true)
+        *AfterEnd++ = Pkg;
+      else
+        *End++ = Pkg;

    }
    
    Primary = Old;
    }
    
    Primary = Old;


@@ -857,6 +890,7 @@ void pkgOrderList::WipeFlags(unsigned long F)
 bool pkgOrderList::CheckDep(DepIterator D)
 {
    Version **List = D.AllTargets();
 bool pkgOrderList::CheckDep(DepIterator D)
 {
    Version **List = D.AllTargets();

+   bool Hit = false;

    for (Version **I = List; *I != 0; I++)
    {
       VerIterator Ver(Cache,*I);
    for (Version **I = List; *I != 0; I++)
    {
       VerIterator Ver(Cache,*I);


@@ -867,8 +901,8 @@ bool pkgOrderList::CheckDep(DepIterator D)
                 way ordering works Added means the package will be unpacked
                 before this one and AddPending means after. It is therefore
                 correct to ignore AddPending in all cases, but that exposes
                 way ordering works Added means the package will be unpacked
                 before this one and AddPending means after. It is therefore
                 correct to ignore AddPending in all cases, but that exposes

-                reverse-ordering loops which should be ignore. */
-      if (IsFlag(Pkg,Added) == true || 
+                reverse-ordering loops which should be ignored. */
+      if (IsFlag(Pkg,Added) == true ||

          (IsFlag(Pkg,AddPending) == true && D.Reverse() == true))
       {
         if (Cache[Pkg].InstallVer != *I)
          (IsFlag(Pkg,AddPending) == true && D.Reverse() == true))
       {
         if (Cache[Pkg].InstallVer != *I)


@@ -878,18 +912,40 @@ bool pkgOrderList::CheckDep(DepIterator D)
         if ((Version *)Pkg.CurrentVer() != *I || 
             Pkg.State() != PkgIterator::NeedsNothing)
            continue;
         if ((Version *)Pkg.CurrentVer() != *I || 
             Pkg.State() != PkgIterator::NeedsNothing)
            continue;

-      
-      delete [] List;
-      
+            

       /* Conflicts requires that all versions are not present, depends
          just needs one */
       if (D->Type != pkgCache::Dep::Conflicts)
       /* Conflicts requires that all versions are not present, depends
          just needs one */
       if (D->Type != pkgCache::Dep::Conflicts)

+      {
+        /* Try to find something that does not have the after flag set
+           if at all possible */
+        if (IsFlag(Pkg,After) == true)
+        {
+           Hit = true;
+           continue;
+        }
+      
+        delete [] List;

         return true;
         return true;

+      }

       else
       else

+      {
+        if (IsFlag(Pkg,After) == true)
+           Flag(D.ParentPkg(),After);
+        
+        delete [] List;

         return false;
         return false;

+      }      

    }
    delete [] List;
    }
    delete [] List;

- 
+
+   // We found a hit, but it had the after flag set
+   if (Hit == true && D->Type == pkgCache::Dep::PreDepends)
+   {
+      Flag(D.ParentPkg(),After);
+      return true;
+   }
+   

    /* Conflicts requires that all versions are not present, depends
       just needs one */
    if (D->Type == pkgCache::Dep::Conflicts)
    /* Conflicts requires that all versions are not present, depends
       just needs one */
    if (D->Type == pkgCache::Dep::Conflicts)

diff --git a/apt-pkg/orderlist.h b/apt-pkg/orderlist.h
index 7e1b8efbc9e446dd0d86c52a799f59651ff950f7..59949f10680c4dc417cc85ce35a7047d4830c9d3 100644 (file)
--- a/apt-pkg/orderlist.h
+++ b/apt-pkg/orderlist.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: orderlist.h,v 1.7 1999/08/12 05:59:54 jgg Exp $
+// $Id: orderlist.h,v 1.8 2000/01/16 08:45:47 jgg Exp $

 /* ######################################################################
 
    Order List - Represents and Manipulates an ordered list of packages.
 /* ######################################################################
 
    Order List - Represents and Manipulates an ordered list of packages.


@@ -48,11 +48,13 @@ class pkgOrderList
    // State
    Package **End;
    Package **List;
    // State
    Package **End;
    Package **List;

+   Package **AfterList;
+   Package **AfterEnd;

    string *FileList;
    DepIterator Loops[20];
    int LoopCount;
    int Depth;
    string *FileList;
    DepIterator Loops[20];
    int LoopCount;
    int Depth;

-   unsigned char *Flags;
+   unsigned short *Flags;

    
    // Main visit function
    bool VisitNode(PkgIterator Pkg);
    
    // Main visit function
    bool VisitNode(PkgIterator Pkg);


@@ -90,6 +92,7 @@ class pkgOrderList
                UnPacked = (1 << 4), Configured = (1 << 5),
                Removed = (1 << 6),        // Early Remove
                InList = (1 << 7),
                UnPacked = (1 << 4), Configured = (1 << 5),
                Removed = (1 << 6),        // Early Remove
                InList = (1 << 7),

+               After = (1 << 8),

                States = (UnPacked | Configured | Removed)};
 
    // Flag manipulators
                States = (UnPacked | Configured | Removed)};
 
    // Flag manipulators

diff --git a/debian/changelog b/debian/changelog
index 60fa2f7db2dfa1ba628a94dc9dde6268f5488273..49f4c16e117cbe681daea7144d9422d35706097b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ apt (0.3.16.1) unstable; urgency=low
     string
   * Applied visual patch to dselect install script . Closes #55214
   * Included the configure-index example
     string
   * Applied visual patch to dselect install script . Closes #55214
   * Included the configure-index example

+  * Minimal CD swaps
+  * Library soname has increased

   
  -- Ben Gertzfield <che@debian.org>  Fri, 14 Jan 2000 08:04:15 -0800
  
   
  -- Ben Gertzfield <che@debian.org>  Fri, 14 Jan 2000 08:04:15 -0800