Configuration fixes

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

diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h
index 836418c2ce84f07e5eb68ca28309e3165e10e71f..70d08826e63b4c37b01d20789560148b01cb8a02 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.4 1998/07/05 05:33:55 jgg Exp $
+// $Id: pkgcache.h,v 1.12 1998/12/08 01:34:13 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


@@ -20,9 +20,18 @@
 #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>
+#include <apt-pkg/mmap.h>
+
+/* This should be a 32 bit type, larger tyes use too much ram and smaller
+   types are too small. Where ever possible 'unsigned long' should be used
+   instead of this internal type */
+typedef unsigned int __apt_ptrloc;

 
 class pkgCache
 {
 
 class pkgCache
 {


@@ -52,19 +61,29 @@ class pkgCache
    friend VerFileIterator;
    
    // These are all the constants used in the cache structures
    friend VerFileIterator;
    
    // These are all the constants used in the cache structures

-   enum DepType {Depends=1,PreDepends=2,Suggests=3,Recommends=4,
-                 Conflicts=5,Replaces=6};
-   enum VerPriority {Important=1,Required=2,Standard=3,Optional=5,Extra=5};
-   enum PkgSelectedState {Unknown=0,Install=1,Hold=2,DeInstall=3,Purge=4};
-   enum PkgFlags {Auto=(1<<0),New=(1<<1),Obsolete=(1<<2),Essential=(1<<3),
-                  ImmediateConf=(1<<4)};
-   enum PkgInstState {Ok=0,ReInstReq=1,HoldInst=2,HoldReInstReq=3};
-   enum PkgCurrentState {NotInstalled=0,UnPacked=1,HalfConfigured=2,
-                         UnInstalled=3,HalfInstalled=4,ConfigFiles=5,
-                         Installed=6};
-   enum PkgFFlags {NotSource=(1<<0)};
-   enum DepCompareOp {Or=0x10,NoOp=0,LessEq=0x1,GreaterEq=0x2,Less=0x3,
-                      Greater=0x4,Equals=0x5,NotEquals=0x6};
+   struct Dep
+   {
+      enum DepType {Depends=1,PreDepends=2,Suggests=3,Recommends=4,
+        Conflicts=5,Replaces=6};
+      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,
+        UnInstalled=3,HalfInstalled=4,ConfigFiles=5,Installed=6};
+   };
+   
+   struct Flag
+   {
+      enum PkgFlags {Auto=(1<<0),New=(1<<1),Obsolete=(1<<2),Essential=(1<<3),
+        ImmediateConf=(1<<4)};
+      enum PkgFFlags {NotSource=(1<<0)};
+   };

    
    protected:
    
    
    protected:
    


@@ -72,9 +91,6 @@ 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);
    
    static unsigned long sHash(string S);
    static unsigned long sHash(const char *S);
    


@@ -93,6 +109,7 @@ class pkgCache
 
    virtual bool ReMap();
    inline bool Sync() {return Map.Sync();};
 
    virtual bool ReMap();
    inline bool Sync() {return Map.Sync();};

+   inline MMap &GetMap() {return Map;};

    
    // String hashing function (512 range)
    inline unsigned long Hash(string S) const {return sHash(S);};
    
    // String hashing function (512 range)
    inline unsigned long Hash(string S) const {return sHash(S);};


@@ -106,7 +123,9 @@ class pkgCache
    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);
    virtual ~pkgCache() {};
 };
    pkgCache(MMap &Map);
    virtual ~pkgCache() {};
 };


@@ -136,15 +155,16 @@ struct pkgCache::Header
    unsigned long PackageFileCount;
    
    // Offsets
    unsigned long PackageFileCount;
    
    // Offsets

-   unsigned long FileList;              // struct PackageFile
-   unsigned long StringList;            // struct StringItem
+   __apt_ptrloc FileList;              // struct PackageFile
+   __apt_ptrloc StringList;            // struct StringItem
+   unsigned long MaxVerFileSize;

 
    /* Allocation pools, there should be one of these for each structure
       excluding the header */
    DynamicMMap::Pool Pools[7];
    
    // Rapid package name lookup
 
    /* Allocation pools, there should be one of these for each structure
       excluding the header */
    DynamicMMap::Pool Pools[7];
    
    // Rapid package name lookup

