apt-cache: stats: Show a table utilization as percentage

Gbp-Dch: ignore

diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc
index 347a0954e1b2c71ea03d3ca8ee5cf5bda41151e6..4d8b9bc4172a7fec1ace37a03754176ffbc217df 100644 (file)
--- a/apt-pkg/pkgcache.cc
+++ b/apt-pkg/pkgcache.cc
@@ -210,7 +210,7 @@ map_id_t pkgCache::sHash(const string &Str) const
 {
    uint32_t Hash = 5381;
    for (string::const_iterator I = Str.begin(); I != Str.end(); ++I)
 {
    uint32_t Hash = 5381;
    for (string::const_iterator I = Str.begin(); I != Str.end(); ++I)

-      Hash = 33 * Hash + tolower_ascii(*I);
+      Hash = 33 * Hash + tolower_ascii((signed char)*I);

    return Hash % HeaderP->GetHashTableSize();
 }
 
    return Hash % HeaderP->GetHashTableSize();
 }
 


@@ -218,7 +218,7 @@ map_id_t pkgCache::sHash(const char *Str) const
 {
    uint32_t Hash = 5381;
    for (const char *I = Str; *I != 0; ++I)
 {
    uint32_t Hash = 5381;
    for (const char *I = Str; *I != 0; ++I)

-      Hash = 33 * Hash + tolower_ascii(*I);
+      Hash = 33 * Hash + tolower_ascii((signed char)*I);

    return Hash % HeaderP->GetHashTableSize();
 }
 
    return Hash % HeaderP->GetHashTableSize();
 }
 

diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc
index 7139bdeacde06409a60caa20bd978d361a2f6e9b..4818330848e72af9f1d87320d7d7edb409187881 100644 (file)
--- a/cmdline/apt-cache.cc
+++ b/cmdline/apt-cache.cc
@@ -172,6 +172,7 @@ static void ShowHashTableStats(std::string Type,
    cout << "Total buckets in " << Type << ": " << NumBuckets << std::endl;
    cout << "  Unused: " << UnusedBuckets << std::endl;
    cout << "  Used: " << UsedBuckets  << std::endl;
    cout << "Total buckets in " << Type << ": " << NumBuckets << std::endl;
    cout << "  Unused: " << UnusedBuckets << std::endl;
    cout << "  Used: " << UsedBuckets  << std::endl;

+   cout << "  Utilization: " << 100.0 * UsedBuckets/NumBuckets << "%" << std::endl;

    cout << "  Average entries: " << Entries/(double)UsedBuckets << std::endl;
    cout << "  Longest: " << LongestBucket << std::endl;
    cout << "  Shortest: " << ShortestBucket << std::endl;
    cout << "  Average entries: " << Entries/(double)UsedBuckets << std::endl;
    cout << "  Longest: " << LongestBucket << std::endl;
    cout << "  Shortest: " << ShortestBucket << std::endl;