criss-cross merge with my sid branch

[apt.git] / apt-pkg / pkgcache.h

diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h
index 587d97534436b6a30fc84bcb665d7e625a25bdf8..012caac76c5a0e5cdd14f7077cd365ff546b0ec3 100644 (file)
--- a/apt-pkg/pkgcache.h
+++ b/apt-pkg/pkgcache.h
@@ -19,9 +19,6 @@
 #ifndef PKGLIB_PKGCACHE_H
 #define PKGLIB_PKGCACHE_H
 
 #ifndef PKGLIB_PKGCACHE_H
 #define PKGLIB_PKGCACHE_H
 

-#ifdef __GNUG__
-#pragma interface "apt-pkg/pkgcache.h"
-#endif 

 
 #include <string>
 #include <time.h>
 
 #include <string>
 #include <time.h>


@@ -30,40 +27,45 @@
 using std::string;
     
 class pkgVersioningSystem;
 using std::string;
     
 class pkgVersioningSystem;

-class pkgCache
+class pkgCache                                                         /*{{{*/

 {
    public:
    // Cache element predeclarations
    struct Header;
 {
    public:
    // Cache element predeclarations
    struct Header;

+   struct Group;

    struct Package;
    struct PackageFile;
    struct Version;
    struct Package;
    struct PackageFile;
    struct Version;

+   struct Description;

    struct Provides;
    struct Dependency;
    struct StringItem;
    struct VerFile;
    struct Provides;
    struct Dependency;
    struct StringItem;
    struct VerFile;

+   struct DescFile;

    
    // Iterators
    
    // Iterators

+   template<typename Str, typename Itr> class Iterator;
+   class GrpIterator;

    class PkgIterator;
    class VerIterator;
    class PkgIterator;
    class VerIterator;

+   class DescIterator;

    class DepIterator;
    class PrvIterator;
    class PkgFileIterator;
    class VerFileIterator;
    class DepIterator;
    class PrvIterator;
    class PkgFileIterator;
    class VerFileIterator;

-   friend class PkgIterator;
-   friend class VerIterator;
-   friend class DepIterator;
-   friend class PrvIterator;
-   friend class PkgFileIterator;
-   friend class VerFileIterator;
+   class DescFileIterator;

    
    class Namespace;
    
    // These are all the constants used in the cache structures
    
    class Namespace;
    
    // These are all the constants used in the cache structures

+
+   // WARNING - if you change these lists you must also edit
+   // the stringification in pkgcache.cc and also consider whether
+   // the cache file will become incompatible.

    struct Dep
    {
       enum DepType {Depends=1,PreDepends=2,Suggests=3,Recommends=4,
    struct Dep
    {
       enum DepType {Depends=1,PreDepends=2,Suggests=3,Recommends=4,

-        Conflicts=5,Replaces=6,Obsoletes=7};
+        Conflicts=5,Replaces=6,Obsoletes=7,DpkgBreaks=8,Enhances=9};

       enum DepCompareOp {Or=0x10,NoOp=0,LessEq=0x1,GreaterEq=0x2,Less=0x3,
         Greater=0x4,Equals=0x5,NotEquals=0x6};
    };
       enum DepCompareOp {Or=0x10,NoOp=0,LessEq=0x1,GreaterEq=0x2,Less=0x3,
         Greater=0x4,Equals=0x5,NotEquals=0x6};
    };


@@ -74,7 +76,8 @@ class pkgCache
       enum PkgSelectedState {Unknown=0,Install=1,Hold=2,DeInstall=3,Purge=4};
       enum PkgInstState {Ok=0,ReInstReq=1,HoldInst=2,HoldReInstReq=3};
       enum PkgCurrentState {NotInstalled=0,UnPacked=1,HalfConfigured=2,
       enum PkgSelectedState {Unknown=0,Install=1,Hold=2,DeInstall=3,Purge=4};
       enum PkgInstState {Ok=0,ReInstReq=1,HoldInst=2,HoldReInstReq=3};
       enum PkgCurrentState {NotInstalled=0,UnPacked=1,HalfConfigured=2,

-          HalfInstalled=4,ConfigFiles=5,Installed=6};
+          HalfInstalled=4,ConfigFiles=5,Installed=6,
+           TriggersAwaited=7,TriggersPending=8};

    };
    
    struct Flag
    };
    
    struct Flag


@@ -96,10 +99,13 @@ class pkgCache
    
    // Pointers to the arrays of items
    Header *HeaderP;
    
    // Pointers to the arrays of items
    Header *HeaderP;

+   Group *GrpP;

    Package *PkgP;
    VerFile *VerFileP;
    Package *PkgP;
    VerFile *VerFileP;

