Changed ie to eg

[apt.git] / apt-pkg / pkgcachegen.cc

diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc
index 89bcec801eb6cf6be1942430b8163d136b0082fc..9806e5b918a4060a149c010421bd1b41d66a5258 100644 (file)
--- a/apt-pkg/pkgcachegen.cc
+++ b/apt-pkg/pkgcachegen.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: pkgcachegen.cc,v 1.27 1999/01/27 02:48:52 jgg Exp $
+// $Id: pkgcachegen.cc,v 1.33 1999/03/08 07:18:11 jgg Exp $

 /* ######################################################################
    
    Package Cache Generator - Generator for the cache structure.
 /* ######################################################################
    
    Package Cache Generator - Generator for the cache structure.


@@ -22,6 +22,7 @@
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/deblistparser.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/deblistparser.h>
 #include <apt-pkg/strutl.h>

+#include <system.h>

 
 #include <sys/stat.h>
 #include <unistd.h>
 
 #include <sys/stat.h>
 #include <unistd.h>


@@ -44,6 +45,7 @@ pkgCacheGenerator::pkgCacheGenerator(DynamicMMap &Map,OpProgress &Prog) :
    Cache.HeaderP->Dirty = true;
    Map.Sync(0,sizeof(pkgCache::Header));
    Map.UsePools(*Cache.HeaderP->Pools,sizeof(Cache.HeaderP->Pools)/sizeof(Cache.HeaderP->Pools[0]));
    Cache.HeaderP->Dirty = true;
    Map.Sync(0,sizeof(pkgCache::Header));
    Map.UsePools(*Cache.HeaderP->Pools,sizeof(Cache.HeaderP->Pools)/sizeof(Cache.HeaderP->Pools[0]));

+   memset(UniqHash,0,sizeof(UniqHash));

 }
                                                                        /*}}}*/
 // CacheGenerator::~pkgCacheGenerator - Destructor                     /*{{{*/
 }
                                                                        /*}}}*/
 // CacheGenerator::~pkgCacheGenerator - Destructor                     /*{{{*/


