zzz/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Profiles:

Browse Source 
- Nicer profile dump
      - More efficient profile lookup for display
      - Fix dumpprofile NPE
      - Change file suffix from .dat to .txt.gz
This commit is contained in:
zzz
2011-03-19 17:19:54 +00:00
parent 34d951aa6b
commit 14986fbfa1
9 changed files with 219 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
router/java/src/net/i2p/router/peermanager/ProfileOrganizer.java
View File

@@ -256,10 +256,15 @@ public class ProfileOrganizer {
return false;
}
public void exportProfile(Hash profile, OutputStream out) throws IOException {
/**
* @return true if successful, false if not found
*/
public boolean exportProfile(Hash profile, OutputStream out) throws IOException {
PeerProfile prof = getProfile(profile);
if (prof != null)
boolean rv = prof != null;
if (rv)
_persistenceHelper.writeProfile(prof, out);
return rv;
}
/**

119
router/java/src/net/i2p/router/peermanager/ProfilePersistenceHelper.java
View File

@@ -8,6 +8,7 @@ import java.io.FilenameFilter;
import java.io.InputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.util.Date;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Properties;
@@ -24,13 +25,24 @@ import net.i2p.util.Log;
import net.i2p.util.SecureDirectory;
import net.i2p.util.SecureFileOutputStream;
/**
* Write profiles to disk at shutdown,
* read at startup.
* The files are gzip compressed, however we unfortunately store them
* with a ".dat" extension instead of ".txt.gz", so it isn't apparent.
* TODO: Migrate to new extension.
*/
class ProfilePersistenceHelper {
private Log _log;
private RouterContext _context;
private final Log _log;
private final RouterContext _context;
public final static String PROP_PEER_PROFILE_DIR = "router.profileDir";
public final static String DEFAULT_PEER_PROFILE_DIR = "peerProfiles";
private final static String NL = System.getProperty("line.separator");
private static final String PREFIX = "profile-";
private static final String SUFFIX = ".txt.gz";
private static final String UNCOMPRESSED_SUFFIX = ".txt";
private static final String OLD_SUFFIX = ".dat";
/**
* If we haven't been able to get a message through to the peer in 3 days,
@@ -76,58 +88,49 @@ class ProfilePersistenceHelper {
if (_log.shouldLog(Log.DEBUG))
_log.debug("Writing the profile to " + f.getName() + " took " + delay + "ms");
}
/** write out the data from the profile to the stream */
public void writeProfile(PeerProfile profile, OutputStream out) throws IOException {
String groups = null;
if (_context.profileOrganizer().isFailing(profile.getPeer())) {
groups = "failing";
groups = "Failing";
} else if (!_context.profileOrganizer().isHighCapacity(profile.getPeer())) {
groups = "not failing";
groups = "Standard";
} else {
if (_context.profileOrganizer().isFast(profile.getPeer()))
groups = "fast and high capacity";
groups = "Fast, High Capacity";
else
groups = "high capacity";
groups = "High Capacity";
if (_context.profileOrganizer().isWellIntegrated(profile.getPeer()))
groups = groups + ", well integrated";
groups = groups + ", Integrated";
}
StringBuilder buf = new StringBuilder(512);
buf.append("########################################################################").append(NL);
buf.append("# profile for ").append(profile.getPeer().toBase64()).append(NL);
buf.append("# Profile for peer ").append(profile.getPeer().toBase64()).append(NL);
if (_us != null)
buf.append("# as calculated by ").append(_us.toBase64()).append(NL);
buf.append("#").append(NL);
buf.append("# capacity: ").append(profile.getCapacityValue()).append(NL);
buf.append("# integration: ").append(profile.getIntegrationValue()).append(NL);
buf.append("# speedValue: ").append(profile.getSpeedValue()).append(NL);
buf.append("#").append(NL);
buf.append("# Speed: ").append(profile.getSpeedValue()).append(NL);
buf.append("# Capacity: ").append(profile.getCapacityValue()).append(NL);
buf.append("# Integration: ").append(profile.getIntegrationValue()).append(NL);
buf.append("# Groups: ").append(groups).append(NL);
buf.append("#").append(NL);
buf.append("########################################################################").append(NL);
buf.append("##").append(NL);
buf.append("# Capacity bonus: used to affect the capacity score after all other calculations are done").append(NL);
buf.append("capacityBonus=").append(profile.getCapacityBonus()).append(NL);
buf.append("# Integration bonus: used to affect the integration score after all other calculations are done").append(NL);
buf.append("integrationBonus=").append(profile.getIntegrationBonus()).append(NL);
buf.append("# Speed bonus: used to affect the speed score after all other calculations are done").append(NL);
buf.append("speedBonus=").append(profile.getSpeedBonus()).append(NL);
buf.append(NL).append(NL);
buf.append("# Last heard about: when did we last get a reference to this peer? (milliseconds since the epoch)").append(NL);
buf.append("lastHeardAbout=").append(profile.getLastHeardAbout()).append(NL);
buf.append("# First heard about: when did we first get a reference to this peer? (milliseconds since the epoch)").append(NL);
buf.append("firstHeardAbout=").append(profile.getFirstHeardAbout()).append(NL);
buf.append("# Last sent to successfully: when did we last send the peer a message successfully? (milliseconds from the epoch)").append(NL);
buf.append("lastSentToSuccessfully=").append(profile.getLastSendSuccessful()).append(NL);
buf.append("# Last failed send: when did we last fail to send a message to the peer? (milliseconds from the epoch)").append(NL);
buf.append("lastFailedSend=").append(profile.getLastSendFailed()).append(NL);
buf.append("# Last heard from: when did we last get a message from the peer? (milliseconds from the epoch)").append(NL);
buf.append("lastHeardFrom=").append(profile.getLastHeardFrom()).append(NL);
buf.append("# moving average as to how fast the peer replies").append(NL);
buf.append("tunnelTestTimeAverage=").append(profile.getTunnelTestTimeAverage()).append(NL);
buf.append("tunnelPeakThroughput=").append(profile.getPeakThroughputKBps()).append(NL);
buf.append("tunnelPeakTunnelThroughput=").append(profile.getPeakTunnelThroughputKBps()).append(NL);
buf.append("tunnelPeakTunnel1mThroughput=").append(profile.getPeakTunnel1mThroughputKBps()).append(NL);
add(buf, "capacityBonus", profile.getCapacityBonus(), "Manual adjustment to the capacity score");
add(buf, "integrationBonus", profile.getIntegrationBonus(), "Manual adjustment to the integration score");
add(buf, "speedBonus", profile.getSpeedBonus(), "Manual adjustment to the speed score");
addDate(buf, "lastHeardAbout", profile.getLastHeardAbout(), "When did we last get a reference to this peer?");
addDate(buf, "firstHeardAbout", profile.getFirstHeardAbout(), "When did we first get a reference to this peer?");
addDate(buf, "lastSentToSuccessfully", profile.getLastSendSuccessful(), "When did we last send the peer a message successfully?");
addDate(buf, "lastFailedSend", profile.getLastSendFailed(), "When did we last fail to send a message to the peer?");
addDate(buf, "lastHeardFrom", profile.getLastHeardFrom(), "When did we last get a message from the peer?");
add(buf, "tunnelTestTimeAverage", profile.getTunnelTestTimeAverage(), "Moving average as to how fast the peer replies");
add(buf, "tunnelPeakThroughput", profile.getPeakThroughputKBps(), "KBytes/sec");
add(buf, "tunnelPeakTunnelThroughput", profile.getPeakTunnelThroughputKBps(), "KBytes/sec");
add(buf, "tunnelPeakTunnel1mThroughput", profile.getPeakTunnel1mThroughputKBps(), "KBytes/sec");
buf.append(NL);
out.write(buf.toString().getBytes());
@@ -148,12 +151,29 @@ class ProfilePersistenceHelper {
}
}
public Set readProfiles() {
/** @since 0.8.5 */
private static void addDate(StringBuilder buf, String name, long val, String description) {
String when = val > 0 ? (new Date(val)).toString() : "Never";
add(buf, name, val, description + ' ' + when);
}
/** @since 0.8.5 */
private static void add(StringBuilder buf, String name, long val, String description) {
buf.append("# ").append(name).append(NL).append("# ").append(description).append(NL);
buf.append(name).append('=').append(val).append(NL).append(NL);
}
/** @since 0.8.5 */
private static void add(StringBuilder buf, String name, double val, String description) {
buf.append("# ").append(name).append(NL).append("# ").append(description).append(NL);
buf.append(name).append('=').append(val).append(NL).append(NL);
}
public Set<PeerProfile> readProfiles() {
long start = _context.clock().now();
Set files = selectFiles();
Set profiles = new HashSet(files.size());
for (Iterator iter = files.iterator(); iter.hasNext();) {
File f = (File)iter.next();
Set<File> files = selectFiles();
Set<PeerProfile> profiles = new HashSet(files.size());
for (File f : files) {
PeerProfile profile = readProfile(f);
if (profile != null)
profiles.add(profile);
@@ -164,10 +184,11 @@ class ProfilePersistenceHelper {
return profiles;
}
private Set selectFiles() {
private Set<File> selectFiles() {
File files[] = getProfileDir().listFiles(new FilenameFilter() {
public boolean accept(File dir, String filename) {
return (filename.startsWith("profile-") && filename.endsWith(".dat"));
return (filename.startsWith(PREFIX) &&
(filename.endsWith(SUFFIX) || filename.endsWith(OLD_SUFFIX) || filename.endsWith(UNCOMPRESSED_SUFFIX)));
}
});
Set rv = new HashSet(files.length);
@@ -200,6 +221,14 @@ class ProfilePersistenceHelper {
", since we haven't heard from them in a long time");
file.delete();
return null;
} else if (file.getName().endsWith(OLD_SUFFIX)) {
// migrate to new file name, ignore failure
String newName = file.getAbsolutePath();
newName = newName.substring(0, newName.length() - OLD_SUFFIX.length()) + SUFFIX;
boolean success = file.renameTo(new File(newName));
if (!success)
// new file exists and on Windows?
file.delete();
}
profile.setCapacityBonus(getLong(props, "capacityBonus"));
@@ -300,8 +329,8 @@ class ProfilePersistenceHelper {
}
private Hash getHash(String name) {
String key = name.substring("profile-".length());
key = key.substring(0, key.length() - ".dat".length());
String key = name.substring(PREFIX.length());
key = key.substring(0, 44);
//Hash h = new Hash();
try {
//h.fromBase64(key);
@@ -317,7 +346,7 @@ class ProfilePersistenceHelper {
}
private File pickFile(PeerProfile profile) {
return new File(getProfileDir(), "profile-" + profile.getPeer().toBase64() + ".dat");
return new File(getProfileDir(), PREFIX + profile.getPeer().toBase64() + SUFFIX);
}
private File getProfileDir() {
@@ -339,7 +368,7 @@ class ProfilePersistenceHelper {
rnd.nextBytes(data);
Hash peer = new Hash(data);
try {
File f = new File(dir, "profile-" + peer.toBase64() + ".dat");
File f = new File(dir, PREFIX + peer.toBase64() + SUFFIX);
f.createNewFile();
System.out.println("Created " + peer.toBase64());
} catch (IOException ioe) {}

20
router/java/src/net/i2p/router/peermanager/TunnelHistory.java
View File

@@ -2,6 +2,7 @@ package net.i2p.router.peermanager;
import java.io.IOException;
import java.io.OutputStream;
import java.util.Date;
import java.util.Properties;
import net.i2p.router.RouterContext;
@@ -138,12 +139,12 @@ public class TunnelHistory {
buf.append("#################").append(NL);
buf.append("# Tunnel history").append(NL);
buf.append("###").append(NL);
add(buf, "lastAgreedTo", _lastAgreedTo, "When did the peer last agree to participate in a tunnel? (milliseconds since the epoch)");
add(buf, "lastFailed", _lastFailed, "When was the last time a tunnel that the peer agreed to participate failed? (milliseconds since the epoch)");
add(buf, "lastRejectedCritical", _lastRejectedCritical, "When was the last time the peer refused to participate in a tunnel? (milliseconds since the epoch)");
add(buf, "lastRejectedBandwidth", _lastRejectedBandwidth, "When was the last time the peer refused to participate in a tunnel? (milliseconds since the epoch)");
add(buf, "lastRejectedTransient", _lastRejectedTransient, "When was the last time the peer refused to participate in a tunnel? (milliseconds since the epoch)");
add(buf, "lastRejectedProbabalistic", _lastRejectedProbabalistic, "When was the last time the peer refused to participate in a tunnel? (milliseconds since the epoch)");
addDate(buf, "lastAgreedTo", _lastAgreedTo, "When did the peer last agree to participate in a tunnel?");
addDate(buf, "lastFailed", _lastFailed, "When was the last time a tunnel that the peer agreed to participate failed?");
addDate(buf, "lastRejectedCritical", _lastRejectedCritical, "When was the last time the peer refused to participate in a tunnel (Critical response code)?");
addDate(buf, "lastRejectedBandwidth", _lastRejectedBandwidth, "When was the last time the peer refused to participate in a tunnel (Bandwidth response code)?");
addDate(buf, "lastRejectedTransient", _lastRejectedTransient, "When was the last time the peer refused to participate in a tunnel (Transient load response code)?");
addDate(buf, "lastRejectedProbabalistic", _lastRejectedProbabalistic, "When was the last time the peer refused to participate in a tunnel (Probabalistic response code)?");
add(buf, "lifetimeAgreedTo", _lifetimeAgreedTo, "How many tunnels has the peer ever agreed to participate in?");
add(buf, "lifetimeFailed", _lifetimeFailed, "How many tunnels has the peer ever agreed to participate in that failed prematurely?");
add(buf, "lifetimeRejected", _lifetimeRejected, "How many tunnels has the peer ever refused to participate in?");
@@ -152,8 +153,13 @@ public class TunnelHistory {
_failRate.store(out, "tunnelHistory.failRate");
}
private static void addDate(StringBuilder buf, String name, long val, String description) {
String when = val > 0 ? (new Date(val)).toString() : "Never";
add(buf, name, val, description + ' ' + when);
}
private static void add(StringBuilder buf, String name, long val, String description) {
buf.append("# ").append(name.toUpperCase()).append(NL).append("# ").append(description).append(NL);
buf.append("# ").append(name).append(NL).append("# ").append(description).append(NL);
buf.append("tunnels.").append(name).append('=').append(val).append(NL).append(NL);
}