+   DescFile *DescFileP;

    PackageFile *PkgFileP;
    Version *VerP;
    PackageFile *PkgFileP;
    Version *VerP;

+   Description *DescP;

    Provides *ProvideP;
    Dependency *DepP;
    StringItem *StringItemP;
    Provides *ProvideP;
    Dependency *DepP;
    StringItem *StringItemP;


@@ -118,8 +124,13 @@ class pkgCache
    const char *Priority(unsigned char Priority);
    
    // Accessors
    const char *Priority(unsigned char Priority);
    
    // Accessors

+   GrpIterator FindGrp(const string &Name);

    PkgIterator FindPkg(const string &Name);
    PkgIterator FindPkg(const string &Name);

+   PkgIterator FindPkg(const string &Name, string Arch);
+

    Header &Head() {return *HeaderP;};
    Header &Head() {return *HeaderP;};

+   inline GrpIterator GrpBegin();
+   inline GrpIterator GrpEnd();

    inline PkgIterator PkgBegin();
    inline PkgIterator PkgEnd();
    inline PkgFileIterator FileBegin();
    inline PkgIterator PkgBegin();
    inline PkgIterator PkgEnd();
    inline PkgFileIterator FileBegin();


@@ -136,8 +147,8 @@ class pkgCache
    pkgCache(MMap *Map,bool DoMap = true);
    virtual ~pkgCache() {};
 };
    pkgCache(MMap *Map,bool DoMap = true);
    virtual ~pkgCache() {};
 };

-
-// Header structure
+                                                                       /*}}}*/
+// Header structure                                                    /*{{{*/

 struct pkgCache::Header
 {
    // Signature information
 struct pkgCache::Header
 {
    // Signature information


@@ -151,16 +162,21 @@ struct pkgCache::Header
    unsigned short PackageSz;
    unsigned short PackageFileSz;
    unsigned short VersionSz;
    unsigned short PackageSz;
    unsigned short PackageFileSz;
    unsigned short VersionSz;

+   unsigned short DescriptionSz;

    unsigned short DependencySz;
    unsigned short ProvidesSz;
    unsigned short VerFileSz;
    unsigned short DependencySz;
    unsigned short ProvidesSz;
    unsigned short VerFileSz;

+   unsigned short DescFileSz;

    
    // Structure counts
    
    // Structure counts

+   unsigned long GroupCount;

    unsigned long PackageCount;
    unsigned long VersionCount;
    unsigned long PackageCount;
    unsigned long VersionCount;

+   unsigned long DescriptionCount;

    unsigned long DependsCount;
    unsigned long PackageFileCount;
    unsigned long VerFileCount;
    unsigned long DependsCount;
    unsigned long PackageFileCount;
    unsigned long VerFileCount;

+   unsigned long DescFileCount;

    unsigned long ProvidesCount;
    
    // Offsets
    unsigned long ProvidesCount;
    
    // Offsets


@@ -169,45 +185,61 @@ struct pkgCache::Header
    map_ptrloc VerSysName;            // StringTable
    map_ptrloc Architecture;          // StringTable
    unsigned long MaxVerFileSize;
    map_ptrloc VerSysName;            // StringTable
    map_ptrloc Architecture;          // StringTable
    unsigned long MaxVerFileSize;

+   unsigned long MaxDescFileSize;

 
    /* Allocation pools, there should be one of these for each structure
       excluding the header */
 
    /* Allocation pools, there should be one of these for each structure
       excluding the header */

-   DynamicMMap::Pool Pools[7];
+   DynamicMMap::Pool Pools[9];

    
    

-   // Rapid package name lookup
-   map_ptrloc HashTable[2*1048];
+   // Rapid package and group name lookup
+   // Notice: Increase only both table sizes as the
+   // hashmethod assume the size of the Pkg one
+   map_ptrloc PkgHashTable[2*1048];
+   map_ptrloc GrpHashTable[2*1048];

 
    bool CheckSizes(Header &Against) const;
    Header();
 };
 
    bool CheckSizes(Header &Against) const;
    Header();
 };

