419036 - Simplify nsCacheEntryHashTable::VisitEntries and break 'friendship'

Status: VERIFIED FIXED

(Core :: Networking: Cache, defect)

Description

[Alfred Kayser]

Attachment: V1: Clean up VisitEntries

Make the VisitEntries method accept a normal 'PLDHashEnumerator' as callback function, so that:
1. this callback can also return PL_DHASH_REMOVE (this is needed for my patch for nsMemoryCacheDevice).
2. no class structure is needed to use this method
3. the friendship between nsCacheEntryHashTable and nsCacheService can be removed

Comment 1

[Alfred Kayser]

Attachment: V2: The right version

Comment 2

[Dave Camp (:dcamp)]

Don't you also need to update nsMemoryCacheDevice::CheckEntryCount() ?

Comment 3

[Alfred Kayser]

Attachment: V3: Also do the debug code in nsMemoryCacheDevice

Comment 4

[Alfred Kayser]

Can we have this in 1.9?
Simple code cleanup, that makes things easier for more optimizations in the cache.

Comment 5

[Christian :Biesinger (don't email me, ping me on IRC)]

Comment on attachment 305187 [details] [diff] [review]
V3: Also do the debug code in nsMemoryCacheDevice

+    PRInt32 *entryCount = (PRInt32 *)arg;
..
+    PRInt32 entryCount = 0;

shouldn't that be a PRUint32?

Comment 6

[Alfred Kayser]

Re comment #5: mEntryCount is also a PRInt32 (which is also not precisely right), but I preferred to keep it the same.

Comment 7

[Damon Sicore (:damons)]

Comment on attachment 305187 [details] [diff] [review]
V3: Also do the debug code in nsMemoryCacheDevice

a1.9+=damons

Comment 8

[Reed Loden [:reed]]

Checking in netwerk/cache/src/nsCacheEntry.cpp;
/cvsroot/mozilla/netwerk/cache/src/nsCacheEntry.cpp,v  <--  nsCacheEntry.cpp
new revision: 1.65; previous revision: 1.64
done
Checking in netwerk/cache/src/nsCacheEntry.h;
/cvsroot/mozilla/netwerk/cache/src/nsCacheEntry.h,v  <--  nsCacheEntry.h
new revision: 1.47; previous revision: 1.46
done
Checking in netwerk/cache/src/nsCacheService.cpp;
/cvsroot/mozilla/netwerk/cache/src/nsCacheService.cpp,v  <--  nsCacheService.cpp
new revision: 1.119; previous revision: 1.118
done
Checking in netwerk/cache/src/nsMemoryCacheDevice.cpp;
/cvsroot/mozilla/netwerk/cache/src/nsMemoryCacheDevice.cpp,v  <--  nsMemoryCacheDevice.cpp
new revision: 1.58; previous revision: 1.57
done

Comment 9

[Alfred Kayser]

Verified: 37 bytes saved and my patch for the memCache is now somewhat simpler.