- tor-commits - lists.torproject.org

[onionoo/master] Speed up updating weights files by using 4 updater threads.
by karsten＠torproject.org 27 Jul '12

27 Jul '12

commit 752cff0f5d0af833235d48a916f5e9be71a03b0b Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Jul 26 13:47:19 2012 +0200 Speed up updating weights files by using 4 updater threads. Using 4 updater threads reduces the time to process 1 consensus from 20 to 11 seconds here. --- src/org/torproject/onionoo/WeightsDataWriter.java | 101 ++++++++++++++++----- 1 files changed, 78 insertions(+), 23 deletions(-) diff --git a/src/org/torproject/onionoo/WeightsDataWriter.java b/src/org/torproject/onionoo/WeightsDataWriter.java index d3a37fc..c4a887b 100644 --- a/src/org/torproject/onionoo/WeightsDataWriter.java +++ b/src/org/torproject/onionoo/WeightsDataWriter.java @@ -13,6 +13,7 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Arrays; import java.util.Comparator; +import java.util.Date; import java.util.HashMap; import java.util.Iterator; import java.util.List; @@ -34,13 +35,6 @@ import org.torproject.descriptor.ServerDescriptor; public class WeightsDataWriter { - private SimpleDateFormat dateTimeFormat = new SimpleDateFormat( - "yyyy-MM-dd HH:mm:ss"); - public WeightsDataWriter() { - this.dateTimeFormat.setLenient(false); - this.dateTimeFormat.setTimeZone(TimeZone.getTimeZone("UTC")); - } - private SortedSet<String> currentFingerprints = new TreeSet<String>(); public void setCurrentRelays(SortedMap<String, Node> currentRelays) { this.currentFingerprints.addAll(currentRelays.keySet()); @@ -97,19 +91,72 @@ public class WeightsDataWriter { freshUntilMillis = consensus.getFreshUntilMillis(); SortedMap<String, double[]> pathSelectionWeights = this.calculatePathSelectionProbabilities(consensus); - for (Map.Entry<String, double[]> e : - pathSelectionWeights.entrySet()) { - String fingerprint = e.getKey(); - double[] weights = e.getValue(); - this.addToHistory(fingerprint, validAfterMillis, - freshUntilMillis, weights); - } + this.updateWeightsHistory(validAfterMillis, freshUntilMillis, + pathSelectionWeights); } } } } } + private static final int HISTORY_UPDATER_WORKERS_NUM = 4; + private void updateWeightsHistory(long validAfterMillis, + long freshUntilMillis, + SortedMap<String, double[]> pathSelectionWeights) { + int files = pathSelectionWeights.size(); + List<HistoryUpdateWorker> historyUpdateWorkers = + new ArrayList<HistoryUpdateWorker>(); + for (int i = 0; i < HISTORY_UPDATER_WORKERS_NUM; i++) { + HistoryUpdateWorker historyUpdateWorker = + new HistoryUpdateWorker(validAfterMillis, freshUntilMillis, + pathSelectionWeights, this); + historyUpdateWorkers.add(historyUpdateWorker); + historyUpdateWorker.setDaemon(true); + historyUpdateWorker.start(); + } + for (HistoryUpdateWorker historyUpdateWorker : historyUpdateWorkers) { + try { + historyUpdateWorker.join(); + } catch (InterruptedException e) { + /* This is not something that we can take care of. Just leave the + * worker thread alone. */ + } + } + } + + private class HistoryUpdateWorker extends Thread { + private long validAfterMillis; + private long freshUntilMillis; + private SortedMap<String, double[]> pathSelectionWeights; + private WeightsDataWriter parent; + public HistoryUpdateWorker(long validAfterMillis, + long freshUntilMillis, + SortedMap<String, double[]> pathSelectionWeights, + WeightsDataWriter parent) { + this.validAfterMillis = validAfterMillis; + this.freshUntilMillis = freshUntilMillis; + this.pathSelectionWeights = pathSelectionWeights; + this.parent = parent; + } + public void run() { + String fingerprint = null; + double[] weights = null; + do { + fingerprint = null; + synchronized (pathSelectionWeights) { + if (!pathSelectionWeights.isEmpty()) { + fingerprint = pathSelectionWeights.firstKey(); + weights = pathSelectionWeights.remove(fingerprint); + } + } + if (fingerprint != null) { + this.parent.addToHistory(fingerprint, this.validAfterMillis, + this.freshUntilMillis, weights); + } + } while (fingerprint != null); + } + } + private SortedMap<String, double[]> calculatePathSelectionProbabilities( RelayNetworkStatusConsensus consensus) { double wgg = 1.0, wgd = 1.0, wmg = 1.0, wmm = 1.0, wme = 1.0, @@ -233,6 +280,10 @@ public class WeightsDataWriter { }); File historyFile = new File("status/weights", fingerprint); if (historyFile.exists()) { + SimpleDateFormat dateTimeFormat = new SimpleDateFormat( + "yyyy-MM-dd HH:mm:ss"); + dateTimeFormat.setLenient(false); + dateTimeFormat.setTimeZone(TimeZone.getTimeZone("UTC")); try { BufferedReader br = new BufferedReader(new FileReader( historyFile)); @@ -245,9 +296,9 @@ public class WeightsDataWriter { + "'. Skipping this line."); continue; } - long validAfterMillis = this.dateTimeFormat.parse(parts[0] + long validAfterMillis = dateTimeFormat.parse(parts[0] + " " + parts[1]).getTime(); - long freshUntilMillis = this.dateTimeFormat.parse(parts[2] + long freshUntilMillis = dateTimeFormat.parse(parts[2] + " " + parts[3]).getTime(); long[] interval = new long[] { validAfterMillis, freshUntilMillis }; @@ -330,13 +381,16 @@ public class WeightsDataWriter { SortedMap<long[], double[]> history) { File historyFile = new File("status/weights", fingerprint); try { + SimpleDateFormat dateTimeFormat = new SimpleDateFormat( + "yyyy-MM-dd HH:mm:ss"); + dateTimeFormat.setTimeZone(TimeZone.getTimeZone("UTC")); historyFile.getParentFile().mkdirs(); BufferedWriter bw = new BufferedWriter(new FileWriter(historyFile)); for (Map.Entry<long[], double[]> e : history.entrySet()) { long[] fresh = e.getKey(); double[] weights = e.getValue(); - bw.write(this.dateTimeFormat.format(fresh[0]) + " " - + this.dateTimeFormat.format(fresh[1])); + bw.write(dateTimeFormat.format(fresh[0]) + " " + + dateTimeFormat.format(fresh[1])); for (double weight : weights) { bw.write(String.format(" %.12f", weight)); } @@ -492,12 +546,13 @@ public class WeightsDataWriter { double factor = ((double) maxValue) / 999.0; int count = lastNonNullIndex - firstNonNullIndex + 1; StringBuilder sb = new StringBuilder(); + SimpleDateFormat dateTimeFormat = new SimpleDateFormat( + "yyyy-MM-dd HH:mm:ss"); + dateTimeFormat.setTimeZone(TimeZone.getTimeZone("UTC")); sb.append("\"" + graphName + "\":{" - + "\"first\":\"" - + this.dateTimeFormat.format(firstDataPointMillis) + "\"," - + "\"last\":\"" - + this.dateTimeFormat.format(lastDataPointMillis) + "\"," - + "\"interval\":" + String.valueOf(dataPointInterval / 1000L) + + "\"first\":\"" + dateTimeFormat.format(firstDataPointMillis) + + "\",\"last\":\"" + dateTimeFormat.format(lastDataPointMillis) + + "\",\"interval\":" + String.valueOf(dataPointInterval / 1000L) + ",\"factor\":" + String.format(Locale.US, "%.9f", factor) + ",\"count\":" + String.valueOf(count) + ",\"values\":["); int dataPointsWritten = 0, previousNonNullIndex = -2;

1 0

[onionoo/master] Add a new document type for path-selection probabilities.
by karsten＠torproject.org 27 Jul '12

27 Jul '12

commit 7713b17fa2cc79656ca51dea25a1ebe17e9e5f34 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Jul 24 16:16:37 2012 +0200 Add a new document type for path-selection probabilities. --- etc/web.xml.template | 4 + src/org/torproject/onionoo/Main.java | 8 + src/org/torproject/onionoo/ResourceServlet.java | 38 ++ src/org/torproject/onionoo/WeightsDataWriter.java | 547 +++++++++++++++++++++ web/index.html | 109 ++++ 5 files changed, 706 insertions(+), 0 deletions(-) diff --git a/etc/web.xml.template b/etc/web.xml.template index b2c3178..b7fbf9e 100644 --- a/etc/web.xml.template +++ b/etc/web.xml.template @@ -28,6 +28,10 @@ <servlet-name>Resource</servlet-name> <url-pattern>/bandwidth</url-pattern> </servlet-mapping> + <servlet-mapping> + <servlet-name>Resource</servlet-name> + <url-pattern>/weights</url-pattern> + </servlet-mapping> </web-app> diff --git a/src/org/torproject/onionoo/Main.java b/src/org/torproject/onionoo/Main.java index 175176c..fb11899 100644 --- a/src/org/torproject/onionoo/Main.java +++ b/src/org/torproject/onionoo/Main.java @@ -38,6 +38,14 @@ public class Main { bdw.readExtraInfoDescriptors(); bdw.deleteObsoleteBandwidthFiles(); + printStatus("Updating weights data."); + WeightsDataWriter wdw = new WeightsDataWriter(); + wdw.setCurrentRelays(cn.getCurrentRelays()); + wdw.readRelayServerDescriptors(); + wdw.readRelayNetworkConsensuses(); + wdw.writeWeightsDataFiles(); + wdw.deleteObsoleteWeightsDataFiles(); + printStatus("Updating summary data."); cn.writeRelaySearchDataFile(); diff --git a/src/org/torproject/onionoo/ResourceServlet.java b/src/org/torproject/onionoo/ResourceServlet.java index 7fddbea..512b7ca 100644 --- a/src/org/torproject/onionoo/ResourceServlet.java +++ b/src/org/torproject/onionoo/ResourceServlet.java @@ -166,6 +166,8 @@ public class ResourceServlet extends HttpServlet { resourceType = "details"; } else if (uri.startsWith("/bandwidth")) { resourceType = "bandwidth"; + } else if (uri.startsWith("/weights")) { + resourceType = "weights"; } else { response.sendError(HttpServletResponse.SC_BAD_REQUEST); return; @@ -578,6 +580,8 @@ public class ResourceServlet extends HttpServlet { return this.writeDetailsLines(summaryLine); } else if (resourceType.equals("bandwidth")) { return this.writeBandwidthLines(summaryLine); + } else if (resourceType.equals("weights")) { + return this.writeWeightsLines(summaryLine); } else { return ""; } @@ -670,5 +674,39 @@ public class ResourceServlet extends HttpServlet { return ""; } } + + private String writeWeightsLines(String summaryLine) { + String fingerprint = null; + if (summaryLine.contains("\"f\":\"")) { + fingerprint = summaryLine.substring(summaryLine.indexOf( + "\"f\":\"") + "\"f\":\"".length()); + } else { + return ""; + } + fingerprint = fingerprint.substring(0, 40); + File weightsFile = new File(this.outDirString + "weights/" + + fingerprint); + StringBuilder sb = new StringBuilder(); + String weightsLines = null; + if (weightsFile.exists()) { + try { + BufferedReader br = new BufferedReader(new FileReader( + weightsFile)); + String line; + while ((line = br.readLine()) != null) { + sb.append(line + "\n"); + } + br.close(); + weightsLines = sb.toString(); + } catch (IOException e) { + } + } + if (weightsLines != null) { + weightsLines = weightsLines.substring(0, weightsLines.length() - 1); + return weightsLines; + } else { + return ""; + } + } } diff --git a/src/org/torproject/onionoo/WeightsDataWriter.java b/src/org/torproject/onionoo/WeightsDataWriter.java new file mode 100644 index 0000000..d3a37fc --- /dev/null +++ b/src/org/torproject/onionoo/WeightsDataWriter.java @@ -0,0 +1,547 @@ +/* Copyright 2012 The Tor Project + * See LICENSE for licensing information */ +package org.torproject.onionoo; + +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileReader; +import java.io.FileWriter; +import java.io.IOException; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Comparator; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.SortedMap; +import java.util.SortedSet; +import java.util.TimeZone; +import java.util.TreeMap; +import java.util.TreeSet; + +import org.torproject.descriptor.Descriptor; +import org.torproject.descriptor.DescriptorFile; +import org.torproject.descriptor.DescriptorReader; +import org.torproject.descriptor.DescriptorSourceFactory; +import org.torproject.descriptor.NetworkStatusEntry; +import org.torproject.descriptor.RelayNetworkStatusConsensus; +import org.torproject.descriptor.ServerDescriptor; + +public class WeightsDataWriter { + + private SimpleDateFormat dateTimeFormat = new SimpleDateFormat( + "yyyy-MM-dd HH:mm:ss"); + public WeightsDataWriter() { + this.dateTimeFormat.setLenient(false); + this.dateTimeFormat.setTimeZone(TimeZone.getTimeZone("UTC")); + } + + private SortedSet<String> currentFingerprints = new TreeSet<String>(); + public void setCurrentRelays(SortedMap<String, Node> currentRelays) { + this.currentFingerprints.addAll(currentRelays.keySet()); + } + + /* Read advertised bandwidths of all server descriptors in + * in/relay-descriptors/server-descriptors/ to memory. Ideally, we'd + * skip descriptors that we read before and obtain their advertised + * bandwidths from some temp file. This approach should do for now, + * though. */ + private Map<String, Integer> advertisedBandwidths = + new HashMap<String, Integer>(); + public void readRelayServerDescriptors() { + DescriptorReader reader = + DescriptorSourceFactory.createDescriptorReader(); + reader.addDirectory(new File( + "in/relay-descriptors/server-descriptors")); + Iterator<DescriptorFile> descriptorFiles = reader.readDescriptors(); + while (descriptorFiles.hasNext()) { + DescriptorFile descriptorFile = descriptorFiles.next(); + if (descriptorFile.getDescriptors() != null) { + for (Descriptor descriptor : descriptorFile.getDescriptors()) { + if (descriptor instanceof ServerDescriptor) { + ServerDescriptor serverDescriptor = + (ServerDescriptor) descriptor; + String digest = serverDescriptor.getServerDescriptorDigest(). + toUpperCase(); + int advertisedBandwidth = Math.min(Math.min( + serverDescriptor.getBandwidthBurst(), + serverDescriptor.getBandwidthObserved()), + serverDescriptor.getBandwidthRate()); + this.advertisedBandwidths.put(digest, advertisedBandwidth); + } + } + } + } + } + + public void readRelayNetworkConsensuses() { + DescriptorReader reader = + DescriptorSourceFactory.createDescriptorReader(); + reader.addDirectory(new File("in/relay-descriptors/consensuses")); + reader.setExcludeFiles(new File( + "status/weights-relay-consensus-history")); + Iterator<DescriptorFile> descriptorFiles = reader.readDescriptors(); + while (descriptorFiles.hasNext()) { + DescriptorFile descriptorFile = descriptorFiles.next(); + if (descriptorFile.getDescriptors() != null) { + for (Descriptor descriptor : descriptorFile.getDescriptors()) { + if (descriptor instanceof RelayNetworkStatusConsensus) { + RelayNetworkStatusConsensus consensus = + (RelayNetworkStatusConsensus) descriptor; + long validAfterMillis = consensus.getValidAfterMillis(), + freshUntilMillis = consensus.getFreshUntilMillis(); + SortedMap<String, double[]> pathSelectionWeights = + this.calculatePathSelectionProbabilities(consensus); + for (Map.Entry<String, double[]> e : + pathSelectionWeights.entrySet()) { + String fingerprint = e.getKey(); + double[] weights = e.getValue(); + this.addToHistory(fingerprint, validAfterMillis, + freshUntilMillis, weights); + } + } + } + } + } + } + + private SortedMap<String, double[]> calculatePathSelectionProbabilities( + RelayNetworkStatusConsensus consensus) { + double wgg = 1.0, wgd = 1.0, wmg = 1.0, wmm = 1.0, wme = 1.0, + wmd = 1.0, wee = 1.0, wed = 1.0; + SortedMap<String, Integer> bandwidthWeights = + consensus.getBandwidthWeights(); + if (bandwidthWeights != null) { + SortedSet<String> missingWeightKeys = new TreeSet<String>( + Arrays.asList("Wgg,Wgd,Wmg,Wmm,Wme,Wmd,Wee,Wed".split(","))); + missingWeightKeys.removeAll(bandwidthWeights.keySet()); + if (missingWeightKeys.isEmpty()) { + wgg = ((double) bandwidthWeights.get("Wgg")) / 10000.0; + wgd = ((double) bandwidthWeights.get("Wgd")) / 10000.0; + wmg = ((double) bandwidthWeights.get("Wmg")) / 10000.0; + wmm = ((double) bandwidthWeights.get("Wmm")) / 10000.0; + wme = ((double) bandwidthWeights.get("Wme")) / 10000.0; + wmd = ((double) bandwidthWeights.get("Wmd")) / 10000.0; + wee = ((double) bandwidthWeights.get("Wee")) / 10000.0; + wed = ((double) bandwidthWeights.get("Wed")) / 10000.0; + } + } + SortedMap<String, Double> + advertisedBandwidths = new TreeMap<String, Double>(), + consensusWeights = new TreeMap<String, Double>(), + guardWeights = new TreeMap<String, Double>(), + middleWeights = new TreeMap<String, Double>(), + exitWeights = new TreeMap<String, Double>(); + double totalAdvertisedBandwidth = 0.0; + double totalConsensusWeight = 0.0; + double totalGuardWeight = 0.0; + double totalMiddleWeight = 0.0; + double totalExitWeight = 0.0; + for (NetworkStatusEntry relay : + consensus.getStatusEntries().values()) { + String fingerprint = relay.getFingerprint(); + if (!relay.getFlags().contains("Running")) { + continue; + } + boolean isExit = relay.getFlags().contains("Exit") && + !relay.getFlags().contains("BadExit"); + boolean isGuard = relay.getFlags().contains("Guard"); + String serverDescriptorDigest = relay.getDescriptor(). + toUpperCase(); + double advertisedBandwidth = 0.0; + if (this.advertisedBandwidths.containsKey( + serverDescriptorDigest)) { + advertisedBandwidth = (double) this.advertisedBandwidths.get( + serverDescriptorDigest); + } + double consensusWeight = (double) relay.getBandwidth(); + double guardWeight = (double) relay.getBandwidth(); + double middleWeight = (double) relay.getBandwidth(); + double exitWeight = (double) relay.getBandwidth(); + if (isGuard && isExit) { + guardWeight *= wgd; + middleWeight *= wmd; + exitWeight *= wed; + } else if (isGuard) { + guardWeight *= wgg; + middleWeight *= wmg; + exitWeight = 0.0; + } else if (isExit) { + guardWeight = 0.0; + middleWeight *= wme; + exitWeight *= wee; + } else { + guardWeight = 0.0; + middleWeight *= wmm; + exitWeight = 0.0; + } + advertisedBandwidths.put(fingerprint, advertisedBandwidth); + consensusWeights.put(fingerprint, consensusWeight); + guardWeights.put(fingerprint, guardWeight); + middleWeights.put(fingerprint, middleWeight); + exitWeights.put(fingerprint, exitWeight); + totalAdvertisedBandwidth += advertisedBandwidth; + totalConsensusWeight += consensusWeight; + totalGuardWeight += guardWeight; + totalMiddleWeight += middleWeight; + totalExitWeight += exitWeight; + } + SortedMap<String, double[]> pathSelectionProbabilities = + new TreeMap<String, double[]>(); + for (NetworkStatusEntry relay : + consensus.getStatusEntries().values()) { + String fingerprint = relay.getFingerprint(); + double[] probabilities = new double[] { + advertisedBandwidths.get(fingerprint) + / totalAdvertisedBandwidth, + consensusWeights.get(fingerprint) / totalConsensusWeight, + guardWeights.get(fingerprint) / totalGuardWeight, + middleWeights.get(fingerprint) / totalMiddleWeight, + exitWeights.get(fingerprint) / totalExitWeight }; + pathSelectionProbabilities.put(fingerprint, probabilities); + } + return pathSelectionProbabilities; + } + + private void addToHistory(String fingerprint, long validAfterMillis, + long freshUntilMillis, double[] weights) { + SortedMap<long[], double[]> history = + this.readHistoryFromDisk(fingerprint); + long[] interval = new long[] { validAfterMillis, freshUntilMillis }; + if ((history.headMap(interval).isEmpty() || + history.headMap(interval).lastKey()[1] <= validAfterMillis) && + (history.tailMap(interval).isEmpty() || + history.tailMap(interval).firstKey()[0] >= freshUntilMillis)) { + history.put(interval, weights); + history = this.compressHistory(history); + this.writeHistoryToDisk(fingerprint, history); + } + } + + private SortedMap<long[], double[]> readHistoryFromDisk( + String fingerprint) { + SortedMap<long[], double[]> history = + new TreeMap<long[], double[]>(new Comparator<long[]>() { + public int compare(long[] a, long[] b) { + return a[0] < b[0] ? -1 : a[0] > b[0] ? 1 : 0; + } + }); + File historyFile = new File("status/weights", fingerprint); + if (historyFile.exists()) { + try { + BufferedReader br = new BufferedReader(new FileReader( + historyFile)); + String line; + while ((line = br.readLine()) != null) { + String[] parts = line.split(" "); + if (parts.length != 9) { + System.err.println("Illegal line '" + line + "' in history " + + "file '" + historyFile.getAbsolutePath() + + "'. Skipping this line."); + continue; + } + long validAfterMillis = this.dateTimeFormat.parse(parts[0] + + " " + parts[1]).getTime(); + long freshUntilMillis = this.dateTimeFormat.parse(parts[2] + + " " + parts[3]).getTime(); + long[] interval = new long[] { validAfterMillis, + freshUntilMillis }; + double[] weights = new double[] { + Double.parseDouble(parts[4]), + Double.parseDouble(parts[5]), + Double.parseDouble(parts[6]), + Double.parseDouble(parts[7]), + Double.parseDouble(parts[8]) }; + history.put(interval, weights); + } + br.close(); + } catch (ParseException e) { + System.err.println("Could not parse timestamp while reading " + + "history file '" + historyFile.getAbsolutePath() + + "'. Skipping."); + } catch (IOException e) { + System.err.println("Could not read history file '" + + historyFile.getAbsolutePath() + "'. Skipping."); + } + } + return history; + } + + private long now = System.currentTimeMillis(); + private SortedMap<long[], double[]> compressHistory( + SortedMap<long[], double[]> history) { + SortedMap<long[], double[]> compressedHistory = + new TreeMap<long[], double[]>(history.comparator()); + long lastStartMillis = 0L, lastEndMillis = 0L; + double[] lastWeights = null; + for (Map.Entry<long[], double[]> e : history.entrySet()) { + long startMillis = e.getKey()[0], endMillis = e.getKey()[1]; + double[] weights = e.getValue(); + long intervalLengthMillis; + if (this.now - endMillis <= 7L * 24L * 60L * 60L * 1000L) { + intervalLengthMillis = 60L * 60L * 1000L; + } else if (this.now - endMillis <= 31L * 24L * 60L * 60L * 1000L) { + intervalLengthMillis = 4L * 60L * 60L * 1000L; + } else if (this.now - endMillis <= 92L * 24L * 60L * 60L * 1000L) { + intervalLengthMillis = 12L * 60L * 60L * 1000L; + } else if (this.now - endMillis <= 366L * 24L * 60L * 60L * 1000L) { + intervalLengthMillis = 2L * 24L * 60L * 60L * 1000L; + } else { + intervalLengthMillis = 10L * 24L * 60L * 60L * 1000L; + } + if (lastEndMillis == startMillis && + (lastEndMillis / intervalLengthMillis) == + (endMillis / intervalLengthMillis)) { + double lastIntervalInHours = (double) ((lastEndMillis + - lastStartMillis) / 60L * 60L * 1000L); + double currentIntervalInHours = (double) ((endMillis + - startMillis) / 60L * 60L * 1000L); + double newIntervalInHours = (double) ((endMillis + - lastStartMillis) / 60L * 60L * 1000L); + for (int i = 0; i < lastWeights.length; i++) { + lastWeights[i] *= lastIntervalInHours; + lastWeights[i] += weights[i] * currentIntervalInHours; + lastWeights[i] /= newIntervalInHours; + } + lastEndMillis = endMillis; + } else { + if (lastStartMillis > 0L) { + compressedHistory.put(new long[] { lastStartMillis, + lastEndMillis }, lastWeights); + } + lastStartMillis = startMillis; + lastEndMillis = endMillis; + lastWeights = weights; + } + } + if (lastStartMillis > 0L) { + compressedHistory.put(new long[] { lastStartMillis, lastEndMillis }, + lastWeights); + } + return compressedHistory; + } + + private void writeHistoryToDisk(String fingerprint, + SortedMap<long[], double[]> history) { + File historyFile = new File("status/weights", fingerprint); + try { + historyFile.getParentFile().mkdirs(); + BufferedWriter bw = new BufferedWriter(new FileWriter(historyFile)); + for (Map.Entry<long[], double[]> e : history.entrySet()) { + long[] fresh = e.getKey(); + double[] weights = e.getValue(); + bw.write(this.dateTimeFormat.format(fresh[0]) + " " + + this.dateTimeFormat.format(fresh[1])); + for (double weight : weights) { + bw.write(String.format(" %.12f", weight)); + } + bw.write("\n"); + } + bw.close(); + } catch (IOException e) { + System.err.println("Could not write weights file '" + + historyFile.getAbsolutePath() + "'. Skipping."); + } + } + + private File weightsFileDirectory = new File("out/weights"); + public void writeWeightsDataFiles() { + for (String fingerprint : this.currentFingerprints) { + SortedMap<long[], double[]> history = + this.readHistoryFromDisk(fingerprint); + if (history.isEmpty() || history.lastKey()[1] < this.now + - 7L * 24L * 60L * 60L * 1000L) { + /* Don't write weights data file to disk. */ + continue; + } + String historyString = this.formatHistoryString(fingerprint, + history); + File weightsFile = new File(weightsFileDirectory, fingerprint); + try { + weightsFile.getParentFile().mkdirs(); + BufferedWriter bw = new BufferedWriter(new FileWriter( + weightsFile)); + bw.write(historyString); + bw.close(); + } catch (IOException e) { + System.err.println("Could not write weights data file '" + + weightsFile.getAbsolutePath() + "'. Skipping."); + } + } + } + + private String[] graphTypes = new String[] { + "advertised_bandwidth_fraction", + "consensus_weight_fraction", + "guard_probability", + "middle_probability", + "exit_probability" + }; + + private String[] graphNames = new String[] { + "1_week", + "1_month", + "3_months", + "1_year", + "5_years" }; + + private long[] graphIntervals = new long[] { + 7L * 24L * 60L * 60L * 1000L, + 31L * 24L * 60L * 60L * 1000L, + 92L * 24L * 60L * 60L * 1000L, + 366L * 24L * 60L * 60L * 1000L, + 5L * 366L * 24L * 60L * 60L * 1000L }; + + private long[] dataPointIntervals = new long[] { + 60L * 60L * 1000L, + 4L * 60L * 60L * 1000L, + 12L * 60L * 60L * 1000L, + 2L * 24L * 60L * 60L * 1000L, + 10L * 24L * 60L * 60L * 1000L }; + + private String formatHistoryString(String fingerprint, + SortedMap<long[], double[]> history) { + StringBuilder sb = new StringBuilder(); + sb.append("{\"fingerprint\":\"" + fingerprint + "\""); + for (int graphTypeIndex = 0; graphTypeIndex < this.graphTypes.length; + graphTypeIndex++) { + String graphType = this.graphTypes[graphTypeIndex]; + sb.append(",\n\"" + graphType + "\":{"); + int graphIntervalsWritten = 0; + for (int graphIntervalIndex = 0; graphIntervalIndex < + this.graphIntervals.length; graphIntervalIndex++) { + String timeline = this.formatTimeline(graphTypeIndex, + graphIntervalIndex, history); + if (timeline != null) { + sb.append((graphIntervalsWritten++ > 0 ? "," : "") + "\n" + + timeline); + } + } + sb.append("}"); + } + sb.append("\n}\n"); + return sb.toString(); + } + + private String formatTimeline(int graphTypeIndex, + int graphIntervalIndex, SortedMap<long[], double[]> history) { + String graphName = this.graphNames[graphIntervalIndex]; + long graphInterval = this.graphIntervals[graphIntervalIndex]; + long dataPointInterval = + this.dataPointIntervals[graphIntervalIndex]; + List<Double> dataPoints = new ArrayList<Double>(); + long intervalStartMillis = ((this.now - graphInterval) + / dataPointInterval) * dataPointInterval; + long totalMillis = 0L; + double totalWeightTimesMillis = 0.0; + for (Map.Entry<long[], double[]> e : history.entrySet()) { + long startMillis = e.getKey()[0], endMillis = e.getKey()[1]; + double weight = e.getValue()[graphTypeIndex]; + if (endMillis < intervalStartMillis) { + continue; + } + while ((intervalStartMillis / dataPointInterval) != + (endMillis / dataPointInterval)) { + dataPoints.add(totalMillis * 5L < dataPointInterval + ? -1.0 : totalWeightTimesMillis / (double) totalMillis); + totalWeightTimesMillis = 0.0; + totalMillis = 0L; + intervalStartMillis += dataPointInterval; + } + totalWeightTimesMillis += weight + * ((double) (endMillis - startMillis)); + totalMillis += (endMillis - startMillis); + } + dataPoints.add(totalMillis * 5L < dataPointInterval + ? -1.0 : totalWeightTimesMillis / (double) totalMillis); + double maxValue = 0.0; + int firstNonNullIndex = -1, lastNonNullIndex = -1; + for (int dataPointIndex = 0; dataPointIndex < dataPoints.size(); + dataPointIndex++) { + double dataPoint = dataPoints.get(dataPointIndex); + if (dataPoint >= 0.0) { + if (firstNonNullIndex < 0) { + firstNonNullIndex = dataPointIndex; + } + lastNonNullIndex = dataPointIndex; + if (dataPoint > maxValue) { + maxValue = dataPoint; + } + } + } + if (firstNonNullIndex < 0) { + return null; + } + long firstDataPointMillis = (((this.now - graphInterval) + / dataPointInterval) + firstNonNullIndex) * dataPointInterval + + dataPointInterval / 2L; + if (graphIntervalIndex > 0 && firstDataPointMillis >= + this.now - graphIntervals[graphIntervalIndex - 1]) { + /* Skip weights history object, because it doesn't contain + * anything new that wasn't already contained in the last + * weights history object(s). */ + return null; + } + long lastDataPointMillis = firstDataPointMillis + + (lastNonNullIndex - firstNonNullIndex) * dataPointInterval; + double factor = ((double) maxValue) / 999.0; + int count = lastNonNullIndex - firstNonNullIndex + 1; + StringBuilder sb = new StringBuilder(); + sb.append("\"" + graphName + "\":{" + + "\"first\":\"" + + this.dateTimeFormat.format(firstDataPointMillis) + "\"," + + "\"last\":\"" + + this.dateTimeFormat.format(lastDataPointMillis) + "\"," + + "\"interval\":" + String.valueOf(dataPointInterval / 1000L) + + ",\"factor\":" + String.format(Locale.US, "%.9f", factor) + + ",\"count\":" + String.valueOf(count) + ",\"values\":["); + int dataPointsWritten = 0, previousNonNullIndex = -2; + boolean foundTwoAdjacentDataPoints = false; + for (int dataPointIndex = firstNonNullIndex; dataPointIndex <= + lastNonNullIndex; dataPointIndex++) { + double dataPoint = dataPoints.get(dataPointIndex); + if (dataPoint >= 0.0) { + if (dataPointIndex - previousNonNullIndex == 1) { + foundTwoAdjacentDataPoints = true; + } + previousNonNullIndex = dataPointIndex; + } + sb.append((dataPointsWritten++ > 0 ? "," : "") + + (dataPoint < 0.0 ? "null" : + String.valueOf((long) ((dataPoint * 999.0) / maxValue)))); + } + sb.append("]}"); + if (foundTwoAdjacentDataPoints) { + return sb.toString(); + } else { + return null; + } + } + + public void deleteObsoleteWeightsDataFiles() { + SortedMap<String, File> obsoleteWeightsFiles = + new TreeMap<String, File>(); + if (weightsFileDirectory.exists() && + weightsFileDirectory.isDirectory()) { + for (File file : weightsFileDirectory.listFiles()) { + if (file.getName().length() == 40) { + obsoleteWeightsFiles.put(file.getName(), file); + } + } + } + for (String fingerprint : this.currentFingerprints) { + if (obsoleteWeightsFiles.containsKey(fingerprint)) { + obsoleteWeightsFiles.remove(fingerprint); + } + } + for (File weightsFile : obsoleteWeightsFiles.values()) { + weightsFile.delete(); + } + } +} + diff --git a/web/index.html b/web/index.html index 0578843..b956822 100755 --- a/web/index.html +++ b/web/index.html @@ -616,6 +616,109 @@ fingerprints in the URL. </tr> </table> +<h3>Weights documents</h3> +Weights documents contain aggregate statistics of a relay's probability +to be selected by clients for building paths. +Added document type on July 24, 2012. +Weights documents contain different time intervals and are available for +all relays that have been running in the past week. +Weights documents contain the following fields: +<ul> +<li>"relays_published": UTC timestamp (YYYY-MM-DD hh:mm:ss) when +the last contained relay network status consensus started being valid. +Indicates how recent the relay weights documents in this document are. +Required field.</li> +<li>"relays": Array of objects representing relay weights +documents. +Required field. +Each array object contains the following key-value pairs: +<ul> +<li>"fingerprint": Relay fingerprint consisting of 40 upper-case +hexadecimal characters. +Required field.</li> +<li>"advertised_bandwidth_fraction": History object containing +relative advertised bandwidth of this relay compared to the total +advertised bandwidth in the network. +If there were no bandwidth authorities, this fraction would be a very +rough approximation of the probability of this relay to be selected by +clients. +Optional field. +Keys are string representation of the time period covered by the weights +history object. +Keys are fixed strings "1_week", "1_month", +"3_months", "1_year", and "5_years". +Keys refer to the last known weights history of a relay, not to the time +when the weights document was published. +A weights history object is only contained if the time period it covers +is not already contained in another weights history object with shorter +time period and higher data resolution. +Each weights history object contains the following key-value pairs: +<ul> +<li>"first": UTC timestamp (YYYY-MM-DD hh:mm:ss) of the first data +data point in the weights history. +Required field.</li> +<li>"last": UTC timestamp (YYYY-MM-DD hh:mm:ss) of the last data +data point in the weights history. +Required field.</li> +<li>"interval": Time interval between two data points in seconds. +Required field.</li> +<li>"factor": Factor by which subsequent weights values need to +be multiplied to get the path-selection probability. +The idea is that contained weights values are normalized to a range from 0 +to 999 to reduce document size while still providing sufficient detail for +both slow and fast relays. +Required field.</li> +<li>"count": Number of provided data points, included mostly for +debugging purposes. +Can also be derived from the number of elements in the subsequent array. +Optional field.</li> +<li>"values": Array of normalized weights values. +May contain null values if the relay was running less than 20% of a given +time period. +Only includes non-null values for series of at least two subsequent data +points to enable drawing of line graphs. +Required field.</li> +</ul> +</li> +<li>"consensus_weight_fraction": History object containing the +fraction of this relay's consensus weight compared to the sum of all +consensus weights in the network. +This fraction is a very rough approximation of the probability of this +relay to be selected by clients. +Optional field. +The specification of this history object is similar to that in the +advertised_bandwidth_fraction field above.</li> +<li>"guard_probability": History object containing the probability +of this relay to be selected for the guard position. +This probability is calculated based on consensus weights, relay flags, +and bandwidth weights in the consensus. +Path selection depends on more factors, so that this probability can only +be an approximation. +Optional field. +The specification of this history object is similar to that in the +advertised_bandwidth_fraction field above.</li> +<li>"middle_probability": History object containing the probability +of this relay to be selected for the middle position. +This probability is calculated based on consensus weights, relay flags, +and bandwidth weights in the consensus. +Path selection depends on more factors, so that this probability can only +be an approximation. +Optional field. +The specification of this history object is similar to that in the +advertised_bandwidth_fraction field above.</li> +<li>"exit_probability": History object containing the probability +of this relay to be selected for the exit position. +This probability is calculated based on consensus weights, relay flags, +and bandwidth weights in the consensus. +Path selection depends on more factors, so that this probability can only +be an approximation. +Optional field. +The specification of this history object is similar to that in the +advertised_bandwidth_fraction field above.</li> +</ul> +</li> +</ul> + <h3>Methods</h3> The following methods each return a single document containing zero or more relay and/or bridge documents. @@ -642,6 +745,12 @@ or that have been running in the past week. currently running or that have been running in the past week. </td> </tr> +<tr> +<td>GET weights</td> +<td>Return weights documents of all relays and bridges that are currently +running or that have been running in the past week. +</td> +</tr> </table> Each of the methods above can be parameterized to select only a subset of relay and/or bridge documents to be included in the response.

1 0

[onionoo/master] Include current system time in log messages.
by karsten＠torproject.org 27 Jul '12

27 Jul '12

commit 8f72663b2045c56f525e8997816e855ff1cd0832 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Jul 27 09:16:42 2012 +0200 Include current system time in log messages. --- src/org/torproject/onionoo/Main.java | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/org/torproject/onionoo/Main.java b/src/org/torproject/onionoo/Main.java index fb11899..41af72c 100644 --- a/src/org/torproject/onionoo/Main.java +++ b/src/org/torproject/onionoo/Main.java @@ -3,6 +3,7 @@ package org.torproject.onionoo; import java.io.File; +import java.util.Date; /* Update search data and status data files. */ public class Main { @@ -53,7 +54,7 @@ public class Main { } private static void printStatus(String message) { - System.out.println(message); + System.out.println(new Date() + ": " + message); } }

1 0

r25727: {website} remove antagonism/dist from the mirror list. (in website/trunk: . include)
by Andrew Lewman 26 Jul '12

26 Jul '12

Author: phobos Date: 2012-07-27 02:28:45 +0000 (Fri, 27 Jul 2012) New Revision: 25727 Modified: website/trunk/include/mirrors-table.wmi website/trunk/update-mirrors.pl Log: remove antagonism/dist from the mirror list. Modified: website/trunk/include/mirrors-table.wmi =================================================================== --- website/trunk/include/mirrors-table.wmi 2012-07-22 10:38:24 UTC (rev 25726) +++ website/trunk/include/mirrors-table.wmi 2012-07-27 02:28:45 UTC (rev 25727) @@ -8,9 +8,9 @@ <td>Up to date</td> <td> - </td> - <td><a href="http://torproject.antagonism.org/dist/">http</a></td> + <td> - </td> <td><a href="http://torproject.antagonism.org/">http</a></td> - <td><a href="https://torproject.antagonism.org/dist/">https</a></td> + <td> - </td> <td><a href="https://torproject.antagonism.org/">https</a></td> <td> - </td> <td> - </td> @@ -239,6 +239,23 @@ <tr> + <td>DE</td> + + <td>crazyhaze.de</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.crazyhaze.de/dist/">http</a></td> + <td><a href="http://tor.crazyhaze.de/">http</a></td> + <td><a href="https://tor.crazyhaze.de/dist/">https</a></td> + <td><a href="https://tor.crazyhaze.de/">https</a></td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>LT</td> <td></td> @@ -545,6 +562,23 @@ <tr> + <td>FR</td> + + <td>LazyTiger</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.taiga-san.net/dist/">http</a></td> + <td><a href="http://tor.taiga-san.net/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>DE</td> <td>spline</td> @@ -668,7 +702,7 @@ <td></td> - <td>Up to date</td> + <td>Out of date</td> <td> - </td> <td><a href="http://torproject.lightning-bolt.net/dist/">http</a></td> @@ -766,23 +800,6 @@ <tr> - <td>DE</td> - - <td>crazyhaze.de</td> - - <td>Unknown</td> - - <td> - </td> - <td><a href="http://tor.crazyhaze.de/dist/">http</a></td> - <td><a href="http://tor.crazyhaze.de/">http</a></td> - <td><a href="https://tor.crazyhaze.de/dist/">https</a></td> - <td><a href="https://tor.crazyhaze.de/">https</a></td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>NL</td> <td></td> @@ -800,23 +817,6 @@ <tr> - <td>FR</td> - - <td>LazyTiger</td> - - <td>Unknown</td> - - <td> - </td> - <td><a href="http://tor.taiga-san.net/dist/">http</a></td> - <td><a href="http://tor.taiga-san.net/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>IS</td> <td>crypto.is</td> Modified: website/trunk/update-mirrors.pl =================================================================== --- website/trunk/update-mirrors.pl 2012-07-22 10:38:24 UTC (rev 25726) +++ website/trunk/update-mirrors.pl 2012-07-27 02:28:45 UTC (rev 25727) @@ -652,8 +652,8 @@ httpsWebsiteMirror => "https://torproject.antagonism.org/", rsyncWebsiteMirror => "", ftpWebsiteMirror => "", - httpDistMirror => "http://torproject.antagonism.org/dist/", - httpsDistMirror => "https://torproject.antagonism.org/dist/", + httpDistMirror => "", + httpsDistMirror => "", rsyncDistMirror => "", hiddenServiceMirror => "", },

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 26 Jul '12

26 Jul '12

commit d7f5650429ba1fa2efa3027b3eba6391646a044f Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jul 26 13:15:12 2012 +0000 Update translations for vidalia_alpha --- tr/vidalia_tr.po | 80 +++++++++++++++++++++++++++--------------------------- 1 files changed, 40 insertions(+), 40 deletions(-) diff --git a/tr/vidalia_tr.po b/tr/vidalia_tr.po index bb0554d..06eb5de 100644 --- a/tr/vidalia_tr.po +++ b/tr/vidalia_tr.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2012-07-26 12:44+0000\n" +"PO-Revision-Date: 2012-07-26 13:01+0000\n" "Last-Translator: Aşkın Yollu <askin(a)askin.ws>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -197,7 +197,7 @@ msgstr "Tor soket yolu için bir dosya seçiniz" msgctxt "AdvancedPage" msgid "Configure ControlPort automatically" -msgstr "" +msgstr "ControlPort Otomatik Yapılandırılsın" msgctxt "AdvancedPage" msgid "" @@ -207,7 +207,7 @@ msgstr "" msgctxt "AdvancedPage" msgid "Panic" -msgstr "" +msgstr "Panik" msgctxt "AdvancedPage" msgid "" @@ -216,7 +216,7 @@ msgstr "" msgctxt "AdvancedPage" msgid "Enable panic button" -msgstr "" +msgstr "Panin butonunu devreye al" msgctxt "AdvancedPage" msgid "Panic path:" @@ -238,7 +238,7 @@ msgstr "Vidalia Tor servisini kaldıramıyor.\n\nKendiniz kaldırmayı deneyebil msgctxt "AdvancedPage" msgid "Select a Directory to Use for Panic" -msgstr "" +msgstr "Panik İçin Kullanılacak Klasörü Seçin" msgctxt "AppearancePage" msgid "Language" @@ -1367,19 +1367,19 @@ msgstr "" msgctxt "DebugDialog" msgid "Plugin debug output" -msgstr "" +msgstr "Eklenti hata ayıklama çıktısı" msgctxt "DebugDialog" msgid "Plugin Output" -msgstr "" +msgstr "Eklenti Çıktısı" msgctxt "DebugDialog" msgid "Syntax Errors" -msgstr "" +msgstr "Yazım Hataları" msgctxt "DebugDialog" msgid "Exceptions" -msgstr "" +msgstr "İstisnalar" msgctxt "GeneralPage" msgid "Executables (*.exe)" @@ -2024,23 +2024,23 @@ msgstr "" msgctxt "MainWindow" msgid "Debug output" -msgstr "" +msgstr "Hata ayıklama çıktısı" msgctxt "MainWindow" msgid "Panic!" -msgstr "" +msgstr "Panik!" msgctxt "MainWindow" msgid "Reattach tabs" -msgstr "" +msgstr "Sekmeleri tekrar birleştir" msgctxt "MainWindow" msgid "Plugins" -msgstr "" +msgstr "Eklentiler" msgctxt "MainWindow" msgid "Your clock is wrong" -msgstr "" +msgstr "Saatiniz hatalı" msgctxt "MainWindow" msgid "" @@ -2083,11 +2083,11 @@ msgstr "Hata(%1)" msgctxt "MainWindow" msgid "(probably Telnet)" -msgstr "" +msgstr "(muhtemelen Telnet)" msgctxt "MainWindow" msgid "(probably an email client)" -msgstr "" +msgstr "(Muhtemelen bir e-posta istemcisi)" msgctxt "MainWindow" msgid "" @@ -2684,39 +2684,39 @@ msgstr "" msgctxt "PluginWrapper" msgid "%1: Processing..." -msgstr "" +msgstr "%1: İşleniyor..." msgctxt "PluginWrapper" msgid "" "%4: ERROR: Line: %1 - Column: %2\n" "%3" -msgstr "" +msgstr "%4: HATA: Satır %1 - Sütun: %2\n%3" msgctxt "PluginWrapper" msgid "%1: Error opening file %2" -msgstr "" +msgstr "%1: Dosya açma hatası %2" msgctxt "PluginWrapper" msgid "%2: ERROR: Cannot open %1" -msgstr "" +msgstr "%2: HATA: Açılamadı %1" msgctxt "PluginWrapper" msgid "%2: ERROR: Parsing %1" -msgstr "" +msgstr "%2: HATA: Ayrıştırma %1" msgctxt "PluginWrapper" msgid "" "Line: %1 - Column: %2\n" "Message: %3" -msgstr "" +msgstr "Satır: %1 - Sütun: %2\nMessage: %3" msgctxt "PluginWrapper" msgid "%1: Starting..." -msgstr "" +msgstr "%1: Başlatılıyor..." msgctxt "PluginWrapper" msgid "%1: Stoping..." -msgstr "" +msgstr "%1: Durduruluyor..." msgctxt "PluginWrapper" msgid "%1: WARNING: doesn't have a GUI, and buildGUI() was called" @@ -2726,19 +2726,19 @@ msgctxt "PluginWrapper" msgid "" "%2:\n" "*** Exception in line %1" -msgstr "" +msgstr "%2:\n*** %1 Satırında ayrıksı durum" msgctxt "PluginWrapper" msgid "*** Backtrace:" -msgstr "" +msgstr "*** Geri iz:" msgctxt "PluginWrapper" msgid "(untitled)" -msgstr "" +msgstr "(başlıksız)" msgctxt "PluginWrapper" msgid "Error: buildGUI() failed for plugin %1" -msgstr "" +msgstr "Hata: buildGUI() %1 eklentisi için başarısız oldu" msgctxt "Policy" msgid "accept" @@ -2750,7 +2750,7 @@ msgstr "Reddet" msgctxt "QDialogButtonBox" msgid "OK" -msgstr "" +msgstr "TAMAM" msgctxt "QObject" msgid "There were some settings that Vidalia wasn't able to apply together" @@ -3210,15 +3210,15 @@ msgstr "Geçidinizle ilgili bir problem olduğundan ulaşılabileceğiniz bir ep msgctxt "ServerPage" msgid "day" -msgstr "" +msgstr "gün" msgctxt "ServerPage" msgid "week" -msgstr "" +msgstr "hafta" msgctxt "ServerPage" msgid "month" -msgstr "" +msgstr "ay" msgctxt "ServerPage" msgid "Enable accounting" @@ -3226,7 +3226,7 @@ msgstr "" msgctxt "ServerPage" msgid "h:mm" -msgstr "" +msgstr "s:dd" msgctxt "ServerPage" msgid "at" @@ -3242,19 +3242,19 @@ msgstr "" msgctxt "ServerPage" msgid "KB" -msgstr "" +msgstr "KB" msgctxt "ServerPage" msgid "MB" -msgstr "" +msgstr "MB" msgctxt "ServerPage" msgid "GB" -msgstr "" +msgstr "GB" msgctxt "ServerPage" msgid "TB" -msgstr "" +msgstr "TB" msgctxt "ServerPage" msgid "Push no more than" @@ -3262,7 +3262,7 @@ msgstr "" msgctxt "ServerPage" msgid "time" -msgstr "" +msgstr "zaman" msgctxt "StatusEventWidget" msgid "Copy to Clipboard" @@ -3305,7 +3305,7 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Your Tor Software is Out-of-date" -msgstr "" +msgstr "Tor Yazılımı Eskimiş" msgctxt "StatusEventWidget" msgid "Connected to the Tor Network" @@ -3499,7 +3499,7 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Your Relay is Online" -msgstr "" +msgstr "Röleniz Çevrimiçi" msgctxt "StatusEventWidget" msgid ""

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 26 Jul '12

26 Jul '12

commit 6348ecfb6639fddf9f1fa9db3546536cf08c0058 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jul 26 12:45:11 2012 +0000 Update translations for vidalia_alpha --- tr/vidalia_tr.po | 27 ++++++++++++++------------- 1 files changed, 14 insertions(+), 13 deletions(-) diff --git a/tr/vidalia_tr.po b/tr/vidalia_tr.po index 77335a9..bb0554d 100644 --- a/tr/vidalia_tr.po +++ b/tr/vidalia_tr.po @@ -1,5 +1,6 @@ # # Translators: +# Aşkın Yollu <askin(a)askin.ws>, 2012. # <ergungorler(a)gmail.com>, 2012. # runasand <runa.sandvik(a)gmail.com>, 2011. msgid "" @@ -7,8 +8,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2012-07-24 13:57+0000\n" -"Last-Translator: erg26 <ergungorler(a)gmail.com>\n" +"PO-Revision-Date: 2012-07-26 12:44+0000\n" +"Last-Translator: Aşkın Yollu <askin(a)askin.ws>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -3308,7 +3309,7 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Connected to the Tor Network" -msgstr "" +msgstr "Tor Ağına Bağlanıldı" msgctxt "StatusEventWidget" msgid "" @@ -3318,7 +3319,7 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Tor Software Error" -msgstr "" +msgstr "Tor Yazılım Hatası" msgctxt "StatusEventWidget" msgid "" @@ -3344,7 +3345,7 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Your Computer's Clock is Potentially Incorrect" -msgstr "" +msgstr "Bilgisayarınızın Saati Muhtemelen Hatalı" msgctxt "StatusEventWidget" msgid "" @@ -3363,7 +3364,7 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Potentially Dangerous Connection!" -msgstr "" +msgstr "Muhtemelen Tehlikeli Bağlantı!" msgctxt "StatusEventWidget" msgid "" @@ -3375,7 +3376,7 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Unknown SOCKS Protocol" -msgstr "" +msgstr "Bilinmeyen SOCKS Protokolü" msgctxt "StatusEventWidget" msgid "" @@ -3397,7 +3398,7 @@ msgstr "" msgctxt "StatusEventWidget" msgid "External IP Address Changed" -msgstr "" +msgstr "Dış IP Adresi Değişti" msgctxt "StatusEventWidget" msgid "" @@ -3408,7 +3409,7 @@ msgstr "" msgctxt "StatusEventWidget" msgid "DNS Hijacking Detected" -msgstr "" +msgstr "DNS Hijacking Tespit Edildi" msgctxt "StatusEventWidget" msgid "" @@ -3426,7 +3427,7 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Checking Server Port Reachability" -msgstr "" +msgstr "Sunucu Port Erişilebilirliği Kontrol Ediliyor" msgctxt "StatusEventWidget" msgid "" @@ -3437,15 +3438,15 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Server Port Reachability Test Successful!" -msgstr "" +msgstr "Sunucu Port Erişilebilirliği Testi Başarılı" msgctxt "StatusEventWidget" msgid "Your relay's server port is reachable from the Tor network!" -msgstr "" +msgstr "Rölenizin sunucu portu Tor ağı tarafından erişilebilir durumda!" msgctxt "StatusEventWidget" msgid "Server Port Reachability Test Failed" -msgstr "" +msgstr "Sunucu Port Erişilebilirliği Testi Başarısız" msgctxt "StatusEventWidget" msgid ""

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 26 Jul '12

26 Jul '12

commit 936d810ae31c235994ecd0d5c54defdd51a7254a Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jul 26 12:45:03 2012 +0000 Update translations for gettor --- tr/gettor.po | 454 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 454 insertions(+), 0 deletions(-) diff --git a/tr/gettor.po b/tr/gettor.po new file mode 100644 index 0000000..6a9a3e6 --- /dev/null +++ b/tr/gettor.po @@ -0,0 +1,454 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Jacob Appelbaum <jacob(a)appelbaum.net>, 2009. +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"POT-Creation-Date: 2011-11-13 22:01+0100\n" +"PO-Revision-Date: 2010-11-30 05:01+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: tr\n" +"Plural-Forms: nplurals=1; plural=0\n" + +#: lib/gettor/i18n.py:27 +msgid "Hello, This is the \"GetTor\" robot." +msgstr "" + +#: lib/gettor/i18n.py:29 +msgid "Thank you for your request." +msgstr "" + +#: lib/gettor/i18n.py:31 +msgid "" +"Unfortunately, we won't answer you at this address. You should make\n" +"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n" +"one of those." +msgstr "" + +#: lib/gettor/i18n.py:35 +msgid "" +"We only process requests from email services that support \"DKIM\",\n" +"which is an email feature that lets us verify that the address in the\n" +"\"From\" line is actually the one who sent the mail." +msgstr "" + +#: lib/gettor/i18n.py:39 +msgid "" +"(We apologize if you didn't ask for this mail. Since your email is from\n" +"a service that doesn't use DKIM, we're sending a short explanation,\n" +"and then we'll ignore this email address for the next day or so.)" +msgstr "" + +#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130 +msgid "" +"If you have any questions or it doesn't work, you can contact a\n" +"human at this support email address: help(a)rt.torproject.org" +msgstr "" + +#: lib/gettor/i18n.py:46 +msgid "" +"I will mail you a Tor package, if you tell me which one you want.\n" +"Please select one of the following package names:\n" +"\n" +" windows\n" +" macos-i386\n" +" macos-ppc\n" +" linux-i386\n" +" linux-x86_64\n" +" source" +msgstr "" + +#: lib/gettor/i18n.py:56 +msgid "" +"Please reply to this mail, and tell me a single package name anywhere \n" +"in the body of your email." +msgstr "" + +#: lib/gettor/i18n.py:59 +msgid "" +"OBTAINING LOCALIZED VERSIONS OF TOR\n" +"===================================" +msgstr "" + +#: lib/gettor/i18n.py:62 +msgid "" +"To get a version of Tor translated into your language, specify the\n" +"language you want in the address you send the mail to:\n" +"\n" +" gettor+fa(a)torproject.org" +msgstr "" + +#: lib/gettor/i18n.py:67 +msgid "" +"This example will give you the requested package in a localized\n" +"version for Farsi (Persian). Check below for a list of supported language\n" +"codes. " +msgstr "" + +#: lib/gettor/i18n.py:71 +msgid " List of supported locales:" +msgstr "" + +#: lib/gettor/i18n.py:73 +msgid "Here is a list of all available languages:" +msgstr "" + +#: lib/gettor/i18n.py:75 +msgid "" +" gettor+ar(a)torproject.org: Arabic\n" +" gettor+de(a)torproject.org: German\n" +" gettor+en(a)torproject.org: English\n" +" gettor+es(a)torproject.org: Spanish\n" +" gettor+fa(a)torproject.org: Farsi (Iran)\n" +" gettor+fr(a)torproject.org: French\n" +" gettor+it(a)torproject.org: Italian\n" +" gettor+nl(a)torproject.org: Dutch\n" +" gettor+pl(a)torproject.org: Polish\n" +" gettor+ru(a)torproject.org: Russian\n" +" gettor+zh(a)torproject.org: Chinese" +msgstr "" + +#: lib/gettor/i18n.py:87 +msgid "If you select no language, you will receive the English version." +msgstr "" + +#: lib/gettor/i18n.py:89 +msgid "" +"SMALLER SIZED PACKAGES\n" +"======================" +msgstr "" + +#: lib/gettor/i18n.py:92 +msgid "" +"If your bandwith is low or your provider doesn't allow you to\n" +"receive large attachments in your email, GetTor can send you several\n" +"small packages instead of one big one." +msgstr "" + +#: lib/gettor/i18n.py:96 +msgid "" +"Simply include the keyword 'split' in a new line on its own (this part\n" +"is important!) like so: \n" +" \n" +" windows\n" +" split" +msgstr "" + +#: lib/gettor/i18n.py:102 +msgid "" +"Sending this text in an email to GetTor will cause it to send you \n" +"the Tor Browser Bundle in a number of 1,4MB attachments." +msgstr "" + +#: lib/gettor/i18n.py:105 +msgid "" +"After having received all parts, you need to re-assemble them to \n" +"one package again. This is done as follows:" +msgstr "" + +#: lib/gettor/i18n.py:108 +msgid "1.) Save all received attachments into one folder on your disk." +msgstr "" + +#: lib/gettor/i18n.py:110 +msgid "" +"2.) Unzip all files ending in \".z\". If you saved all attachments to\n" +"a fresh folder before, simply unzip all files in that folder. If you don't\n" +"know how to unzip the .z files, please see the UNPACKING THE FILES section." +msgstr "" + +#: lib/gettor/i18n.py:114 +msgid "" +"3.) Verify all files as described in the mail you received with \n" +"each package. (gpg --verify)" +msgstr "" + +#: lib/gettor/i18n.py:117 +msgid "" +"4.) Now unpack the multi-volume archive into one file by double-\n" +"clicking the file ending in \"..split.part01.exe\". This should start the \n" +"process automatically." +msgstr "" + +#: lib/gettor/i18n.py:121 +msgid "" +"5.) After unpacking is finished, you should find a newly created \n" +"\".exe\" file in your destination folder. Simply doubleclick\n" +"that and Tor Browser Bundle should start within a few seconds." +msgstr "" + +#: lib/gettor/i18n.py:125 +msgid "6.) That's it. You're done. Thanks for using Tor and have fun!" +msgstr "" + +#: lib/gettor/i18n.py:127 +msgid "" +"SUPPORT\n" +"=======" +msgstr "" + +#: lib/gettor/i18n.py:133 +msgid "" +"Here's your requested software as a zip file. Please unzip the\n" +"package and verify the signature." +msgstr "" + +#: lib/gettor/i18n.py:136 +msgid "" +"VERIFY SIGNATURE\n" +"================\n" +"If your computer has GnuPG installed, use the gpg commandline \n" +"tool as follows after unpacking the zip file:\n" +"\n" +" gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US.exe" +msgstr "" + +#: lib/gettor/i18n.py:143 +msgid "" +"The output should look somewhat like this:\n" +"\n" +" gpg: Good signature from 'Erinn Clark <...>'" +msgstr "" + +#: lib/gettor/i18n.py:147 +msgid "" +"If you're not familiar with commandline tools, try looking for\n" +"a graphical user interface for GnuPG on this website:\n" +"\n" +" http://www.gnupg.org/related_software/frontends.html" +msgstr "" + +#: lib/gettor/i18n.py:152 +msgid "" +"BLOCKED ACCESS / CENSORSHIP\n" +"===========================" +msgstr "" + +#: lib/gettor/i18n.py:155 +msgid "" +"If your Internet connection blocks access to the Tor network, you\n" +"may need a bridge relay. Bridge relays (or \"bridges\" for short)\n" +"are Tor relays that aren't listed in the main directory. Since there\n" +"is no complete public list of them, even if your ISP is filtering\n" +"connections to all the known Tor relays, they probably won't be able\n" +"to block all the bridges." +msgstr "" + +#: lib/gettor/i18n.py:162 +msgid "" +"You can acquire a bridge by sending an email that contains \"get bridges\"\n" +"in the body of the email to the following email address:\n" +"\n" +" bridges(a)torproject.org" +msgstr "" + +#: lib/gettor/i18n.py:167 +msgid "" +"It is also possible to fetch bridges with a web browser at the following\n" +"url: https://bridges.torproject.org/" +msgstr "" + +#: lib/gettor/i18n.py:170 +msgid "" +"IMPORTANT NOTE:\n" +"Since this is part of a split-file request, you need to wait for\n" +"all split files to be received by you before you can save them all\n" +"into the same directory and unpack them by double-clicking the\n" +"first file." +msgstr "" + +#: lib/gettor/i18n.py:176 +msgid "" +"Packages might arrive out of order! Please make sure you received\n" +"all packages before you attempt to unpack them!" +msgstr "" + +#: lib/gettor/i18n.py:179 +#, python-format +msgid "" +"It was successfully understood. Your request is currently being processed.\n" +"Your package (%s) should arrive within the next ten minutes." +msgstr "" + +#: lib/gettor/i18n.py:182 +msgid "" +"If it doesn't arrive, the package might be too big for your mail provider.\n" +"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account." +msgstr "" + +#: lib/gettor/i18n.py:185 +msgid "" +"Unfortunately we are currently experiencing problems and we can't fulfill\n" +"your request right now. Please be patient as we try to resolve this issue." +msgstr "" + +#: lib/gettor/i18n.py:188 +msgid "" +"Unfortunately there is no split package available for the package you\n" +"requested. Please send us another package name or request the same package \n" +"again, but remove the 'split' keyword. In that case we'll send you the whole \n" +"package. Make sure this is what you want." +msgstr "" + +#: lib/gettor/i18n.py:193 +msgid "" +"UNPACKING THE FILES\n" +"===================" +msgstr "" + +#: lib/gettor/i18n.py:196 +msgid "" +"The easiest way to unpack the files you received is to install 7-Zip,\n" +"a free file compression/uncompression tool. If it isn't installed on\n" +"your computer yet, you can download it here:\n" +"\n" +" http://www.7-zip.org/" +msgstr "" + +#: lib/gettor/i18n.py:202 +msgid "" +"When 7-Zip is installed, you can open the .z archive you received from\n" +"us by double-clicking on it." +msgstr "" + +#: lib/gettor/i18n.py:205 +msgid "" +"An alternative way to get the .z files extraced is to rename them to\n" +".zip. For example, if you recevied a file called \"windows.z\", rename it to \n" +"\"windows.zip\". You should then be able to extract the archive with common \n" +"file archiver programs that probably are already installed on your computer." +msgstr "" + +#: lib/gettor/i18n.py:210 +msgid "" +"Please reply to this mail, and tell me a single package name anywhere\n" +"in your reply. Here's a short explanation of what these packages are:" +msgstr "" + +#: lib/gettor/i18n.py:213 +msgid "" +"windows:\n" +"The Tor Browser Bundle package for Windows operating systems. If you're \n" +"running some version of Windows, like Windows XP, Windows Vista or \n" +"Windows 7, this is the package you should get." +msgstr "" + +#: lib/gettor/i18n.py:218 +msgid "" +"macos-i386:\n" +"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n" +"general, newer Mac hardware will require you to use this package." +msgstr "" + +#: lib/gettor/i18n.py:222 +msgid "" +"macos-ppc:\n" +"This is an older installer (the \"Vidalia bundle\") for older Macs running\n" +"OS X on PowerPC CPUs. Note that this package will be deprecated soon." +msgstr "" + +#: lib/gettor/i18n.py:226 +msgid "" +"linux-i386:\n" +"The Tor Browser Bundle package for Linux, 32bit versions." +msgstr "" + +#: lib/gettor/i18n.py:229 +msgid "" +"Note that this package is rather large and needs your email provider to \n" +"allow for attachments of about 30MB in size." +msgstr "" + +#: lib/gettor/i18n.py:232 +msgid "" +"linux-x86_64:\n" +"The Tor Browser Bundle package for Linux, 64bit versions." +msgstr "" + +#: lib/gettor/i18n.py:235 +msgid "" +"source:\n" +"The Tor source code, for experts. Most users do not want this package." +msgstr "" + +#: lib/gettor/i18n.py:238 +msgid "" +"FREQUENTLY ASKED QUESTIONS\n" +"==========================" +msgstr "" + +#: lib/gettor/i18n.py:241 +msgid "What is Tor?" +msgstr "" + +#: lib/gettor/i18n.py:243 +msgid "The name \"Tor\" can refer to several different components." +msgstr "" + +#: lib/gettor/i18n.py:245 +msgid "" +"The Tor software is a program you can run on your computer that helps \n" +"keep you safe on the Internet. Tor protects you by bouncing your \n" +"communications around a distributed network of relays run by volunteers \n" +"all around the world: it prevents somebody watching your Internet connection \n" +"from learning what sites you visit, and it prevents the sites you visit from \n" +"learning your physical location. This set of volunteer relays is called the \n" +"Tor network. You can read more about how Tor works here:\n" +"\n" +" https://www.torproject.org/about/overview.html.en" +msgstr "" + +#: lib/gettor/i18n.py:255 +msgid "What is the Tor Browser Bundle?" +msgstr "" + +#: lib/gettor/i18n.py:257 +msgid "" +"The Browser Bundle (TBB) is the package we recommend to most users. \n" +"The bundle comes with everything you need to safely browse the Internet.\n" +"Just extract it and run." +msgstr "" + +#: lib/gettor/i18n.py:261 +msgid "What package should I request?" +msgstr "" + +#: lib/gettor/i18n.py:263 +msgid "" +"This depends on the operating system you use. For instance, if your\n" +"operating system is Microsoft Windows, you should request \"windows\". Here\n" +"is a short explanation of all packages to request and what operating \n" +"systems there are suitable for:" +msgstr "" + +#: lib/gettor/i18n.py:268 +msgid "How do I extract the file(s) you sent me?" +msgstr "" + +#: lib/gettor/i18n.py:270 +msgid "QUESTION:" +msgstr "" + +#: lib/gettor/i18n.py:272 +msgid "ANSWER:" +msgstr "" + +#: lib/gettor/i18n.py:274 +#, python-format +msgid "" +"Sorry, but the package you requested (%s) is too large for your \n" +"provider to accept as an attachment. Try using another provider that allows \n" +"for larger email attachments. Or try one of the following mirrors:\n" +"\n" +" https://www.oignon.net/dist/torbrowser/\n" +" https://tor.beme-it.de/dist/torbrowser/\n" +" https://www.torservers.net/mirrors/torproject.org/dist/torbrowser/" +msgstr ""

1 0

[metrics-tasks/master] Graph comparison between the current Tor network and an ideal Tor network.
by karsten＠torproject.org 26 Jul '12

26 Jul '12

commit 131f94f6a424301daa126a80aa4285343113b978 Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Jul 25 17:19:50 2012 +0300 Graph comparison between the current Tor network and an ideal Tor network. --- task-6232/plot-entropy.R | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/task-6232/plot-entropy.R b/task-6232/plot-entropy.R index 0ed4bac..abcd808 100644 --- a/task-6232/plot-entropy.R +++ b/task-6232/plot-entropy.R @@ -54,3 +54,27 @@ scale_y_continuous(name = "Entropy and maximum entropy\n", opts(legend.position = "none") ggsave("entropy.png", width = 8, height = 6, dpi = 100) + +g <- aggregate(list(all = d$all, max_all = d$max_all, exit = d$exit, + max_exit = d$max_exit, guard = d$guard, max_guard = d$max_guard, + country = d$country, max_country = d$max_country, as = d$as, + max_as = d$max_as), + by = list(date = as.Date(d$validafter, origin = "1970-01-01 00:00:00")), + FUN = median) +g <- rbind( + data.frame(date = g$date, entropy = 2^g$all, max = 2^g$max_all, + type = "All relays"), + data.frame(date = g$date, entropy = 2^g$exit, max = 2^g$max_exit, + type = "All exits"), + data.frame(date = g$date, entropy = 2^g$guard, max = 2^g$max_guard, + type = "All guards")) +g <- melt(g, c("date", "type")) +ggplot(g, aes(x = date, y = value, colour = variable)) + +geom_line() + +facet_wrap(~ type) + +scale_x_date(name = "\nDate") + +scale_y_continuous(name = "Number of relays and Number of fair relays\n", + limits = c(0, max(g$value))) + +opts(legend.position = "none") +ggsave("relays_fair.png", width = 8, height = 6, dpi = 100) +

1 0

[metrics-tasks/master] Tweak asn's #6232 graph a bit.
by karsten＠torproject.org 26 Jul '12

26 Jul '12

commit 1b4dbaea54d4e32ab89cc1d860ca54db2b7bf5d7 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Jul 26 11:32:46 2012 +0200 Tweak asn's #6232 graph a bit. --- task-6232/plot-entropy.R | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/task-6232/plot-entropy.R b/task-6232/plot-entropy.R index abcd808..1f41824 100644 --- a/task-6232/plot-entropy.R +++ b/task-6232/plot-entropy.R @@ -54,7 +54,6 @@ scale_y_continuous(name = "Entropy and maximum entropy\n", opts(legend.position = "none") ggsave("entropy.png", width = 8, height = 6, dpi = 100) - g <- aggregate(list(all = d$all, max_all = d$max_all, exit = d$exit, max_exit = d$max_exit, guard = d$guard, max_guard = d$max_guard, country = d$country, max_country = d$max_country, as = d$as, @@ -71,10 +70,9 @@ g <- rbind( g <- melt(g, c("date", "type")) ggplot(g, aes(x = date, y = value, colour = variable)) + geom_line() + -facet_wrap(~ type) + +facet_grid(type ~ ., scales = "free_y") + scale_x_date(name = "\nDate") + -scale_y_continuous(name = "Number of relays and Number of fair relays\n", - limits = c(0, max(g$value))) + +scale_y_continuous(name = "Number of relays and number of fair relays\n") + opts(legend.position = "none") -ggsave("relays_fair.png", width = 8, height = 6, dpi = 100) +ggsave("relays-fair.png", width = 8, height = 6, dpi = 100)

1 0

[metrics-tasks/master] Add exit probability based on advertised bw (#6443).
by karsten＠torproject.org 26 Jul '12

26 Jul '12

commit 23f0121a659c520de35865da61a6080e30fed04d Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Jul 25 20:23:11 2012 +0200 Add exit probability based on advertised bw (#6443). --- task-6443/cumulated-weights.R | 9 ++- task-6443/run.sh | 3 + .../src/CalculatePathSelectionProbabilities.java | 93 +++++++++++++------- 3 files changed, 71 insertions(+), 34 deletions(-) diff --git a/task-6443/cumulated-weights.R b/task-6443/cumulated-weights.R index c324acb..811564b 100755 --- a/task-6443/cumulated-weights.R +++ b/task-6443/cumulated-weights.R @@ -3,7 +3,9 @@ require(scales) require(reshape) cw <- read.csv("cumulated-weights.csv", stringsAsFactors = FALSE) -v <- sort(as.POSIXlt(unique(cw$validafter), tz = "UTC"), +v <- cw +v <- v[v$weight_type == "consensus weights", c(1, 3, 4)] +v <- sort(as.POSIXlt(unique(v$validafter), tz = "UTC"), decreasing = TRUE) now <- week <- month <- threemonths <- year <- v[1] week$mday <- week$mday - 7 @@ -32,6 +34,7 @@ opts(title = paste("Probability of selecting one of the top-x relays for", ggsave("exit-probability-cdf-a.png", width = 8, height = 5, dpi = 100) c <- cw +c <- c[c$weight_type == "consensus weights", c(1, 3, 4)] c <- c[c$top_relays %in% c(1, 2, 5, 10, 20, 50), ] c <- aggregate(list(total_exit_probability = c$total_exit_probability), by = list(date = as.Date(cut.Date(as.Date(c$validafter, @@ -48,7 +51,9 @@ opts(title = paste("Probability of selecting one of the top-x relays for", "the exit position\n"), legend.position = "bottom") ggsave("exit-probability-cdf-b.png", width = 8, height = 5, dpi = 100) -i <- read.csv("inverse-cumulated-weights.csv", stringsAsFactors = FALSE) +iw <- read.csv("inverse-cumulated-weights.csv", stringsAsFactors = FALSE) +i <- iw +i <- i[i$weight_type == "consensus weights", c(1, 3, 4)] i <- i[i$total_exit_probability %in% factor(c(0.3, 0.4, 0.5, 0.6, 0.7)), ] i <- aggregate(list(top_relays = i$top_relays), by = list(date = as.Date(cut.Date(as.Date(i$validafter, diff --git a/task-6443/run.sh b/task-6443/run.sh new file mode 100755 index 0000000..8ea016e --- /dev/null +++ b/task-6443/run.sh @@ -0,0 +1,3 @@ +#!/bin/bash +javac -d bin -cp lib/descriptor.jar src/CalculatePathSelectionProbabilities.java && java -cp bin:lib/descriptor.jar:lib/commons-codec-1.6.jar:lib/commons-compress-1.4.1.jar CalculatePathSelectionProbabilities + diff --git a/task-6443/src/CalculatePathSelectionProbabilities.java b/task-6443/src/CalculatePathSelectionProbabilities.java index 67bb200..f819d3e 100644 --- a/task-6443/src/CalculatePathSelectionProbabilities.java +++ b/task-6443/src/CalculatePathSelectionProbabilities.java @@ -4,7 +4,6 @@ import java.io.FileWriter; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; import java.util.HashMap; import java.util.Iterator; import java.util.List; @@ -24,8 +23,8 @@ import org.torproject.descriptor.RelayNetworkStatusConsensus; import org.torproject.descriptor.ServerDescriptor; /* - * Calculate five path-selection probabilities for relays based on - * consensus weights and advertised bandwidths: + * Calculate path-selection probabilities for relays based on consensus + * weights and advertised bandwidths: * * - advertised_bandwidth_fraction: Relative advertised bandwidth of * this relay compared to the total advertised bandwidth in the @@ -54,6 +53,10 @@ import org.torproject.descriptor.ServerDescriptor; * weights, relay flags, directory ports, and bandwidth weights in the * consensus. Path selection depends on more factors, so that this * probability can only be an approximation. + * + * - exit_probability_advbw: Probability of this relay to be selected for + * the exit position under the assumption that clients would use + * advertised bandwidth for path selection. */ public class CalculatePathSelectionProbabilities { public static void main(String[] args) throws Exception { @@ -99,14 +102,17 @@ public class CalculatePathSelectionProbabilities { bw = new BufferedWriter(new FileWriter("weights.csv")); bw.write("validafter,fingerprint,advertised_bandwidth_fraction," + "consensus_weight_fraction,guard_probability," - + "middle_probability,exit_probability\n"); + + "middle_probability,exit_probability," + + "exit_probability_advbw\n"); } BufferedWriter bw2 = new BufferedWriter(new FileWriter( "cumulated-weights.csv")); - bw2.write("validafter,top_relays,total_exit_probability\n"); + bw2.write("validafter,weight_type,top_relays," + + "total_exit_probability\n"); BufferedWriter bw3 = new BufferedWriter(new FileWriter( "inverse-cumulated-weights.csv")); - bw3.write("validafter,total_exit_probability,top_relays\n"); + bw3.write("validafter,weight_type,total_exit_probability," + + "top_relays\n"); while (descriptorFiles.hasNext()) { DescriptorFile descriptorFile = descriptorFiles.next(); for (Descriptor descriptor : descriptorFile.getDescriptors()) { @@ -155,12 +161,14 @@ public class CalculatePathSelectionProbabilities { consensusWeights = new TreeMap<String, Double>(), guardWeights = new TreeMap<String, Double>(), middleWeights = new TreeMap<String, Double>(), - exitWeights = new TreeMap<String, Double>(); + exitWeights = new TreeMap<String, Double>(), + exitWeightsAdvBw = new TreeMap<String, Double>(); double totalAdvertisedBandwidth = 0.0; double totalConsensusWeight = 0.0; double totalGuardWeight = 0.0; double totalMiddleWeight = 0.0; double totalExitWeight = 0.0; + double totalExitWeightAdvBw = 0.0; for (NetworkStatusEntry relay : consensus.getStatusEntries().values()) { String fingerprint = relay.getFingerprint(); @@ -183,6 +191,7 @@ public class CalculatePathSelectionProbabilities { double guardWeight = (double) relay.getBandwidth(); double middleWeight = (double) relay.getBandwidth(); double exitWeight = (double) relay.getBandwidth(); + double exitWeightAdvBw = advertisedBandwidth; /* Case 1: relay has both Guard and Exit flag and could be * selected for either guard, middle, or exit position. Apply @@ -191,6 +200,7 @@ public class CalculatePathSelectionProbabilities { guardWeight *= wgd; middleWeight *= wmd; exitWeight *= wed; + exitWeightAdvBw *= wed; /* Case 2: relay only has the Guard flag, not the Exit flag. * While, in theory, the relay could also be picked for the exit @@ -203,6 +213,7 @@ public class CalculatePathSelectionProbabilities { guardWeight *= wgg; middleWeight *= wmg; exitWeight = 0.0; + exitWeightAdvBw = 0.0; /* Case 3: relay only has the Exit flag, not the Guard flag. It * cannot be picked for the guard position, so set Wge to 0. @@ -211,6 +222,7 @@ public class CalculatePathSelectionProbabilities { guardWeight = 0.0; middleWeight *= wme; exitWeight *= wee; + exitWeightAdvBw *= wee; /* Case 4: relay has neither Exit nor Guard flag. Similar to * case 2, this relay *could* have a weird exit policy and be @@ -221,6 +233,7 @@ public class CalculatePathSelectionProbabilities { guardWeight = 0.0; middleWeight *= wmm; exitWeight = 0.0; + exitWeightAdvBw = 0.0; } /* Store calculated weights and update totals. */ @@ -229,11 +242,13 @@ public class CalculatePathSelectionProbabilities { guardWeights.put(fingerprint, guardWeight); middleWeights.put(fingerprint, middleWeight); exitWeights.put(fingerprint, exitWeight); + exitWeightsAdvBw.put(fingerprint, exitWeightAdvBw); totalAdvertisedBandwidth += advertisedBandwidth; totalConsensusWeight += consensusWeight; totalGuardWeight += guardWeight; totalMiddleWeight += middleWeight; totalExitWeight += exitWeight; + totalExitWeightAdvBw += exitWeightAdvBw; } /* Write calculated path-selection probabilities to the output @@ -242,7 +257,8 @@ public class CalculatePathSelectionProbabilities { for (NetworkStatusEntry relay : consensus.getStatusEntries().values()) { String fingerprint = relay.getFingerprint(); - bw.write(String.format("%s,%s,%.9f,%.9f,%.9f,%.9f,%.9f%n", + bw.write(String.format("%s,%s,%.9f,%.9f,%.9f,%.9f,%.9f," + + "%.9f%n", validAfter, fingerprint, advertisedBandwidths.get(fingerprint) @@ -250,35 +266,48 @@ public class CalculatePathSelectionProbabilities { consensusWeights.get(fingerprint) / totalConsensusWeight, guardWeights.get(fingerprint) / totalGuardWeight, middleWeights.get(fingerprint) / totalMiddleWeight, - exitWeights.get(fingerprint) / totalExitWeight)); + exitWeights.get(fingerprint) / totalExitWeight, + exitWeightsAdvBw.get(fingerprint) + / totalExitWeightAdvBw)); } } /* Write exit probabilities for top-x relays to the second and * third output files. */ - List<Double> sortedExitWeights = new ArrayList<Double>( - exitWeights.values()); - Collections.sort(sortedExitWeights); - Collections.reverse(sortedExitWeights); - int topRelays = 0; - double totalExitProbability = 0.0; - List<Double> inverseProbabilities = new ArrayList<Double>( - Arrays.asList(new Double[] { 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, - 0.7, 0.8, 0.9 })); - for (double exitWeight : sortedExitWeights) { - topRelays++; - totalExitProbability += exitWeight / totalExitWeight; - if (topRelays <= 50) { - bw2.write(String.format("%s,%d,%.9f%n", validAfter, topRelays, - totalExitProbability)); - } - while (!inverseProbabilities.isEmpty() && - totalExitProbability > inverseProbabilities.get(0)) { - bw3.write(String.format("%s,%.1f,%d%n", validAfter, - inverseProbabilities.remove(0), topRelays)); - } - if (inverseProbabilities.isEmpty() && topRelays > 50) { - break; + String[] weightTypes = new String[] { "consensus weights", + "advertised bandwidth" }; + Double[][] sortedExitWeightsArray = new Double[][] { + exitWeights.values().toArray(new Double[exitWeights.size()]), + exitWeightsAdvBw.values().toArray( + new Double[exitWeightsAdvBw.size()]) }; + double[] totalWeights = new double[] { totalExitWeight, + totalExitWeightAdvBw }; + for (int i = 0; i < weightTypes.length; i++) { + String weightType = weightTypes[i]; + Double[] sortedExitWeights = sortedExitWeightsArray[i]; + double totalWeight = totalWeights[i]; + Arrays.sort(sortedExitWeights); + int topRelays = 0; + double totalExitProbability = 0.0; + List<Double> inverseProbabilities = new ArrayList<Double>( + Arrays.asList(new Double[] { 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, + 0.7, 0.8, 0.9 })); + for (int j = sortedExitWeights.length - 1; j >= 0; j--) { + double exitWeight = sortedExitWeights[j]; + topRelays++; + totalExitProbability += exitWeight / totalWeight; + if (topRelays <= 50) { + bw2.write(String.format("%s,%s,%d,%.9f%n", validAfter, + weightType, topRelays, totalExitProbability)); + } + while (!inverseProbabilities.isEmpty() && + totalExitProbability > inverseProbabilities.get(0)) { + bw3.write(String.format("%s,%s,%.1f,%d%n", validAfter, + weightType, inverseProbabilities.remove(0), topRelays)); + } + if (inverseProbabilities.isEmpty() && topRelays > 50) { + break; + } } } }

1 0