-   unsigned long HashTable[512];
+   __apt_ptrloc HashTable[2048];

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


@@ -153,17 +173,17 @@ 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)
+   __apt_ptrloc Name;              // Stringtable
+   __apt_ptrloc VersionList;       // Version
+   __apt_ptrloc TargetVer;         // Version
+   __apt_ptrloc CurrentVer;        // Version
+   __apt_ptrloc TargetDist;        // StringTable (StringItem)
+   __apt_ptrloc Section;           // StringTable (StringItem)

       
    // Linked list 
       
    // Linked list 

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

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


@@ -177,13 +197,13 @@ struct pkgCache::Package
 struct pkgCache::PackageFile
 {
    // Names
 struct pkgCache::PackageFile
 {
    // Names

-   unsigned long FileName;        // Stringtable
-   unsigned long Version;         // Stringtable
-   unsigned long Distribution;    // Stringtable
-   unsigned long Size;
+   __apt_ptrloc FileName;        // Stringtable
+   __apt_ptrloc Version;         // Stringtable
+   __apt_ptrloc Distribution;    // Stringtable
+   __apt_ptrloc Size;

    
    // Linked list
    
    // Linked list

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

    unsigned short ID;
    unsigned long Flags;
    time_t mtime;                  // Modification time for the file
    unsigned short ID;
    unsigned long Flags;
    time_t mtime;                  // Modification time for the file


@@ -191,37 +211,37 @@ struct pkgCache::PackageFile
 
 struct pkgCache::VerFile
 {
 
 struct pkgCache::VerFile
 {

-   unsigned long File;           // PackageFile
-   unsigned long NextFile;       // PkgVerFile
-   unsigned long Offset;
+   __apt_ptrloc File;           // PackageFile
+   __apt_ptrloc NextFile;       // PkgVerFile
+   __apt_ptrloc Offset;         // File offset

    unsigned short Size;
 };
 
 struct pkgCache::Version
 {
    unsigned short Size;
 };
 
 struct pkgCache::Version
 {

-   unsigned long VerStr;            // Stringtable
-   unsigned long Section;           // StringTable (StringItem)
+   __apt_ptrloc VerStr;            // Stringtable
+   __apt_ptrloc Section;           // StringTable (StringItem)

    
    // Lists
    
    // Lists

-   unsigned long FileList;          // VerFile
-   unsigned long NextVer;           // Version
-   unsigned long DependsList;       // Dependency
-   unsigned long ParentPkg;         // Package
-   unsigned long ProvidesList;      // Provides
-   
-   unsigned long Size;
-   unsigned long InstalledSize;
+   __apt_ptrloc FileList;          // VerFile
+   __apt_ptrloc NextVer;           // Version
+   __apt_ptrloc DependsList;       // Dependency
+   __apt_ptrloc ParentPkg;         // Package
+   __apt_ptrloc ProvidesList;      // Provides
+   
+   __apt_ptrloc Size;              // These are the .deb size
+   __apt_ptrloc InstalledSize;

    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
+   __apt_ptrloc Version;         // Stringtable
+   __apt_ptrloc Package;         // Package
+   __apt_ptrloc NextDepends;     // Dependency
+   __apt_ptrloc NextRevDepends;  // Dependency
+   __apt_ptrloc ParentVer;       // Version

    
    // Specific types of depends
    unsigned char Type;
    
    // Specific types of depends
    unsigned char Type;


@@ -231,24 +251,28 @@ struct pkgCache::Dependency
 
 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
+   __apt_ptrloc ParentPkg;        // Pacakge
+   __apt_ptrloc Version;          // Version
+   __apt_ptrloc ProvideVersion;   // Stringtable
+   __apt_ptrloc NextProvides;     // Provides
+   __apt_ptrloc NextPkgProv;      // Provides

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

-   unsigned long String;        // Stringtable
-   unsigned long NextItem;      // StringItem
+   __apt_ptrloc String;        // Stringtable
+   __apt_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);};
+inline pkgCache::PkgFileIterator pkgCache::FileEnd()
+       {return PkgFileIterator(*this,PkgFileP);};

 
 #endif
 
 #endif