summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apt-pkg/pkgcache.cc4
-rw-r--r--apt-pkg/pkgcache.h4
-rw-r--r--apt-pkg/pkgcachegen.cc5
-rw-r--r--cmdline/apt-cache.cc12
4 files changed, 18 insertions, 7 deletions
diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc
index 3e01e771d..ac1de021a 100644
--- a/apt-pkg/pkgcache.cc
+++ b/apt-pkg/pkgcache.cc
@@ -1,6 +1,6 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: pkgcache.cc,v 1.20 1998/12/07 07:26:19 jgg Exp $
+// $Id: pkgcache.cc,v 1.21 1998/12/14 03:39:15 jgg Exp $
/* ######################################################################
Package Cache - Accessor code for the cache
@@ -59,6 +59,8 @@ pkgCache::Header::Header()
VersionCount = 0;
DependsCount = 0;
PackageFileCount = 0;
+ VerFileCount = 0;
+ ProvidesCount = 0;
MaxVerFileSize = 0;
FileList = 0;
diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h
index 56ab50a37..f959f4233 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.13 1998/12/14 02:23:46 jgg Exp $
+// $Id: pkgcache.h,v 1.14 1998/12/14 03:39:15 jgg Exp $
/* ######################################################################
Cache - Structure definitions for the cache file
@@ -153,6 +153,8 @@ struct pkgCache::Header
unsigned long VersionCount;
unsigned long DependsCount;
unsigned long PackageFileCount;
+ unsigned long VerFileCount;
+ unsigned long ProvidesCount;
// Offsets
__apt_ptrloc FileList; // struct PackageFile
diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc
index 58561bf35..7cf332b68 100644
--- a/apt-pkg/pkgcachegen.cc
+++ b/apt-pkg/pkgcachegen.cc
@@ -1,6 +1,6 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: pkgcachegen.cc,v 1.25 1998/12/14 02:23:47 jgg Exp $
+// $Id: pkgcachegen.cc,v 1.26 1998/12/14 03:39:15 jgg Exp $
/* ######################################################################
Package Cache Generator - Generator for the cache structure.
@@ -188,6 +188,8 @@ bool pkgCacheGenerator::NewFileVer(pkgCache::VerIterator &Ver,
VF->Size = List.Size();
if (Cache.HeaderP->MaxVerFileSize < VF->Size)
Cache.HeaderP->MaxVerFileSize = VF->Size;
+ Cache.HeaderP->VerFileCount++;
+
return true;
}
/*}}}*/
@@ -295,6 +297,7 @@ bool pkgCacheGenerator::ListParser::NewProvides(pkgCache::VerIterator Ver,
unsigned long Provides = Owner->Map.Allocate(sizeof(pkgCache::Provides));
if (Provides == 0)
return false;
+ Cache.HeaderP->ProvidesCount++;
// Fill it in
pkgCache::PrvIterator Prv(Cache,Cache.ProvideP + Provides,Cache.PkgP);
diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc
index b4bb3a818..6bcb133cd 100644
--- a/cmdline/apt-cache.cc
+++ b/cmdline/apt-cache.cc
@@ -1,6 +1,6 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: apt-cache.cc,v 1.19 1998/12/14 02:23:47 jgg Exp $
+// $Id: apt-cache.cc,v 1.20 1998/12/14 03:39:15 jgg Exp $
/* ######################################################################
apt-cache - Manages the cache files
@@ -237,8 +237,10 @@ bool Stats(CommandLine &Cmd)
cout << "Total Dependencies: " << Cache.Head().DependsCount << " (" <<
SizeToStr(Cache.Head().DependsCount*Cache.Head().DependencySz) << ')' << endl;
- cout << "Total Ver/File relations: " << Cache.Head().PackageCount << " (" <<
- SizeToStr(Cache.Head().PackageCount*Cache.Head().PackageSz) << ')' << endl;
+ cout << "Total Ver/File relations: " << Cache.Head().VerFileCount << " (" <<
+ SizeToStr(Cache.Head().VerFileCount*Cache.Head().VerFileSz) << ')' << endl;
+ cout << "Total Provides Mappings: " << Cache.Head().ProvidesCount << " (" <<
+ SizeToStr(Cache.Head().ProvidesCount*Cache.Head().ProvidesSz) << ')' << endl;
// String list stats
unsigned long Size = 0;
@@ -259,7 +261,9 @@ bool Stats(CommandLine &Cmd)
unsigned long Total = 0;
Total = Slack + Size + Cache.Head().DependsCount*Cache.Head().DependencySz +
Cache.Head().VersionCount*Cache.Head().VersionSz +
- Cache.Head().PackageCount*Cache.Head().PackageSz;
+ Cache.Head().PackageCount*Cache.Head().PackageSz +
+ Cache.Head().VerFileCount*Cache.Head().VerFileSz +
+ Cache.Head().ProvidesCount*Cache.Head().ProvidesSz;
cout << "Total Space Accounted for: " << SizeToStr(Total) << endl;
return true;