@@ -69,11 +71,14 @@ bool pkgCacheGenerator::MergeList(ListParser &List)
 {
    List.Owner = this;
 
 {
    List.Owner = this;
 

-   int Counter = 0;
+   unsigned int Counter = 0;

    while (List.Step() == true)
    {
       // Get a pointer to the package structure
       string PackageName = List.Package();
    while (List.Step() == true)
    {
       // Get a pointer to the package structure
       string PackageName = List.Package();

+      if (PackageName.empty() == true)
+        return false;
+      

       pkgCache::PkgIterator Pkg;
       if (NewPackage(Pkg,PackageName) == false)
         return _error->Error("Error occured while processing %s (NewPackage)",PackageName.c_str());
       pkgCache::PkgIterator Pkg;
       if (NewPackage(Pkg,PackageName) == false)
         return _error->Error("Error occured while processing %s (NewPackage)",PackageName.c_str());


@@ -247,9 +252,9 @@ bool pkgCacheGenerator::ListParser::NewDepends(pkgCache::VerIterator Ver,
    // Probe the reverse dependency list for a version string that matches
    if (Version.empty() == false)
    {
    // Probe the reverse dependency list for a version string that matches
    if (Version.empty() == false)
    {

-      for (pkgCache::DepIterator I = Pkg.RevDependsList(); I.end() == false; I++)
+/*      for (pkgCache::DepIterator I = Pkg.RevDependsList(); I.end() == false; I++, Hit++)

         if (I->Version != 0 && I.TargetVer() == Version)
         if (I->Version != 0 && I.TargetVer() == Version)

-           Dep->Version = I->Version;
+           Dep->Version = I->Version;*/

       if (Dep->Version == 0)
         if ((Dep->Version = WriteString(Version)) == 0)
            return false;
       if (Dep->Version == 0)
         if ((Dep->Version = WriteString(Version)) == 0)
            return false;


@@ -262,19 +267,17 @@ bool pkgCacheGenerator::ListParser::NewDepends(pkgCache::VerIterator Ver,
    
    /* Link it to the version (at the end of the list)
       Caching the old end point speeds up generation substantially */
    
    /* Link it to the version (at the end of the list)
       Caching the old end point speeds up generation substantially */

-   static pkgCache::VerIterator OldVer(Cache);
-   static __apt_ptrloc *OldLast;
-   if (OldVer != Ver)
+   if (OldDepVer != Ver)

    {
    {

-      OldLast = &Ver->DependsList;
+      OldDepLast = &Ver->DependsList;

       for (pkgCache::DepIterator D = Ver.DependsList(); D.end() == false; D++)
       for (pkgCache::DepIterator D = Ver.DependsList(); D.end() == false; D++)

-        OldLast = &D->NextDepends;
-      OldVer = Ver;
+        OldDepLast = &D->NextDepends;
+      OldDepVer = Ver;

    }
    
    }
    

-   Dep->NextDepends = *OldLast;
-   *OldLast = Dep.Index();
-   OldLast = &Dep->NextDepends;
+   Dep->NextDepends = *OldDepLast;
+   *OldDepLast = Dep.Index();
+   OldDepLast = &Dep->NextDepends;

 
    return true;
 }
 
    return true;
 }


@@ -359,6 +362,13 @@ bool pkgCacheGenerator::SelectFile(string File,unsigned long Flags)
 unsigned long pkgCacheGenerator::WriteUniqString(const char *S,
                                                 unsigned int Size)
 {
 unsigned long pkgCacheGenerator::WriteUniqString(const char *S,
                                                 unsigned int Size)
 {

+   /* We use a very small transient hash table here, this speeds up generation
+      by a fair amount on slower machines */
+   pkgCache::StringItem *&Bucket = UniqHash[(S[0]*5 + S[1]) % _count(UniqHash)];
+   if (Bucket != 0 && 
+       stringcmp(S,S+Size,Cache.StrP + Bucket->String) == 0)
+      return Bucket->String;
+   

    // Search for an insertion point
    pkgCache::StringItem *I = Cache.StringItemP + Cache.HeaderP->StringList;
    int Res = 1;
    // Search for an insertion point
    pkgCache::StringItem *I = Cache.StringItemP + Cache.HeaderP->StringList;
    int Res = 1;


@@ -373,7 +383,10 @@ unsigned long pkgCacheGenerator::WriteUniqString(const char *S,
    
    // Match
    if (Res == 0)
    
    // Match
    if (Res == 0)

+   {
+      Bucket = I;

       return I->String;
       return I->String;

+   }

    
    // Get a structure
    unsigned long Item = Map.Allocate(sizeof(pkgCache::StringItem));
    
    // Get a structure
    unsigned long Item = Map.Allocate(sizeof(pkgCache::StringItem));


@@ -388,6 +401,7 @@ unsigned long pkgCacheGenerator::WriteUniqString(const char *S,
    if (ItemP->String == 0)
       return 0;
    
    if (ItemP->String == 0)
       return 0;
    

+   Bucket = ItemP;

    return ItemP->String;
 }
                                                                        /*}}}*/
    return ItemP->String;
 }
                                                                        /*}}}*/


@@ -408,6 +422,13 @@ bool pkgSrcCacheCheck(pkgSourceList &List)
    int Missing = 0;
    for (pkgSourceList::const_iterator I = List.begin(); I != List.end(); I++)
    {
    int Missing = 0;
    for (pkgSourceList::const_iterator I = List.begin(); I != List.end(); I++)
    {

+      // Only cache deb source types.
+      if (I->Type != pkgSourceList::Item::Deb)
+      {
+        Missing++;
+        continue;
+      }
+      

       string File = ListDir + URItoFileName(I->PackagesURI());
       struct stat Buf;
       if (stat(File.c_str(),&Buf) != 0)
       string File = ListDir + URItoFileName(I->PackagesURI());
       struct stat Buf;
       if (stat(File.c_str(),&Buf) != 0)


@@ -448,12 +469,16 @@ bool pkgSrcCacheCheck(pkgSourceList &List)
       return false;
    
    for (pkgCache::PkgFileIterator F(Cache); F.end() == false; F++)
       return false;
    
    for (pkgCache::PkgFileIterator F(Cache); F.end() == false; F++)

-   {
+   {      

       // Search for a match in the source list
       bool Bad = true;
       for (pkgSourceList::const_iterator I = List.begin(); 
           I != List.end(); I++)
       {
       // Search for a match in the source list
       bool Bad = true;
       for (pkgSourceList::const_iterator I = List.begin(); 
           I != List.end(); I++)
       {

+        // Only cache deb source types.
+        if (I->Type != pkgSourceList::Item::Deb)
+           continue;
+        

         string File = ListDir + URItoFileName(I->PackagesURI());
         if (F.FileName() == File)
         {
         string File = ListDir + URItoFileName(I->PackagesURI());
         if (F.FileName() == File)
         {