+                                                                       /*}}}*/
+struct pkgCache::Group {                                               /*{{{*/
+       map_ptrloc Name;        // Stringtable

 
 

-struct pkgCache::Package
+       // Linked List
+       map_ptrloc FirstPackage;// Package
+       map_ptrloc LastPackage; // Package
+       map_ptrloc Next;        // Group
+};
+                                                                       /*}}}*/
+struct pkgCache::Package                                               /*{{{*/

 {
    // Pointers
    map_ptrloc Name;              // Stringtable
 {
    // Pointers
    map_ptrloc Name;              // Stringtable

+   map_ptrloc Arch;              // StringTable (StringItem)

    map_ptrloc VersionList;       // Version
    map_ptrloc CurrentVer;        // Version
    map_ptrloc Section;           // StringTable (StringItem)
    map_ptrloc VersionList;       // Version
    map_ptrloc CurrentVer;        // Version
    map_ptrloc Section;           // StringTable (StringItem)

+   map_ptrloc Group;             // Group the Package belongs to

       
    // Linked list 
    map_ptrloc NextPackage;       // Package
    map_ptrloc RevDepends;        // Dependency
    map_ptrloc ProvidesList;      // Provides
       
    // Linked list 
    map_ptrloc NextPackage;       // Package
    map_ptrloc RevDepends;        // Dependency
    map_ptrloc ProvidesList;      // Provides

-   
+

    // Install/Remove/Purge etc
    unsigned char SelectedState;     // What
    unsigned char InstState;         // Flags
    unsigned char CurrentState;      // State
    
    // Install/Remove/Purge etc
    unsigned char SelectedState;     // What
    unsigned char InstState;         // Flags
    unsigned char CurrentState;      // State
    

-   unsigned short ID;
+   unsigned int ID;

    unsigned long Flags;
 };
    unsigned long Flags;
 };

-
-struct pkgCache::PackageFile
+                                                                       /*}}}*/
+struct pkgCache::PackageFile                                           /*{{{*/

 {
    // Names
    map_ptrloc FileName;        // Stringtable
    map_ptrloc Archive;         // Stringtable
 {
    // Names
    map_ptrloc FileName;        // Stringtable
    map_ptrloc Archive;         // Stringtable

+   map_ptrloc Codename;        // Stringtable

    map_ptrloc Component;       // Stringtable
    map_ptrloc Version;         // Stringtable
    map_ptrloc Origin;          // Stringtable
    map_ptrloc Component;       // Stringtable
    map_ptrloc Version;         // Stringtable
    map_ptrloc Origin;          // Stringtable


@@ -220,27 +252,36 @@ struct pkgCache::PackageFile
    
    // Linked list
    map_ptrloc NextFile;        // PackageFile
    
    // Linked list
    map_ptrloc NextFile;        // PackageFile

-   unsigned short ID;
+   unsigned int ID;

    time_t mtime;                  // Modification time for the file
 };
    time_t mtime;                  // Modification time for the file
 };

-
-struct pkgCache::VerFile
+                                                                       /*}}}*/
+struct pkgCache::VerFile                                               /*{{{*/

 {
    map_ptrloc File;           // PackageFile
    map_ptrloc NextFile;       // PkgVerFile
    map_ptrloc Offset;         // File offset
 {
    map_ptrloc File;           // PackageFile
    map_ptrloc NextFile;       // PkgVerFile
    map_ptrloc Offset;         // File offset

-   unsigned short Size;
+   unsigned long Size;

 };
 };

-
-struct pkgCache::Version
+                                                                       /*}}}*/
+struct pkgCache::DescFile                                              /*{{{*/
+{
+   map_ptrloc File;           // PackageFile
+   map_ptrloc NextFile;       // PkgVerFile
+   map_ptrloc Offset;         // File offset
+   unsigned long Size;
+};
+                                                                       /*}}}*/
+struct pkgCache::Version                                               /*{{{*/

 {
    map_ptrloc VerStr;            // Stringtable
    map_ptrloc Section;           // StringTable (StringItem)
 {
    map_ptrloc VerStr;            // Stringtable
    map_ptrloc Section;           // StringTable (StringItem)

-   map_ptrloc Arch;              // StringTable
-      
+   enum {None, All, Foreign, Same, Allowed} MultiArch;
+

    // Lists
    map_ptrloc FileList;          // VerFile
    map_ptrloc NextVer;           // Version
    // Lists
    map_ptrloc FileList;          // VerFile
    map_ptrloc NextVer;           // Version

+   map_ptrloc DescriptionList;   // Description

    map_ptrloc DependsList;       // Dependency
    map_ptrloc ParentPkg;         // Package
    map_ptrloc ProvidesList;      // Provides
    map_ptrloc DependsList;       // Dependency
    map_ptrloc ParentPkg;         // Package
    map_ptrloc ProvidesList;      // Provides


@@ -248,11 +289,27 @@ struct pkgCache::Version
    map_ptrloc Size;              // These are the .deb size
    map_ptrloc InstalledSize;
    unsigned short Hash;
    map_ptrloc Size;              // These are the .deb size
    map_ptrloc InstalledSize;
    unsigned short Hash;

-   unsigned short ID;
+   unsigned int ID;

    unsigned char Priority;
 };
    unsigned char Priority;
 };

