* cmdline/apt-mark:

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

diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h
index 0dc939a51424cdb8944562019fbfb0b085e73cb7..587d97534436b6a30fc84bcb665d7e625a25bdf8 100644 (file)
--- a/apt-pkg/pkgcache.h
+++ b/apt-pkg/pkgcache.h
@@ -1,11 +1,11 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: pkgcache.h,v 1.1 1998/07/02 02:58:12 jgg Exp $
+// $Id: pkgcache.h,v 1.25 2001/07/01 22:28:24 jgg Exp $

 /* ######################################################################
    
    Cache - Structure definitions for the cache file
    
 /* ######################################################################
    
    Cache - Structure definitions for the cache file
    

-   Please see doc/pkglib/cache.sgml for a more detailed description of 
+   Please see doc/apt-pkg/cache.sgml for a more detailed description of 

    this format. Also be sure to keep that file up-to-date!!
    
    Clients should always use the CacheIterators classes for access to the
    this format. Also be sure to keep that file up-to-date!!
    
    Clients should always use the CacheIterators classes for access to the


@@ -16,70 +16,20 @@
    
    ##################################################################### */
                                                                        /*}}}*/
    
    ##################################################################### */
                                                                        /*}}}*/

-// Header section: pkglib

 #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>

-#include <pkglib/mmap.h>
-
-// Definitions for Depends::Type
-#define pkgDEP_Depends 1
-#define pkgDEP_PreDepends 2
-#define pkgDEP_Suggests 3
-#define pkgDEP_Recommends 4
-#define pkgDEP_Conflicts 5
-#define pkgDEP_Replaces 6
-
-// Definitions for Version::Priority
-#define pkgPRIO_Important 1
-#define pkgPRIO_Required 2
-#define pkgPRIO_Standard 3
-#define pkgPRIO_Optional 4
-#define pkgPRIO_Extra 5
-
-// Definitions for Package::SelectedState
-#define pkgSTATE_Unkown 0
-#define pkgSTATE_Install 1
-#define pkgSTATE_Hold 2
-#define pkgSTATE_DeInstall 3
-#define pkgSTATE_Purge 4
-
-// Definitions for Package::Flags
-#define pkgFLAG_Auto (1 << 0)
-#define pkgFLAG_New (1 << 1)
-#define pkgFLAG_Obsolete (1 << 2)
-#define pkgFLAG_Essential (1 << 3)
-#define pkgFLAG_ImmediateConf (1 << 4)
-
-// Definitions for Package::InstState
-#define pkgSTATE_Ok 0
-#define pkgSTATE_ReInstReq 1
-#define pkgSTATE_Hold 2
-#define pkgSTATE_HoldReInstReq 3
-
-// Definitions for Package::CurrentState
-#define pkgSTATE_NotInstalled 0
-#define pkgSTATE_UnPacked 1
-#define pkgSTATE_HalfConfigured 2
-#define pkgSTATE_UnInstalled 3
-#define pkgSTATE_HalfInstalled 4
-#define pkgSTATE_ConfigFiles 5
-#define pkgSTATE_Installed 6
-
-// Definitions for PackageFile::Flags
-#define pkgFLAG_NotSource (1 << 0)
-
-// Definitions for Dependency::CompareOp
-#define pkgOP_OR 0x10
-#define pkgOP_LESSEQ 0x1
-#define pkgOP_GREATEREQ 0x2
-#define pkgOP_LESS 0x3
-#define pkgOP_GREATER 0x4
-#define pkgOP_EQUALS 0x5
-#define pkgOP_NOTEQUALS 0x6
+#include <apt-pkg/mmap.h>

 
 

