X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/138d4b3d84035f2e0547d7de999d7c7ebb6b7adc..a4decc40b3eb085ea994d2a8b31ee9cddfd570ff:/apt-pkg/pkgcache.h?ds=inline diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h index 4e4bf0290..587d97534 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.17 1999/02/21 08:38:53 jgg Exp $ +// $Id: pkgcache.h,v 1.25 2001/07/01 22:28:24 jgg Exp $ /* ###################################################################### Cache - Structure definitions for the cache file @@ -16,7 +16,6 @@ ##################################################################### */ /*}}}*/ -// Header section: pkglib #ifndef PKGLIB_PKGCACHE_H #define PKGLIB_PKGCACHE_H @@ -28,11 +27,9 @@ #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; - +using std::string; + +class pkgVersioningSystem; class pkgCache { public: @@ -53,18 +50,20 @@ class pkgCache class PrvIterator; class PkgFileIterator; class VerFileIterator; - friend PkgIterator; - friend VerIterator; - friend DepIterator; - friend PrvIterator; - friend PkgFileIterator; - friend 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}; + Conflicts=5,Replaces=6,Obsoletes=7}; enum DepCompareOp {Or=0x10,NoOp=0,LessEq=0x1,GreaterEq=0x2,Less=0x3, Greater=0x4,Equals=0x5,NotEquals=0x6}; }; @@ -75,7 +74,7 @@ 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, - UnInstalled=3,HalfInstalled=4,ConfigFiles=5,Installed=6}; + HalfInstalled=4,ConfigFiles=5,Installed=6}; }; struct Flag @@ -90,8 +89,8 @@ class pkgCache string CacheFile; MMap ⤅ - 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: @@ -109,23 +108,32 @@ class pkgCache 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) - 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);}; // Usefull transformation things const char *Priority(unsigned char Priority); // Accessors - PkgIterator FindPkg(string Name); + PkgIterator FindPkg(const string &Name); Header &Head() {return *HeaderP;}; inline PkgIterator PkgBegin(); inline PkgIterator PkgEnd(); inline PkgFileIterator FileBegin(); inline PkgFileIterator FileEnd(); + + // 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); + pkgCache(MMap *Map,bool DoMap = true); virtual ~pkgCache() {}; }; @@ -156,8 +164,10 @@ struct pkgCache::Header unsigned long ProvidesCount; // Offsets - __apt_ptrloc FileList; // struct PackageFile - __apt_ptrloc 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 @@ -165,7 +175,7 @@ struct pkgCache::Header DynamicMMap::Pool Pools[7]; // Rapid package name lookup - __apt_ptrloc HashTable[2048]; + map_ptrloc HashTable[2*1048]; bool CheckSizes(Header &Against) const; Header(); @@ -174,17 +184,15 @@ struct pkgCache::Header struct pkgCache::Package { // Pointers - __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) + map_ptrloc Name; // Stringtable + map_ptrloc VersionList; // Version + map_ptrloc CurrentVer; // Version + map_ptrloc Section; // StringTable (StringItem) // Linked list - __apt_ptrloc NextPackage; // Package - __apt_ptrloc RevDepends; // Dependency - __apt_ptrloc ProvidesList; // Provides + map_ptrloc NextPackage; // Package + map_ptrloc RevDepends; // Dependency + map_ptrloc ProvidesList; // Provides // Install/Remove/Purge etc unsigned char SelectedState; // What @@ -198,76 +206,79 @@ struct pkgCache::Package struct pkgCache::PackageFile { // Names - __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 + 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 - __apt_ptrloc NextFile; // PackageFile + map_ptrloc NextFile; // PackageFile unsigned short ID; time_t mtime; // Modification time for the file }; struct pkgCache::VerFile { - __apt_ptrloc File; // PackageFile - __apt_ptrloc NextFile; // PkgVerFile - __apt_ptrloc Offset; // File offset + map_ptrloc File; // PackageFile + map_ptrloc NextFile; // PkgVerFile + map_ptrloc Offset; // File offset unsigned short Size; }; struct pkgCache::Version { - __apt_ptrloc VerStr; // Stringtable - __apt_ptrloc Section; // StringTable (StringItem) - __apt_ptrloc Arch; // StringTable + map_ptrloc VerStr; // Stringtable + map_ptrloc Section; // StringTable (StringItem) + map_ptrloc Arch; // StringTable // Lists - __apt_ptrloc FileList; // VerFile - __apt_ptrloc NextVer; // Version - __apt_ptrloc DependsList; // Dependency - __apt_ptrloc ParentPkg; // Package - __apt_ptrloc ProvidesList; // Provides + map_ptrloc FileList; // VerFile + map_ptrloc NextVer; // Version + map_ptrloc DependsList; // Dependency + map_ptrloc ParentPkg; // Package + map_ptrloc ProvidesList; // Provides - __apt_ptrloc Size; // These are the .deb size - __apt_ptrloc InstalledSize; + map_ptrloc Size; // These are the .deb size + map_ptrloc InstalledSize; + unsigned short Hash; unsigned short ID; unsigned char Priority; }; struct pkgCache::Dependency { - __apt_ptrloc Version; // Stringtable - __apt_ptrloc Package; // Package - __apt_ptrloc NextDepends; // Dependency - __apt_ptrloc NextRevDepends; // Dependency - __apt_ptrloc 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 + map_ptrloc ID; unsigned char Type; unsigned char CompareOp; - unsigned short ID; }; struct pkgCache::Provides { - __apt_ptrloc ParentPkg; // Pacakge - __apt_ptrloc Version; // Version - __apt_ptrloc ProvideVersion; // Stringtable - __apt_ptrloc NextProvides; // Provides - __apt_ptrloc 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 { - __apt_ptrloc String; // Stringtable - __apt_ptrloc NextItem; // StringItem + map_ptrloc String; // Stringtable + map_ptrloc NextItem; // StringItem }; #include @@ -277,8 +288,26 @@ inline pkgCache::PkgIterator pkgCache::PkgBegin() inline pkgCache::PkgIterator pkgCache::PkgEnd() {return PkgIterator(*this,PkgP);}; inline pkgCache::PkgFileIterator pkgCache::FileBegin() - {return PkgFileIterator(*this);}; + {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