+                                                                       /*}}}*/
+struct pkgCache::Description                                           /*{{{*/
+{
+   // Language Code store the description translation language code. If
+   // the value has a 0 lenght then this is readed using the Package
+   // file else the Translation-CODE are used.
+   map_ptrloc language_code;     // StringTable
+   map_ptrloc md5sum;            // StringTable

 
 

-struct pkgCache::Dependency
+   // Linked list 
+   map_ptrloc FileList;          // DescFile
+   map_ptrloc NextDesc;          // Description
+   map_ptrloc ParentPkg;         // Package
+
+   unsigned int ID;
+};
+                                                                       /*}}}*/
+struct pkgCache::Dependency                                            /*{{{*/

 {
    map_ptrloc Version;         // Stringtable
    map_ptrloc Package;         // Package
 {
    map_ptrloc Version;         // Stringtable
    map_ptrloc Package;         // Package


@@ -265,8 +322,8 @@ struct pkgCache::Dependency
    unsigned char Type;
    unsigned char CompareOp;
 };
    unsigned char Type;
    unsigned char CompareOp;
 };

-
-struct pkgCache::Provides
+                                                                       /*}}}*/
+struct pkgCache::Provides                                              /*{{{*/

 {
    map_ptrloc ParentPkg;        // Pacakge
    map_ptrloc Version;          // Version
 {
    map_ptrloc ParentPkg;        // Pacakge
    map_ptrloc Version;          // Version


@@ -274,15 +331,19 @@ struct pkgCache::Provides
    map_ptrloc NextProvides;     // Provides
    map_ptrloc NextPkgProv;      // Provides
 };
    map_ptrloc NextProvides;     // Provides
    map_ptrloc NextPkgProv;      // Provides
 };

-
-struct pkgCache::StringItem
+                                                                       /*}}}*/
+struct pkgCache::StringItem                                            /*{{{*/

 {
    map_ptrloc String;        // Stringtable
    map_ptrloc NextItem;      // StringItem
 };
 {
    map_ptrloc String;        // Stringtable
    map_ptrloc NextItem;      // StringItem
 };

-
+                                                                       /*}}}*/

 #include <apt-pkg/cacheiterators.h>
 
 #include <apt-pkg/cacheiterators.h>
 

+inline pkgCache::GrpIterator pkgCache::GrpBegin() 
+       {return GrpIterator(*this);};
+inline pkgCache::GrpIterator pkgCache::GrpEnd() 
+       {return GrpIterator(*this,GrpP);};

 inline pkgCache::PkgIterator pkgCache::PkgBegin() 
        {return PkgIterator(*this);};
 inline pkgCache::PkgIterator pkgCache::PkgEnd() 
 inline pkgCache::PkgIterator pkgCache::PkgBegin() 
        {return PkgIterator(*this);};
 inline pkgCache::PkgIterator pkgCache::PkgEnd() 


@@ -293,21 +354,23 @@ inline pkgCache::PkgFileIterator pkgCache::FileEnd()
        {return PkgFileIterator(*this,PkgFileP);};
 
 // Oh I wish for Real Name Space Support
        {return PkgFileIterator(*this,PkgFileP);};
 
 // Oh I wish for Real Name Space Support

-class pkgCache::Namespace
+class pkgCache::Namespace                                              /*{{{*/

 {   
    public:
 {   
    public:

-
+   typedef pkgCache::GrpIterator GrpIterator;

    typedef pkgCache::PkgIterator PkgIterator;
    typedef pkgCache::VerIterator VerIterator;
    typedef pkgCache::PkgIterator PkgIterator;
    typedef pkgCache::VerIterator VerIterator;

+   typedef pkgCache::DescIterator DescIterator;

    typedef pkgCache::DepIterator DepIterator;
    typedef pkgCache::PrvIterator PrvIterator;
    typedef pkgCache::PkgFileIterator PkgFileIterator;
    typedef pkgCache::VerFileIterator VerFileIterator;   
    typedef pkgCache::Version Version;
    typedef pkgCache::DepIterator DepIterator;
    typedef pkgCache::PrvIterator PrvIterator;
    typedef pkgCache::PkgFileIterator PkgFileIterator;
    typedef pkgCache::VerFileIterator VerFileIterator;   
    typedef pkgCache::Version Version;

+   typedef pkgCache::Description Description;

    typedef pkgCache::Package Package;
    typedef pkgCache::Header Header;
    typedef pkgCache::Dep Dep;
    typedef pkgCache::Flag Flag;
 };
    typedef pkgCache::Package Package;
    typedef pkgCache::Header Header;
    typedef pkgCache::Dep Dep;
    typedef pkgCache::Flag Flag;
 };

-
+                                                                       /*}}}*/

 #endif
 #endif