+using std::string;
+    
+class pkgVersioningSystem;

 class pkgCache
 {
    public:
 class pkgCache
 {
    public:


@@ -91,6 +41,7 @@ class pkgCache
    struct Provides;
    struct Dependency;
    struct StringItem;
    struct Provides;
    struct Dependency;
    struct StringItem;

+   struct VerFile;

    
    // Iterators
    class PkgIterator;
    
    // Iterators
    class PkgIterator;


@@ -98,11 +49,39 @@ class pkgCache
    class DepIterator;
    class PrvIterator;
    class PkgFileIterator;
    class DepIterator;
    class PrvIterator;
    class PkgFileIterator;

-   friend PkgIterator;
-   friend VerIterator;
-   friend DepIterator;
-   friend PrvIterator;
-   friend PkgFileIterator;
+   class VerFileIterator;
+   friend class PkgIterator;
+   friend class VerIterator;
+   friend class DepIterator;
+   friend class PrvIterator;
+   friend class PkgFileIterator;
+   friend class VerFileIterator;
+   
+   class Namespace;
+   
+   // These are all the constants used in the cache structures
+   struct Dep
+   {
+      enum DepType {Depends=1,PreDepends=2,Suggests=3,Recommends=4,
+        Conflicts=5,Replaces=6,Obsoletes=7};
+      enum DepCompareOp {Or=0x10,NoOp=0,LessEq=0x1,GreaterEq=0x2,Less=0x3,
+        Greater=0x4,Equals=0x5,NotEquals=0x6};
+   };
+   
+   struct State
+   {
+      enum VerPriority {Important=1,Required=2,Standard=3,Optional=4,Extra=5};
+      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};
+   };
+   
+   struct Flag
+   {
+      enum PkgFlags {Auto=(1<<0),Essential=(1<<3),Important=(1<<4)};
+      enum PkgFFlags {NotSource=(1<<0),NotAutomatic=(1<<1)};
+   };

    
    protected:
    
    
    protected:
    


@@ -110,38 +89,51 @@ class pkgCache
    string CacheFile;
    MMap &Map;
 
    string CacheFile;
    MMap &Map;
 

-   bool Public;
-   bool ReadOnly;
-
-   static unsigned long sHash(string S);
-   static unsigned long sHash(const char *S);
+   unsigned long sHash(const string &S) const;
+   unsigned long sHash(const char *S) const;

    
    public:
    
    // Pointers to the arrays of items
    Header *HeaderP;
    Package *PkgP;
    
    public:
    
    // Pointers to the arrays of items
    Header *HeaderP;
    Package *PkgP;

+   VerFile *VerFileP;

    PackageFile *PkgFileP;
    Version *VerP;
    Provides *ProvideP;
    Dependency *DepP;
    StringItem *StringItemP;
    char *StrP;
    PackageFile *PkgFileP;
    Version *VerP;
    Provides *ProvideP;
    Dependency *DepP;
    StringItem *StringItemP;
    char *StrP;

-   
+

    virtual bool ReMap();
    inline bool Sync() {return Map.Sync();};
    virtual bool ReMap();
    inline bool Sync() {return Map.Sync();};

-   
+   inline MMap &GetMap() {return Map;};
+   inline void *DataEnd() {return ((unsigned char *)Map.Data()) + Map.Size();};
+      

    // String hashing function (512 range)
    // String hashing function (512 range)

-   inline unsigned long Hash(string S) const {return sHash(S);};
+   inline unsigned long Hash(const string &S) const {return sHash(S);};

    inline unsigned long Hash(const char *S) const {return sHash(S);};
 
    inline unsigned long Hash(const char *S) const {return sHash(S);};
 

+   // Usefull transformation things
+   const char *Priority(unsigned char Priority);
+   

    // Accessors
    // Accessors

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

    Header &Head() {return *HeaderP;};
    inline PkgIterator PkgBegin();
    inline PkgIterator PkgEnd();
    Header &Head() {return *HeaderP;};
    inline PkgIterator PkgBegin();
    inline PkgIterator PkgEnd();

+   inline PkgFileIterator FileBegin();
+   inline PkgFileIterator FileEnd();

 
 

-   pkgCache(MMap &Map);
+   // Make me a function
+   pkgVersioningSystem *VS;
+   
+   // Converters
+   static const char *CompTypeDeb(unsigned char Comp);
+   static const char *CompType(unsigned char Comp);
+   static const char *DepType(unsigned char Dep);
+   
+   pkgCache(MMap *Map,bool DoMap = true);

    virtual ~pkgCache() {};
 };
 
    virtual ~pkgCache() {};
 };
 


