I2P_Developers/i2p.itoopie
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

* OCMOSJ: Refactor cache keys for efficiency

Browse Source
This commit is contained in:
zzz
2010-12-31 13:11:25 +00:00
parent ba8c8aa90d
commit 0de6c932f5
1 changed files with 53 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
router/java/src/net/i2p/router/message/OutboundClientMessageOneShotJob.java
View File

@ -216,7 +216,8 @@ public class OutboundClientMessageOneShotJob extends JobImpl {
* *
* Key the cache on the source+dest pair. * Key the cache on the source+dest pair.
*/ */
private final static HashMap<String, LeaseSet> _leaseSetCache = new HashMap(); private final static HashMap<HashPair, LeaseSet> _leaseSetCache = new HashMap();
private LeaseSet getReplyLeaseSet(boolean force) { private LeaseSet getReplyLeaseSet(boolean force) {
LeaseSet newLS = getContext().netDb().lookupLeaseSetLocally(_from.calculateHash()); LeaseSet newLS = getContext().netDb().lookupLeaseSetLocally(_from.calculateHash());
if (newLS == null) if (newLS == null)
@ -316,7 +317,8 @@ public class OutboundClientMessageOneShotJob extends JobImpl {
* lease). * lease).
* *
*/ */
private final static HashMap<String, Lease> _leaseCache = new HashMap(); private final static HashMap<HashPair, Lease> _leaseCache = new HashMap();
private boolean getNextLease() { private boolean getNextLease() {
_leaseSet = getContext().netDb().lookupLeaseSetLocally(_to.calculateHash()); _leaseSet = getContext().netDb().lookupLeaseSetLocally(_to.calculateHash());
if (_leaseSet == null) { if (_leaseSet == null) {
@ -456,7 +458,7 @@ public class OutboundClientMessageOneShotJob extends JobImpl {
* before upper layers like streaming lib fail, even for low-bandwidth * before upper layers like streaming lib fail, even for low-bandwidth
* connections like IRC. * connections like IRC.
*/ */
private final static HashMap<String, Long> _lastReplyRequestCache = new HashMap(); private final static HashMap<HashPair, Long> _lastReplyRequestCache = new HashMap();
/** /**
* Send the message to the specified tunnel by creating a new garlic message containing * Send the message to the specified tunnel by creating a new garlic message containing
@ -628,23 +630,46 @@ public class OutboundClientMessageOneShotJob extends JobImpl {
*/ */
/** /**
* String used to cache things with based on source + dest * Key used to cache things with based on source + dest
* Put the dest first to make string matching faster
*/ */
private String _hashPair; private HashPair _hashPair;
private String hashPair() { private HashPair hashPair() {
if (_hashPair == null) if (_hashPair == null)
_hashPair = _to.calculateHash().toBase64() + _from.calculateHash().toBase64(); _hashPair = new HashPair(_from.calculateHash(), _to.calculateHash());
return _hashPair; return _hashPair;
} }
/**
* Key used to cache things with based on source + dest
* @since 0.8.3
*/
private static class HashPair {
private final Hash sh, dh;
public HashPair(Hash s, Hash d) {
sh = s;
dh = d;
}
public int hashCode() {
return sh.hashCode() + dh.hashCode();
}
public boolean equals(Object o) {
if (o == null || !(o instanceof HashPair))
return false;
HashPair hp = (HashPair) o;
return sh.equals(hp.sh) && dh.equals(hp.dh);
}
}
/** /**
* This is a little sneaky, but get the _from back out of the "opaque" hash key * This is a little sneaky, but get the _from back out of the "opaque" hash key
* (needed for cleanTunnelCache) * (needed for cleanTunnelCache)
* 44 = 32 * 4 / 3
*/ */
private static Hash sourceFromHashPair(String s) { private static Hash sourceFromHashPair(HashPair s) {
return new Hash(Base64.decode(s.substring(44, 88))); return s.sh;
} }
/** /**
@ -655,7 +680,7 @@ public class OutboundClientMessageOneShotJob extends JobImpl {
* But it's a start. * But it's a start.
*/ */
private void clearCaches() { private void clearCaches() {
String key = hashPair(); HashPair key = hashPair();
if (_inTunnel != null) { // if we wanted an ack, we sent our lease too if (_inTunnel != null) { // if we wanted an ack, we sent our lease too
synchronized(_leaseSetCache) { synchronized(_leaseSetCache) {
_leaseSetCache.remove(key); _leaseSetCache.remove(key);
@ -681,42 +706,38 @@ public class OutboundClientMessageOneShotJob extends JobImpl {
} }
/** /**
* Clean out old leaseSets from a set. * Clean out old leaseSets
* Caller must synchronize on tc. * Caller must synchronize on tc.
*/ */
private static void cleanLeaseSetCache(RouterContext ctx, HashMap tc) { private static void cleanLeaseSetCache(RouterContext ctx, Map<HashPair, LeaseSet> tc) {
long now = ctx.clock().now(); long now = ctx.clock().now();
for (Iterator iter = tc.entrySet().iterator(); iter.hasNext(); ) { for (Iterator<LeaseSet> iter = tc.values().iterator(); iter.hasNext(); ) {
Map.Entry entry = (Map.Entry)iter.next(); LeaseSet l = iter.next();
String k = (String) entry.getKey();
LeaseSet l = (LeaseSet) entry.getValue();
if (l.getEarliestLeaseDate() < now) if (l.getEarliestLeaseDate() < now)
iter.remove(); iter.remove();
} }
} }
/** /**
* Clean out old leases from a set. * Clean out old leases
* Caller must synchronize on tc. * Caller must synchronize on tc.
*/ */
private static void cleanLeaseCache(HashMap tc) { private static void cleanLeaseCache(Map<HashPair, Lease> tc) {
for (Iterator iter = tc.entrySet().iterator(); iter.hasNext(); ) { for (Iterator<Lease> iter = tc.values().iterator(); iter.hasNext(); ) {
Map.Entry entry = (Map.Entry)iter.next(); Lease l = iter.next();
String k = (String) entry.getKey();
Lease l = (Lease) entry.getValue();
if (l.isExpired(Router.CLOCK_FUDGE_FACTOR)) if (l.isExpired(Router.CLOCK_FUDGE_FACTOR))
iter.remove(); iter.remove();
} }
} }
/** /**
* Clean out old tunnels from a set. * Clean out old tunnels
* Caller must synchronize on tc. * Caller must synchronize on tc.
*/ */
private static void cleanTunnelCache(RouterContext ctx, HashMap tc) { private static void cleanTunnelCache(RouterContext ctx, Map<HashPair, TunnelInfo> tc) {
for (Iterator iter = tc.entrySet().iterator(); iter.hasNext(); ) { for (Iterator iter = tc.entrySet().iterator(); iter.hasNext(); ) {
Map.Entry entry = (Map.Entry)iter.next(); Map.Entry entry = (Map.Entry)iter.next();
String k = (String) entry.getKey(); HashPair k = (HashPair) entry.getKey();
TunnelInfo tunnel = (TunnelInfo) entry.getValue(); TunnelInfo tunnel = (TunnelInfo) entry.getValue();
if (!ctx.tunnelManager().isValidTunnel(sourceFromHashPair(k), tunnel)) if (!ctx.tunnelManager().isValidTunnel(sourceFromHashPair(k), tunnel))
iter.remove(); iter.remove();
@ -727,7 +748,7 @@ public class OutboundClientMessageOneShotJob extends JobImpl {
* Clean out old reply times * Clean out old reply times
* Caller must synchronize on tc. * Caller must synchronize on tc.
*/ */
private static void cleanReplyCache(RouterContext ctx, HashMap tc) { private static void cleanReplyCache(RouterContext ctx, Map<HashPair, Long> tc) {
long now = ctx.clock().now(); long now = ctx.clock().now();
for (Iterator iter = tc.values().iterator(); iter.hasNext(); ) { for (Iterator iter = tc.values().iterator(); iter.hasNext(); ) {
Long l = (Long) iter.next(); Long l = (Long) iter.next();
@ -766,8 +787,10 @@ public class OutboundClientMessageOneShotJob extends JobImpl {
* Key the caches on the source+dest pair. * Key the caches on the source+dest pair.
* *
*/ */
private static final HashMap<String, TunnelInfo> _tunnelCache = new HashMap(); private static final HashMap<HashPair, TunnelInfo> _tunnelCache = new HashMap();
private static HashMap<String, TunnelInfo> _backloggedTunnelCache = new HashMap();
private static HashMap<HashPair, TunnelInfo> _backloggedTunnelCache = new HashMap();
private TunnelInfo selectOutboundTunnel(Destination to) { private TunnelInfo selectOutboundTunnel(Destination to) {
TunnelInfo tunnel; TunnelInfo tunnel;
long now = getContext().clock().now(); long now = getContext().clock().now();