X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/3b5421b4c75f5c85b48cbb61bf22642ff52a6352..7d8afa391c5cd04e797a2b41fe3b946631254995:/apt-pkg/pkgcache.h diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h index 9dd9869db..2d174cc01 100644 --- a/apt-pkg/pkgcache.h +++ b/apt-pkg/pkgcache.h @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: pkgcache.h,v 1.8 1998/10/20 02:39:20 jgg Exp $ +// $Id: pkgcache.h,v 1.15 1998/12/14 08:07:29 jgg Exp $ /* ###################################################################### Cache - Structure definitions for the cache file @@ -28,6 +28,11 @@ #include #include +/* 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 { public: @@ -66,7 +71,7 @@ class pkgCache struct State { - enum VerPriority {Important=1,Required=2,Standard=3,Optional=5,Extra=5}; + 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, @@ -77,7 +82,7 @@ class pkgCache { enum PkgFlags {Auto=(1<<0),New=(1<<1),Obsolete=(1<<2),Essential=(1<<3), ImmediateConf=(1<<4)}; - enum PkgFFlags {NotSource=(1<<0)}; + enum PkgFFlags {NotSource=(1<<0),NotAutomatic=(1<<1)}; }; protected: @@ -104,6 +109,7 @@ class pkgCache 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);}; @@ -147,10 +153,12 @@ struct pkgCache::Header unsigned long VersionCount; unsigned long DependsCount; unsigned long PackageFileCount; + unsigned long VerFileCount; + unsigned long ProvidesCount; // 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 @@ -158,7 +166,7 @@ struct pkgCache::Header DynamicMMap::Pool Pools[7]; // Rapid package name lookup - unsigned long HashTable[512]; + __apt_ptrloc HashTable[2048]; bool CheckSizes(Header &Against) const; Header(); @@ -167,17 +175,17 @@ struct pkgCache::Header 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 - 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 @@ -191,51 +199,55 @@ struct pkgCache::Package 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 Archive; // Stringtable + __apt_ptrloc Component; // Stringtable + __apt_ptrloc Version; // Stringtable + __apt_ptrloc Origin; // Stringtable + __apt_ptrloc Label; // Stringtable + __apt_ptrloc Architecture; // Stringtable + unsigned long Size; + unsigned long Flags; // Linked list - unsigned long NextFile; // PackageFile + __apt_ptrloc NextFile; // PackageFile unsigned short ID; - unsigned long Flags; time_t mtime; // Modification time for the file }; 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 long VerStr; // Stringtable - unsigned long Section; // StringTable (StringItem) + __apt_ptrloc VerStr; // Stringtable + __apt_ptrloc Section; // StringTable (StringItem) // Lists - unsigned long FileList; // VerFile - unsigned long NextVer; // Version - unsigned long DependsList; // Dependency - unsigned long ParentPkg; // Package - unsigned long ProvidesList; // Provides + __apt_ptrloc FileList; // VerFile + __apt_ptrloc NextVer; // Version + __apt_ptrloc DependsList; // Dependency + __apt_ptrloc ParentPkg; // Package + __apt_ptrloc ProvidesList; // Provides - unsigned long Size; - unsigned long InstalledSize; + __apt_ptrloc Size; // These are the .deb size + __apt_ptrloc InstalledSize; 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; @@ -245,17 +257,17 @@ struct pkgCache::Dependency 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 { - unsigned long String; // Stringtable - unsigned long NextItem; // StringItem + __apt_ptrloc String; // Stringtable + __apt_ptrloc NextItem; // StringItem }; #include