@@ -161,23 +153,29 @@ struct pkgCache::Header
    unsigned short VersionSz;
    unsigned short DependencySz;
    unsigned short ProvidesSz;
    unsigned short VersionSz;
    unsigned short DependencySz;
    unsigned short ProvidesSz;

-
+   unsigned short VerFileSz;
+   

    // Structure counts
    unsigned long PackageCount;
    unsigned long VersionCount;
    unsigned long DependsCount;
    unsigned long PackageFileCount;
    // Structure counts
    unsigned long PackageCount;
    unsigned long VersionCount;
    unsigned long DependsCount;
    unsigned long PackageFileCount;

+   unsigned long VerFileCount;
+   unsigned long ProvidesCount;

    
    // Offsets
    
    // Offsets

-   unsigned long FileList;              // struct PackageFile
-   unsigned long StringList;            // struct StringItem
+   map_ptrloc FileList;              // struct PackageFile
+   map_ptrloc StringList;            // struct StringItem
+   map_ptrloc VerSysName;            // StringTable
+   map_ptrloc Architecture;          // StringTable
+   unsigned long MaxVerFileSize;

 
    /* 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[6];
+   DynamicMMap::Pool Pools[7];

    
    // Rapid package name lookup
    
    // Rapid package name lookup

-   unsigned long HashTable[512];
+   map_ptrloc HashTable[2*1048];

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


@@ -186,17 +184,15 @@ struct pkgCache::Header
 struct pkgCache::Package
 {
    // Pointers
 struct pkgCache::Package
 {
    // Pointers

-   unsigned long Name;              // Stringtable
-   unsigned long VersionList;       // Version
-   unsigned long TargetVer;         // Version
-   unsigned long CurrentVer;        // Version
-   unsigned long TargetDist;        // StringTable (StringItem)
-   unsigned long Section;           // StringTable (StringItem)
+   map_ptrloc Name;              // Stringtable
+   map_ptrloc VersionList;       // Version
+   map_ptrloc CurrentVer;        // Version
+   map_ptrloc Section;           // StringTable (StringItem)

       
    // Linked list 
       
    // Linked list 

-   unsigned long NextPackage;       // Package
-   unsigned long RevDepends;        // Dependency
-   unsigned long ProvidesList;      // Provides
+   map_ptrloc NextPackage;       // Package
+   map_ptrloc RevDepends;        // Dependency
+   map_ptrloc ProvidesList;      // Provides

    
    // Install/Remove/Purge etc
    unsigned char SelectedState;     // What
    
    // Install/Remove/Purge etc
    unsigned char SelectedState;     // What


@@ -204,77 +200,114 @@ struct pkgCache::Package
    unsigned char CurrentState;      // State
    
    unsigned short ID;
    unsigned char CurrentState;      // State
    
    unsigned short ID;

-   unsigned short Flags;
+   unsigned long Flags;

 };
 
 struct pkgCache::PackageFile
 {
    // Names
 };
 
 struct pkgCache::PackageFile
 {
    // Names

-   unsigned long FileName;        // Stringtable
-   unsigned long Version;         // Stringtable
-   unsigned long Distribution;    // Stringtable
-   unsigned long Size;
+   map_ptrloc FileName;        // Stringtable
+   map_ptrloc Archive;         // Stringtable
+   map_ptrloc Component;       // Stringtable
+   map_ptrloc Version;         // Stringtable
+   map_ptrloc Origin;          // Stringtable
+   map_ptrloc Label;           // Stringtable
+   map_ptrloc Architecture;    // Stringtable
+   map_ptrloc Site;            // Stringtable
+   map_ptrloc IndexType;       // Stringtable
+   unsigned long Size;            
+   unsigned long Flags;

    
    // Linked list
    
    // Linked list

-   unsigned long NextFile;        // PackageFile
+   map_ptrloc NextFile;        // PackageFile

    unsigned short ID;
    unsigned short ID;

-   unsigned short Flags;

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

+struct pkgCache::VerFile
+{
+   map_ptrloc File;           // PackageFile
+   map_ptrloc NextFile;       // PkgVerFile
+   map_ptrloc Offset;         // File offset
+   unsigned short Size;
+};
+

 struct pkgCache::Version
 {
 struct pkgCache::Version
 {

-   unsigned long VerStr;            // Stringtable
-   unsigned long File;              // PackageFile
-   unsigned long Section;           // StringTable (StringItem)
-   
+   map_ptrloc VerStr;            // Stringtable
+   map_ptrloc Section;           // StringTable (StringItem)
+   map_ptrloc Arch;              // StringTable
+      

    // Lists
    // Lists

-   unsigned long NextVer;           // Version
-   unsigned long DependsList;       // Dependency
-   unsigned long ParentPkg;         // Package
-   unsigned long ProvidesList;      // Provides
+   map_ptrloc FileList;          // VerFile
+   map_ptrloc NextVer;           // Version
+   map_ptrloc DependsList;       // Dependency
+   map_ptrloc ParentPkg;         // Package
+   map_ptrloc ProvidesList;      // Provides

    
    

-   unsigned long Offset;
-   unsigned long Size;
-   unsigned long InstalledSize;
+   map_ptrloc Size;              // These are the .deb size
+   map_ptrloc InstalledSize;
+   unsigned short Hash;

    unsigned short ID;
    unsigned char Priority;
 };
 
 struct pkgCache::Dependency
 {
    unsigned short ID;
    unsigned char Priority;
 };
 
 struct pkgCache::Dependency
 {

-   unsigned long Version;         // Stringtable
-   unsigned long Package;         // Package
-   unsigned long NextDepends;     // Dependency
-   unsigned long NextRevDepends;  // Dependency
-   unsigned long ParentVer;       // Version
+   map_ptrloc Version;         // Stringtable
+   map_ptrloc Package;         // Package
+   map_ptrloc NextDepends;     // Dependency
+   map_ptrloc NextRevDepends;  // Dependency
+   map_ptrloc ParentVer;       // Version

    
    // Specific types of depends
    
    // Specific types of depends

+   map_ptrloc ID;   

    unsigned char Type;
    unsigned char CompareOp;
    unsigned char Type;
    unsigned char CompareOp;

-   unsigned short ID;

 };
 
 struct pkgCache::Provides
 {
 };
 
 struct pkgCache::Provides
 {

-   unsigned long ParentPkg;        // Pacakge
-   unsigned long Version;          // Version
-   unsigned long ProvideVersion;   // Stringtable
-   unsigned long NextProvides;     // Provides
-   unsigned long NextPkgProv;      // Provides
+   map_ptrloc ParentPkg;        // Pacakge
+   map_ptrloc Version;          // Version
+   map_ptrloc ProvideVersion;   // Stringtable
+   map_ptrloc NextProvides;     // Provides
+   map_ptrloc NextPkgProv;      // Provides

 };
 
 struct pkgCache::StringItem
 {
 };
 
 struct pkgCache::StringItem
 {

-   unsigned long String;        // Stringtable
-   unsigned long NextItem;      // StringItem
+   map_ptrloc String;        // Stringtable
+   map_ptrloc NextItem;      // StringItem

 };
 
 };
 

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

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

+inline pkgCache::PkgFileIterator pkgCache::FileBegin()
+       {return PkgFileIterator(*this,PkgFileP + HeaderP->FileList);};
+inline pkgCache::PkgFileIterator pkgCache::FileEnd()
+       {return PkgFileIterator(*this,PkgFileP);};
+
+// Oh I wish for Real Name Space Support
+class pkgCache::Namespace
+{   
+   public:
+
+   typedef pkgCache::PkgIterator PkgIterator;
+   typedef pkgCache::VerIterator VerIterator;
+   typedef pkgCache::DepIterator DepIterator;
+   typedef pkgCache::PrvIterator PrvIterator;
+   typedef pkgCache::PkgFileIterator PkgFileIterator;
+   typedef pkgCache::VerFileIterator VerFileIterator;   
+   typedef pkgCache::Version Version;
+   typedef pkgCache::Package Package;
+   typedef pkgCache::Header Header;
+   typedef pkgCache::Dep Dep;
+   typedef pkgCache::Flag Flag;
+};

 
 #endif
 
 #endif