June 2014 - tor-commits - lists.torproject.org

[stem/master] Shortening setup.py description
by atagar＠torproject.org 01 Jun '14

01 Jun '14

commit 90c291dca7f48edf1dc4640d5add3ebf0ab1f775 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jun 1 12:33:17 2014 -0700 Shortening setup.py description Minor change to our description. TorCtl has been deprecated long enough that there's probably little point in mentioning it. --- setup.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/setup.py b/setup.py index 200f1d8..bc09795 100644 --- a/setup.py +++ b/setup.py @@ -13,6 +13,10 @@ from distutils.core import setup STAT_LINE = re.compile(r"^__(.+)__ = '(.+)'$") +DESCRIPTION = """\ +Stem is a Python controller library that allows applications to interact with +Tor <https://www.torproject.org/>.""" + def get_module_info(): # reads the basic __stat__ strings from our module's init @@ -29,18 +33,13 @@ def get_module_info(): return result -module_info = get_module_info() - -DESCRIPTION = """\ -Stem is a python controller library for Tor <https://www.torproject.org/>. -Like its predecessor, TorCtl, it uses Tor's control protocol to help -developers program against the Tor process.""" - try: from distutils.command.build_py import build_py_2to3 as build_py except ImportError: from distutils.command.build_py import build_py +module_info = get_module_info() + setup( name = 'stem', version = module_info['version'],

1 0

[onionoo/master] Use a single DateFormat per thread and format.
by karsten＠torproject.org 01 Jun '14

01 Jun '14

commit 67100bc1ee3d582404def99fc7eb8cac23debc7c Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed May 28 10:08:05 2014 +0200 Use a single DateFormat per thread and format. DateFormat is not thread-safe, and creating a new instance every time we need one only wastes CPU time. Make sure that there's a single instance per thread and format that the thread can use whenever it wants. --- src/org/torproject/onionoo/DateTimeHelper.java | 35 ++++++++++++++++++------ 1 file changed, 26 insertions(+), 9 deletions(-) diff --git a/src/org/torproject/onionoo/DateTimeHelper.java b/src/org/torproject/onionoo/DateTimeHelper.java index 4158894..41ac70b 100644 --- a/src/org/torproject/onionoo/DateTimeHelper.java +++ b/src/org/torproject/onionoo/DateTimeHelper.java @@ -5,6 +5,8 @@ package org.torproject.onionoo; import java.text.DateFormat; import java.text.ParseException; import java.text.SimpleDateFormat; +import java.util.HashMap; +import java.util.Map; import java.util.TimeZone; public class DateTimeHelper { @@ -40,16 +42,31 @@ public class DateTimeHelper { public static final String DATEHOUR_NOSPACE_FORMAT = "yyyy-MM-dd-HH"; + private static ThreadLocal<Map<String, DateFormat>> dateFormats = + new ThreadLocal<Map<String, DateFormat>> () { + public Map<String, DateFormat> get() { + return super.get(); + } + protected Map<String, DateFormat> initialValue() { + return new HashMap<String, DateFormat>(); + } + public void remove() { + super.remove(); + } + public void set(Map<String, DateFormat> value) { + super.set(value); + } + }; + private static DateFormat getDateFormat(String format) { - /* TODO We're creating a new SimpleDateFormat instance here, because - * we can't share a single instance per date format between multiple - * threads. A better solution would be to share a single instance per - * date format and thread, or to share an instance of a thread-safe - * alternative per date format. */ - DateFormat dateFormat = new SimpleDateFormat(format); - dateFormat.setLenient(false); - dateFormat.setTimeZone(TimeZone.getTimeZone("UTC")); - return dateFormat; + Map<String, DateFormat> threadDateFormats = dateFormats.get(); + if (!threadDateFormats.containsKey(format)) { + DateFormat dateFormat = new SimpleDateFormat(format); + dateFormat.setLenient(false); + dateFormat.setTimeZone(TimeZone.getTimeZone("UTC")); + threadDateFormats.put(format, dateFormat); + } + return threadDateFormats.get(format); } public static String format(long millis, String format) {

1 0

[onionoo/master] Switch to parsing concatenated descriptors from rsync recent.
by karsten＠torproject.org 01 Jun '14

01 Jun '14

commit 2d1c226bfcd160ff91a98b36cbe2ac0cb3a83a79 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sun May 25 08:34:33 2014 +0200 Switch to parsing concatenated descriptors from rsync recent. --- bin/update.sh | 2 +- build.xml | 2 +- deps/metrics-lib | 2 +- src/org/torproject/onionoo/DescriptorSource.java | 17 +++++++++++++---- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/bin/update.sh b/bin/update.sh index 0d48e59..9f1424f 100755 --- a/bin/update.sh +++ b/bin/update.sh @@ -1,4 +1,4 @@ #!/bin/bash -rsync -az --delete metrics.torproject.org::'metrics-recent/relay-descriptors/consensuses/ metrics-recent/relay-descriptors/server-descriptors/ metrics-recent/relay-descriptors/extra-infos/ metrics-recent/bridge-descriptors/statuses/ metrics-recent/bridge-descriptors/server-descriptors/ metrics-recent/bridge-descriptors/extra-infos/ metrics-recent/bridge-pool-assignments/ metrics-recent/exit-lists' in +rsync -az --delete --exclude 'relay-descriptors/votes' --exclude 'relay-descriptors/microdescs' --exclude 'relay-descriptors/server-descriptors' --exclude 'relay-descriptors/extra-infos' --exclude 'bridge-descriptors/server-descriptors' --exclude 'bridge-descriptors/extra-infos' --exclude 'torperf' metrics.torproject.org::metrics-recent in ant run >> log diff --git a/build.xml b/build.xml index e772da4..500204d 100644 --- a/build.xml +++ b/build.xml @@ -92,7 +92,7 @@ </target> <target name="run" depends="compile"> <java fork="true" - maxmemory="2048m" + maxmemory="4g" classname="org.torproject.onionoo.Main"> <classpath refid="classpath"/> </java> diff --git a/deps/metrics-lib b/deps/metrics-lib index 3e60ccd..a472d7f 160000 --- a/deps/metrics-lib +++ b/deps/metrics-lib @@ -1 +1 @@ -Subproject commit 3e60ccdaaba598cabb7281d45f9a415299b8e3e3 +Subproject commit a472d7f3425feec9b9bed552b05af33dab20fee1 diff --git a/src/org/torproject/onionoo/DescriptorSource.java b/src/org/torproject/onionoo/DescriptorSource.java index f4ff2fc..0692854 100644 --- a/src/org/torproject/onionoo/DescriptorSource.java +++ b/src/org/torproject/onionoo/DescriptorSource.java @@ -106,24 +106,29 @@ class DescriptorQueue { public void addDirectory(DescriptorType descriptorType) { String directoryName = null; + int maxDescriptorFilesInQueue = -1; switch (descriptorType) { case RELAY_CONSENSUSES: directoryName = "relay-descriptors/consensuses"; break; case RELAY_SERVER_DESCRIPTORS: - directoryName = "relay-descriptors/server-descriptors"; + directoryName = "relay-descriptors/server-descriptors-cat"; + maxDescriptorFilesInQueue = 1; break; case RELAY_EXTRA_INFOS: - directoryName = "relay-descriptors/extra-infos"; + directoryName = "relay-descriptors/extra-infos-cat"; + maxDescriptorFilesInQueue = 1; break; case BRIDGE_STATUSES: directoryName = "bridge-descriptors/statuses"; break; case BRIDGE_SERVER_DESCRIPTORS: - directoryName = "bridge-descriptors/server-descriptors"; + directoryName = "bridge-descriptors/server-descriptors-cat"; + maxDescriptorFilesInQueue = 1; break; case BRIDGE_EXTRA_INFOS: - directoryName = "bridge-descriptors/extra-infos"; + directoryName = "bridge-descriptors/extra-infos-cat"; + maxDescriptorFilesInQueue = 1; break; case BRIDGE_POOL_ASSIGNMENTS: directoryName = "bridge-pool-assignments"; @@ -139,6 +144,10 @@ class DescriptorQueue { File directory = new File(this.inDir, directoryName); if (directory.exists() && directory.isDirectory()) { this.descriptorReader.addDirectory(directory); + if (maxDescriptorFilesInQueue >= 1) { + this.descriptorReader.setMaxDescriptorFilesInQueue( + maxDescriptorFilesInQueue); + } } else { System.err.println("Directory " + directory.getAbsolutePath() + " either does not exist or is not a directory. Not adding "

1 0

[onionoo/master] Avoid storing full consensuses in memory.
by karsten＠torproject.org 01 Jun '14

01 Jun '14

commit ebff7354229b8b71a8a74aa6276de23fe09a4e99 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed May 28 14:36:50 2014 +0200 Avoid storing full consensuses in memory. We stored full consensuses in memory, so that we could compute weights when all descriptors have been parsed. Obviously, this does not scale with more than a few days of consensuses. The new approach is to parse server descriptors *before* consensuses and store advertised bandwidths in weights status files when doing so. Later, when we parse consensuses, we are sure that if there's a server descriptor for a relay, it'll be contained in the weights status file. --- src/org/torproject/onionoo/DescriptorSource.java | 10 +- .../torproject/onionoo/WeightsStatusUpdater.java | 117 +++++--------------- 2 files changed, 33 insertions(+), 94 deletions(-) diff --git a/src/org/torproject/onionoo/DescriptorSource.java b/src/org/torproject/onionoo/DescriptorSource.java index 0692854..be17fc4 100644 --- a/src/org/torproject/onionoo/DescriptorSource.java +++ b/src/org/torproject/onionoo/DescriptorSource.java @@ -328,22 +328,24 @@ public class DescriptorSource { } public void readDescriptors() { - this.readDescriptors(DescriptorType.RELAY_CONSENSUSES, - DescriptorHistory.RELAY_CONSENSUS_HISTORY, true); + /* Careful when changing the order of parsing descriptor types! The + * various status updaters may base assumptions on this order. */ this.readDescriptors(DescriptorType.RELAY_SERVER_DESCRIPTORS, DescriptorHistory.RELAY_SERVER_HISTORY, true); this.readDescriptors(DescriptorType.RELAY_EXTRA_INFOS, DescriptorHistory.RELAY_EXTRAINFO_HISTORY, true); this.readDescriptors(DescriptorType.EXIT_LISTS, DescriptorHistory.EXIT_LIST_HISTORY, true); - this.readDescriptors(DescriptorType.BRIDGE_STATUSES, - DescriptorHistory.BRIDGE_STATUS_HISTORY, false); + this.readDescriptors(DescriptorType.RELAY_CONSENSUSES, + DescriptorHistory.RELAY_CONSENSUS_HISTORY, true); this.readDescriptors(DescriptorType.BRIDGE_SERVER_DESCRIPTORS, DescriptorHistory.BRIDGE_SERVER_HISTORY, false); this.readDescriptors(DescriptorType.BRIDGE_EXTRA_INFOS, DescriptorHistory.BRIDGE_EXTRAINFO_HISTORY, false); this.readDescriptors(DescriptorType.BRIDGE_POOL_ASSIGNMENTS, DescriptorHistory.BRIDGE_POOLASSIGN_HISTORY, false); + this.readDescriptors(DescriptorType.BRIDGE_STATUSES, + DescriptorHistory.BRIDGE_STATUS_HISTORY, false); } private void readDescriptors(DescriptorType descriptorType, diff --git a/src/org/torproject/onionoo/WeightsStatusUpdater.java b/src/org/torproject/onionoo/WeightsStatusUpdater.java index d3ddff1..9b45f95 100644 --- a/src/org/torproject/onionoo/WeightsStatusUpdater.java +++ b/src/org/torproject/onionoo/WeightsStatusUpdater.java @@ -3,10 +3,7 @@ package org.torproject.onionoo; import java.util.Arrays; -import java.util.HashMap; -import java.util.HashSet; import java.util.Map; -import java.util.Set; import java.util.SortedMap; import java.util.SortedSet; import java.util.TreeMap; @@ -50,29 +47,19 @@ public class WeightsStatusUpdater implements DescriptorListener, } public void updateStatuses() { - this.updateWeightsHistories(); - Logger.printStatusTime("Updated weights histories"); - this.updateWeightsStatuses(); - Logger.printStatusTime("Updated weights status files"); + /* Nothing to do. */ } - private Set<RelayNetworkStatusConsensus> consensuses = - new HashSet<RelayNetworkStatusConsensus>(); - private void processRelayNetworkConsensus( RelayNetworkStatusConsensus consensus) { - // TODO This does not scale for bulk imports. - this.consensuses.add(consensus); + long validAfterMillis = consensus.getValidAfterMillis(), + freshUntilMillis = consensus.getFreshUntilMillis(); + SortedMap<String, double[]> pathSelectionWeights = + this.calculatePathSelectionProbabilities(consensus); + this.updateWeightsHistory(validAfterMillis, freshUntilMillis, + pathSelectionWeights); } - private Set<String> updateWeightsStatuses = new HashSet<String>(); - - private Map<String, Set<String>> descriptorDigestsByFingerprint = - new HashMap<String, Set<String>>(); - - private Map<String, Integer> advertisedBandwidths = - new HashMap<String, Integer>(); - private void processRelayServerDescriptor( ServerDescriptor serverDescriptor) { String digest = serverDescriptor.getServerDescriptorDigest(). @@ -81,27 +68,16 @@ public class WeightsStatusUpdater implements DescriptorListener, serverDescriptor.getBandwidthBurst(), serverDescriptor.getBandwidthObserved()), serverDescriptor.getBandwidthRate()); - this.advertisedBandwidths.put(digest, advertisedBandwidth); String fingerprint = serverDescriptor.getFingerprint(); - this.updateWeightsStatuses.add(fingerprint); - if (!this.descriptorDigestsByFingerprint.containsKey( - fingerprint)) { - this.descriptorDigestsByFingerprint.put(fingerprint, - new HashSet<String>()); - } - this.descriptorDigestsByFingerprint.get(fingerprint).add(digest); - } - - private void updateWeightsHistories() { - for (RelayNetworkStatusConsensus consensus : this.consensuses) { - long validAfterMillis = consensus.getValidAfterMillis(), - freshUntilMillis = consensus.getFreshUntilMillis(); - SortedMap<String, double[]> pathSelectionWeights = - this.calculatePathSelectionProbabilities(consensus); - this.updateWeightsHistory(validAfterMillis, freshUntilMillis, - pathSelectionWeights); + WeightsStatus weightsStatus = this.documentStore.retrieve( + WeightsStatus.class, true, fingerprint); + if (weightsStatus == null) { + weightsStatus = new WeightsStatus(); } - } + weightsStatus.getAdvertisedBandwidths().put(digest, + advertisedBandwidth); + this.documentStore.store(weightsStatus, fingerprint); +} private void updateWeightsHistory(long validAfterMillis, long freshUntilMillis, @@ -164,29 +140,19 @@ public class WeightsStatusUpdater implements DescriptorListener, boolean isExit = relay.getFlags().contains("Exit") && !relay.getFlags().contains("BadExit"); boolean isGuard = relay.getFlags().contains("Guard"); - String serverDescriptorDigest = relay.getDescriptor(). - toUpperCase(); + String digest = relay.getDescriptor().toUpperCase(); double advertisedBandwidth = 0.0; - if (!this.advertisedBandwidths.containsKey( - serverDescriptorDigest)) { - WeightsStatus weightsStatus = this.documentStore.retrieve( - WeightsStatus.class, true, fingerprint); - if (weightsStatus != null) { - if (!this.descriptorDigestsByFingerprint.containsKey( - fingerprint)) { - this.descriptorDigestsByFingerprint.put(fingerprint, - new HashSet<String>()); - } - this.descriptorDigestsByFingerprint.get(fingerprint).addAll( - weightsStatus.getAdvertisedBandwidths().keySet()); - this.advertisedBandwidths.putAll( - weightsStatus.getAdvertisedBandwidths()); - } - } - if (this.advertisedBandwidths.containsKey( - serverDescriptorDigest)) { - advertisedBandwidth = (double) this.advertisedBandwidths.get( - serverDescriptorDigest); + WeightsStatus weightsStatus = this.documentStore.retrieve( + WeightsStatus.class, true, fingerprint); + if (weightsStatus != null && + weightsStatus.getAdvertisedBandwidths() != null && + weightsStatus.getAdvertisedBandwidths().containsKey(digest)) { + /* Read advertised bandwidth from weights status file. Server + * descriptors are parsed before consensuses, so we're sure that + * if there's a server descriptor for this relay, it'll be + * contained in the weights status file by now. */ + advertisedBandwidth = + (double) weightsStatus.getAdvertisedBandwidths().get(digest); } double consensusWeight = (double) relay.getBandwidth(); double guardWeight = (double) relay.getBandwidth(); @@ -252,24 +218,7 @@ public class WeightsStatusUpdater implements DescriptorListener, history.tailMap(interval).firstKey()[0] >= freshUntilMillis)) { history.put(interval, weights); this.compressHistory(weightsStatus); - this.addAdvertisedBandwidths(weightsStatus, fingerprint); this.documentStore.store(weightsStatus, fingerprint); - this.updateWeightsStatuses.remove(fingerprint); - } - } - - private void addAdvertisedBandwidths(WeightsStatus weightsStatus, - String fingerprint) { - if (this.descriptorDigestsByFingerprint.containsKey(fingerprint)) { - for (String descriptorDigest : - this.descriptorDigestsByFingerprint.get(fingerprint)) { - if (this.advertisedBandwidths.containsKey(descriptorDigest)) { - int advertisedBandwidth = - this.advertisedBandwidths.get(descriptorDigest); - weightsStatus.getAdvertisedBandwidths().put(descriptorDigest, - advertisedBandwidth); - } - } } } @@ -334,18 +283,6 @@ public class WeightsStatusUpdater implements DescriptorListener, weightsStatus.setHistory(compressedHistory); } - private void updateWeightsStatuses() { - for (String fingerprint : this.updateWeightsStatuses) { - WeightsStatus weightsStatus = this.documentStore.retrieve( - WeightsStatus.class, true, fingerprint); - if (weightsStatus == null) { - weightsStatus = new WeightsStatus(); - } - this.addAdvertisedBandwidths(weightsStatus, fingerprint); - this.documentStore.store(weightsStatus, fingerprint); - } - } - public String getStatsString() { /* TODO Add statistics string. */ return null;

1 0

[metrics-lib/master] Store relay flags more efficiently.
by karsten＠torproject.org 01 Jun '14

01 Jun '14

commit a472d7f3425feec9b9bed552b05af33dab20fee1 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed May 28 10:11:20 2014 +0200 Store relay flags more efficiently. Turns out a TreeSet<String> requires more memory than a String[]. We can put together the TreeSet<String> when we need it. --- .../descriptor/impl/NetworkStatusEntryImpl.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java b/src/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java index 19f951e..7bfcb29 100644 --- a/src/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java +++ b/src/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java @@ -138,10 +138,7 @@ public class NetworkStatusEntryImpl implements NetworkStatusEntry { private void parseSLine(String line, String[] parts) throws DescriptorParseException { this.parsedAtMostOnceKeyword("s"); - this.flags = new TreeSet<String>(); - for (int i = 1; i < parts.length; i++) { - this.flags.add(parts[i]); - } + this.flags = parts; } private void parseVLine(String line, String[] parts) @@ -267,9 +264,15 @@ public class NetworkStatusEntryImpl implements NetworkStatusEntry { return new ArrayList<String>(this.orAddresses); } - private SortedSet<String> flags; + private String[] flags; public SortedSet<String> getFlags() { - return new TreeSet<String>(this.flags); + SortedSet<String> result = new TreeSet<String>(); + if (this.flags != null) { + for (int i = 1; i < this.flags.length; i++) { + result.add(this.flags[i]); + } + } + return result; } private String version;

1 0

[metrics-lib/master] Make queue size of descriptor reader configurable.
by karsten＠torproject.org 01 Jun '14

01 Jun '14

commit 8722de70447434ebb0d92551c8622566efb6d800 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue May 27 20:53:04 2014 +0200 Make queue size of descriptor reader configurable. By default, the descriptor reader puts up to 100 parsed descriptor files in a queue in order to hand them out as quickly as possible. But if descriptor files contain hundreds or even thousands of descriptors, that default may be too high. Add a new method to make it configurable. --- src/org/torproject/descriptor/DescriptorReader.java | 5 +++++ .../torproject/descriptor/impl/BlockingIteratorImpl.java | 11 +++++++++-- .../torproject/descriptor/impl/DescriptorReaderImpl.java | 14 +++++++++++++- 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/src/org/torproject/descriptor/DescriptorReader.java b/src/org/torproject/descriptor/DescriptorReader.java index 2783bd4..5fe8197 100644 --- a/src/org/torproject/descriptor/DescriptorReader.java +++ b/src/org/torproject/descriptor/DescriptorReader.java @@ -49,6 +49,11 @@ public interface DescriptorReader { * explicitly. */ public void setFailUnrecognizedDescriptorLines(); + /* Don't keep more than this number of parsed descriptor files in the + * queue. The default is 100, but if descriptor files contain hundreds + * or even thousands of descriptors, that default may be too high. */ + public void setMaxDescriptorFilesInQueue(int max); + /* Read the previously configured descriptors and make them available * via the returned blocking iterator. Whenever the reader runs out of * descriptors and expects to provide more shortly after, it blocks the diff --git a/src/org/torproject/descriptor/impl/BlockingIteratorImpl.java b/src/org/torproject/descriptor/impl/BlockingIteratorImpl.java index e23034a..477e6f1 100644 --- a/src/org/torproject/descriptor/impl/BlockingIteratorImpl.java +++ b/src/org/torproject/descriptor/impl/BlockingIteratorImpl.java @@ -15,19 +15,26 @@ public class BlockingIteratorImpl<T> implements Iterator<T> { /* Queue containing produced elemnts waiting for consumers. */ private Queue<T> queue = new LinkedList<T>(); + /* Maximum number of elements in queue. */ + private int maxQueueSize = 100; + /* Restrict object construction to the impl package. */ protected BlockingIteratorImpl() { } + /* Create instance with maximum queue size. */ + protected BlockingIteratorImpl(int maxQueueSize) { + this.maxQueueSize = maxQueueSize; + } + /* Add an object to the queue if there's still room. */ - final int MAX_DESCRIPTORS = 100; protected synchronized void add(T object) { if (this.outOfDescriptors) { throw new IllegalStateException("Internal error: Adding results to " + "descriptor queue not allowed after sending end-of-stream " + "object."); } - while (this.queue.size() >= this.MAX_DESCRIPTORS) { + while (this.queue.size() >= this.maxQueueSize) { try { wait(); } catch (InterruptedException e) { diff --git a/src/org/torproject/descriptor/impl/DescriptorReaderImpl.java b/src/org/torproject/descriptor/impl/DescriptorReaderImpl.java index e3fb908..d679154 100644 --- a/src/org/torproject/descriptor/impl/DescriptorReaderImpl.java +++ b/src/org/torproject/descriptor/impl/DescriptorReaderImpl.java @@ -93,6 +93,15 @@ public class DescriptorReaderImpl implements DescriptorReader { this.failUnrecognizedDescriptorLines = true; } + private Integer maxDescriptorFilesInQueue = null; + public void setMaxDescriptorFilesInQueue(int max) { + if (this.hasStartedReading) { + throw new IllegalStateException("Reconfiguration is not permitted " + + "after starting to read."); + } + this.maxDescriptorFilesInQueue = max; + } + private DescriptorReaderRunnable reader; public Iterator<DescriptorFile> readDescriptors() { if (this.hasStartedReading) { @@ -101,7 +110,10 @@ public class DescriptorReaderImpl implements DescriptorReader { } this.hasStartedReading = true; BlockingIteratorImpl<DescriptorFile> descriptorQueue = - new BlockingIteratorImpl<DescriptorFile>(); + this.maxDescriptorFilesInQueue == null + ? new BlockingIteratorImpl<DescriptorFile>() + : new BlockingIteratorImpl<DescriptorFile>( + this.maxDescriptorFilesInQueue); this.reader = new DescriptorReaderRunnable(this.directories, this.tarballs, descriptorQueue, this.historyFile, this.excludedFiles, this.failUnrecognizedDescriptorLines);

1 0

[metrics-lib/master] Store bandwidth histories more efficiently.
by karsten＠torproject.org 01 Jun '14

01 Jun '14

commit a12e989e403cc1811a97631a630c37e76494528b Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue May 27 20:57:51 2014 +0200 Store bandwidth histories more efficiently. We were storing bandwidth histories in TreeMap<Long, Long>() with keys being time in millis and values being bandwidth values. This showed up in profiles. It's far more (memory-)efficient to store bandwidth values in a long[] and put together the TreeMap when the caller requests it. And if the bandwidth history is evaluated exactly once, there should not even be a CPU overhead. --- .../descriptor/impl/BandwidthHistoryImpl.java | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/org/torproject/descriptor/impl/BandwidthHistoryImpl.java b/src/org/torproject/descriptor/impl/BandwidthHistoryImpl.java index 65def52..00953c0 100644 --- a/src/org/torproject/descriptor/impl/BandwidthHistoryImpl.java +++ b/src/org/torproject/descriptor/impl/BandwidthHistoryImpl.java @@ -47,15 +47,14 @@ public class BandwidthHistoryImpl implements BandwidthHistory { values = partsNoOpt[4].substring(2).split(",", -1); } if (values != null) { - long endMillis = this.historyEndMillis; + this.bandwidthValues = new long[values.length]; for (int i = values.length - 1; i >= 0; i--) { long bandwidthValue = Long.parseLong(values[i]); if (bandwidthValue < 0L) { throw new DescriptorParseException("Negative bandwidth " + "values are not allowed in line '" + line + "'."); } - this.bandwidthValues.put(endMillis, bandwidthValue); - endMillis -= this.intervalLength * 1000L; + this.bandwidthValues[i] = bandwidthValue; } isValid = true; } @@ -85,10 +84,17 @@ public class BandwidthHistoryImpl implements BandwidthHistory { return this.intervalLength; } - private SortedMap<Long, Long> bandwidthValues = - new TreeMap<Long, Long>(); + private long[] bandwidthValues; public SortedMap<Long, Long> getBandwidthValues() { - return new TreeMap<Long, Long>(this.bandwidthValues); + SortedMap<Long, Long> result = new TreeMap<Long, Long>(); + if (this.bandwidthValues != null) { + long endMillis = this.historyEndMillis; + for (int i = this.bandwidthValues.length - 1; i >= 0; i--) { + result.put(endMillis, bandwidthValues[i]); + endMillis -= this.intervalLength * 1000L; + } + } + return result; } }

1 0

[metrics-lib/master] Clear parsed keywords after verifying them.
by karsten＠torproject.org 01 Jun '14

01 Jun '14

commit 5caa3848b0c09aed59333563e291ce616f419821 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue May 27 21:03:52 2014 +0200 Clear parsed keywords after verifying them. No need to keep them around. That's just a waste of heap space. --- src/org/torproject/descriptor/impl/BridgePoolAssignmentImpl.java | 1 + src/org/torproject/descriptor/impl/DescriptorImpl.java | 4 ++++ .../torproject/descriptor/impl/DirectoryKeyCertificateImpl.java | 1 + src/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java | 1 + src/org/torproject/descriptor/impl/MicrodescriptorImpl.java | 1 + src/org/torproject/descriptor/impl/RelayDirectoryImpl.java | 1 + .../descriptor/impl/RelayNetworkStatusConsensusImpl.java | 1 + src/org/torproject/descriptor/impl/RelayNetworkStatusImpl.java | 1 + src/org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java | 1 + src/org/torproject/descriptor/impl/ServerDescriptorImpl.java | 1 + 10 files changed, 13 insertions(+) diff --git a/src/org/torproject/descriptor/impl/BridgePoolAssignmentImpl.java b/src/org/torproject/descriptor/impl/BridgePoolAssignmentImpl.java index c4be80d..8ca4ea6 100644 --- a/src/org/torproject/descriptor/impl/BridgePoolAssignmentImpl.java +++ b/src/org/torproject/descriptor/impl/BridgePoolAssignmentImpl.java @@ -43,6 +43,7 @@ public class BridgePoolAssignmentImpl extends DescriptorImpl new String[] { "bridge-pool-assignment" })); this.checkExactlyOnceKeywords(exactlyOnceKeywords); this.checkFirstKeyword("bridge-pool-assignment"); + this.clearParsedKeywords(); return; } diff --git a/src/org/torproject/descriptor/impl/DescriptorImpl.java b/src/org/torproject/descriptor/impl/DescriptorImpl.java index ee50ec6..c4113be 100644 --- a/src/org/torproject/descriptor/impl/DescriptorImpl.java +++ b/src/org/torproject/descriptor/impl/DescriptorImpl.java @@ -319,5 +319,9 @@ public abstract class DescriptorImpl implements Descriptor { return this.parsedKeywords.get(keyword); } } + + protected void clearParsedKeywords() { + this.parsedKeywords = null; + } } diff --git a/src/org/torproject/descriptor/impl/DirectoryKeyCertificateImpl.java b/src/org/torproject/descriptor/impl/DirectoryKeyCertificateImpl.java index 338f8e6..59846df 100644 --- a/src/org/torproject/descriptor/impl/DirectoryKeyCertificateImpl.java +++ b/src/org/torproject/descriptor/impl/DirectoryKeyCertificateImpl.java @@ -51,6 +51,7 @@ public class DirectoryKeyCertificateImpl extends DescriptorImpl this.checkAtMostOnceKeywords(atMostOnceKeywords); this.checkFirstKeyword("dir-key-certificate-version"); this.checkLastKeyword("dir-key-certification"); + this.clearParsedKeywords(); } private void parseDescriptorBytes() throws DescriptorParseException { diff --git a/src/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java b/src/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java index c67a040..a533113 100644 --- a/src/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java +++ b/src/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java @@ -81,6 +81,7 @@ public class ExtraInfoDescriptorImpl extends DescriptorImpl this.checkKeywordsDependOn(exitStatsKeywords, "exit-stats-end"); this.checkKeywordsDependOn(bridgeStatsKeywords, "bridge-stats-end"); this.checkFirstKeyword("extra-info"); + this.clearParsedKeywords(); return; } diff --git a/src/org/torproject/descriptor/impl/MicrodescriptorImpl.java b/src/org/torproject/descriptor/impl/MicrodescriptorImpl.java index 15fb91e..30db583 100644 --- a/src/org/torproject/descriptor/impl/MicrodescriptorImpl.java +++ b/src/org/torproject/descriptor/impl/MicrodescriptorImpl.java @@ -47,6 +47,7 @@ public class MicrodescriptorImpl extends DescriptorImpl "ntor-onion-key,family,p,p6").split(","))); this.checkAtMostOnceKeywords(atMostOnceKeywords); this.checkFirstKeyword("onion-key"); + this.clearParsedKeywords(); return; } diff --git a/src/org/torproject/descriptor/impl/RelayDirectoryImpl.java b/src/org/torproject/descriptor/impl/RelayDirectoryImpl.java index 03d727e..2426023 100644 --- a/src/org/torproject/descriptor/impl/RelayDirectoryImpl.java +++ b/src/org/torproject/descriptor/impl/RelayDirectoryImpl.java @@ -51,6 +51,7 @@ public class RelayDirectoryImpl extends DescriptorImpl "dir-signing-key,running-routers,router-status".split(","))); this.checkAtMostOnceKeywords(atMostOnceKeywords); this.checkFirstKeyword("signed-directory"); + this.clearParsedKeywords(); } private void calculateDigest() throws DescriptorParseException { diff --git a/src/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImpl.java b/src/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImpl.java index d6babee..ff963e6 100644 --- a/src/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImpl.java +++ b/src/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImpl.java @@ -51,6 +51,7 @@ public class RelayNetworkStatusConsensusImpl extends NetworkStatusImpl + "bandwidth-weights").split(","))); this.checkAtMostOnceKeywords(atMostOnceKeywords); this.checkFirstKeyword("network-status-version"); + this.clearParsedKeywords(); this.calculateDigest(); } diff --git a/src/org/torproject/descriptor/impl/RelayNetworkStatusImpl.java b/src/org/torproject/descriptor/impl/RelayNetworkStatusImpl.java index 78cacd0..6089fc7 100644 --- a/src/org/torproject/descriptor/impl/RelayNetworkStatusImpl.java +++ b/src/org/torproject/descriptor/impl/RelayNetworkStatusImpl.java @@ -48,6 +48,7 @@ public class RelayNetworkStatusImpl extends NetworkStatusImpl "dir-options,client-versions,server-versions".split(","))); this.checkAtMostOnceKeywords(atMostOnceKeywords); this.checkFirstKeyword("network-status-version"); + this.clearParsedKeywords(); this.calculateDigest(); } diff --git a/src/org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java b/src/org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java index c5ba980..d0d09f7 100644 --- a/src/org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java +++ b/src/org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java @@ -54,6 +54,7 @@ public class RelayNetworkStatusVoteImpl extends NetworkStatusImpl split(","))); this.checkAtMostOnceKeywords(atMostOnceKeywords); this.checkFirstKeyword("network-status-version"); + this.clearParsedKeywords(); } protected void parseHeader(byte[] headerBytes) diff --git a/src/org/torproject/descriptor/impl/ServerDescriptorImpl.java b/src/org/torproject/descriptor/impl/ServerDescriptorImpl.java index d1fcd28..52d49b0 100644 --- a/src/org/torproject/descriptor/impl/ServerDescriptorImpl.java +++ b/src/org/torproject/descriptor/impl/ServerDescriptorImpl.java @@ -57,6 +57,7 @@ public class ServerDescriptorImpl extends DescriptorImpl throw new DescriptorParseException("Either keyword 'accept' or " + "'reject' must be contained at least once."); } + this.clearParsedKeywords(); return; }

1 0

[metrics-lib/master] Use a single DateFormat per thread and format.
by karsten＠torproject.org 01 Jun '14

01 Jun '14

commit e3945981d1571cc577efc9805882bd1c59ad94c8 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed May 28 10:07:28 2014 +0200 Use a single DateFormat per thread and format. DateFormat is not thread-safe, and creating a new instance every time we need one only wastes CPU time. Make sure that there's a single instance per thread and format that the thread can use whenever it wants. --- .../torproject/descriptor/impl/ParseHelper.java | 37 ++++++++++++++++---- 1 file changed, 30 insertions(+), 7 deletions(-) diff --git a/src/org/torproject/descriptor/impl/ParseHelper.java b/src/org/torproject/descriptor/impl/ParseHelper.java index fd38eb0..8b314fd 100644 --- a/src/org/torproject/descriptor/impl/ParseHelper.java +++ b/src/org/torproject/descriptor/impl/ParseHelper.java @@ -2,9 +2,11 @@ * See LICENSE for licensing information */ package org.torproject.descriptor.impl; +import java.text.DateFormat; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.SortedMap; @@ -137,6 +139,32 @@ public class ParseHelper { return exitPattern; } + private static ThreadLocal<Map<String, DateFormat>> dateFormats = + new ThreadLocal<Map<String, DateFormat>> () { + public Map<String, DateFormat> get() { + return super.get(); + } + protected Map<String, DateFormat> initialValue() { + return new HashMap<String, DateFormat>(); + } + public void remove() { + super.remove(); + } + public void set(Map<String, DateFormat> value) { + super.set(value); + } + }; + private static DateFormat getDateFormat(String format) { + Map<String, DateFormat> threadDateFormats = dateFormats.get(); + if (!threadDateFormats.containsKey(format)) { + DateFormat dateFormat = new SimpleDateFormat(format); + dateFormat.setLenient(false); + dateFormat.setTimeZone(TimeZone.getTimeZone("UTC")); + threadDateFormats.put(format, dateFormat); + } + return threadDateFormats.get(format); + } + public static long parseTimestampAtIndex(String line, String[] parts, int dateIndex, int timeIndex) throws DescriptorParseException { if (dateIndex >= parts.length || timeIndex >= parts.length) { @@ -145,10 +173,7 @@ public class ParseHelper { } long result = -1L; try { - SimpleDateFormat dateTimeFormat = new SimpleDateFormat( - "yyyy-MM-dd HH:mm:ss"); - dateTimeFormat.setLenient(false); - dateTimeFormat.setTimeZone(TimeZone.getTimeZone("UTC")); + DateFormat dateTimeFormat = getDateFormat("yyyy-MM-dd HH:mm:ss"); result = dateTimeFormat.parse( parts[dateIndex] + " " + parts[timeIndex]).getTime(); } catch (ParseException e) { @@ -169,9 +194,7 @@ public class ParseHelper { } long result = -1L; try { - SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); - dateFormat.setLenient(false); - dateFormat.setTimeZone(TimeZone.getTimeZone("UTC")); + DateFormat dateFormat = getDateFormat("yyyy-MM-dd"); result = dateFormat.parse(parts[dateIndex]).getTime(); } catch (ParseException e) { /* Leave result at -1L. */

1 0

[translation/liveusb-creator_completed] Update translations for liveusb-creator_completed
by translation＠torproject.org 01 Jun '14

01 Jun '14

commit f00036b4de2fe320c4a06df490a33789f1926868 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jun 1 08:45:24 2014 +0000 Update translations for liveusb-creator_completed --- uk/uk.po | 183 ++++++++++++++++++++++++++++++++------------------------------ 1 file changed, 94 insertions(+), 89 deletions(-) diff --git a/uk/uk.po b/uk/uk.po index 701e0e9..85de7f8 100644 --- a/uk/uk.po +++ b/uk/uk.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-16 18:47+0200\n" -"PO-Revision-Date: 2014-05-21 17:13+0000\n" -"Last-Translator: Андрій Бандура <andriykopanytsia(a)gmail.com>\n" +"POT-Creation-Date: 2014-05-28 16:00+0200\n" +"PO-Revision-Date: 2014-06-01 08:41+0000\n" +"Last-Translator: LinuxChata\n" "Language-Team: Ukrainian (http://www.transifex.com/projects/p/torproject/language/uk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -26,22 +26,22 @@ msgstr "" msgid "%(distribution)s Installer" msgstr "%(distribution)s Установщик" -#: ../liveusb/gui.py:808 +#: ../liveusb/gui.py:794 #, python-format msgid "%(filename)s selected" msgstr "%(filename)s обрано" -#: ../liveusb/gui.py:439 +#: ../liveusb/gui.py:425 #, python-format msgid "%(size)s %(label)s" msgstr "%(size)s %(label)s" -#: ../liveusb/gui.py:445 +#: ../liveusb/gui.py:431 #, python-format msgid "%(vendor)s %(model)s (%(details)s) - %(device)s" msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s" -#: ../liveusb/creator.py:1021 +#: ../liveusb/creator.py:1046 #, python-format msgid "%s already bootable" msgstr "%s вже завантажувальний" @@ -98,16 +98,16 @@ msgid "" "persist after a reboot." msgstr "Шляхом виділення додаткового місця на пристрої для постійного сховища, Ви отримаєте можливість зберігати дані і робити постійні модифікації Вашої живої ОС. Без цього у Вас не вийде зберегти дані так, щоб вони залишилися після перевантаження." -#: ../liveusb/creator.py:1125 ../liveusb/creator.py:1388 +#: ../liveusb/creator.py:1150 ../liveusb/creator.py:1413 #, python-format msgid "Calculating the SHA1 of %s" msgstr "Розрахунок SHA1 від %s" -#: ../liveusb/creator.py:1336 +#: ../liveusb/creator.py:1361 msgid "Cannot find" msgstr "Не вдалося знайти" -#: ../liveusb/creator.py:543 +#: ../liveusb/creator.py:551 #, python-format msgid "Cannot find device %s" msgstr "Пристрій %s не знайдено" @@ -126,12 +126,12 @@ msgid "" "Upgrade" msgstr "Клонувати\n&&\nОновити" -#: ../liveusb/creator.py:399 +#: ../liveusb/creator.py:407 #, python-format msgid "Creating %sMB persistent overlay" msgstr "Створення %sМБ постійного сховища" -#: ../liveusb/gui.py:567 +#: ../liveusb/gui.py:553 msgid "" "Device is not yet mounted, so we cannot determine the amount of free space." msgstr "Пристрій наразі не змонтовано, тому не можна визначити кількість вільного місця." @@ -141,11 +141,11 @@ msgstr "Пристрій наразі не змонтовано, тому не msgid "Download %(distribution)s" msgstr "Завантаження %(distribution)s" -#: ../liveusb/gui.py:782 +#: ../liveusb/gui.py:768 msgid "Download complete!" msgstr "Завантаження завершено!" -#: ../liveusb/gui.py:786 +#: ../liveusb/gui.py:772 msgid "Download failed: " msgstr "Помилка при завантаженні: " @@ -154,45 +154,45 @@ msgstr "Помилка при завантаженні: " msgid "Downloading %s..." msgstr "Завантажується %s..." -#: ../liveusb/creator.py:1121 +#: ../liveusb/creator.py:1146 msgid "Drive is a loopback, skipping MBR reset" msgstr "Цей диск є циклічним пристроєм, пропускаємо очищення MBR" -#: ../liveusb/creator.py:814 +#: ../liveusb/creator.py:822 #, python-format msgid "Entering unmount_device for '%(device)s'" msgstr "Відкриття незмонтованого пристрою для '%(device)s'" -#: ../liveusb/creator.py:1201 +#: ../liveusb/creator.py:1226 msgid "Error probing device" msgstr "Помилка зондування пристрою" -#: ../liveusb/gui.py:227 +#: ../liveusb/gui.py:211 msgid "" "Error: Cannot set the label or obtain the UUID of your device. Unable to " "continue." msgstr "Помилка: Не вдається встановити позначку чи отримати UUID вашого пристрою. Неможливо продовжити." -#: ../liveusb/creator.py:375 +#: ../liveusb/creator.py:383 msgid "" "Error: The SHA1 of your Live CD is invalid. You can run this program with " "the --noverify argument to bypass this verification check." msgstr "Помилка: Неправильна SHA1 у вашому образі Live CD. Можна запустити програму з аргументом --noverify, щоб пропустити перевірку." -#: ../liveusb/creator.py:144 +#: ../liveusb/creator.py:146 msgid "Extracting live image to the target device..." msgstr "Видобування живого образу на цільовий пристрій..." -#: ../liveusb/creator.py:1064 +#: ../liveusb/creator.py:1089 #, python-format msgid "Formatting %(device)s as FAT32" msgstr "Форматування %(device)s у FAT32" -#: ../liveusb/creator.py:139 +#: ../liveusb/creator.py:141 msgid "ISO MD5 checksum passed" msgstr "Перевірка контрольної суми ISO MD5 пройшла успішно" -#: ../liveusb/creator.py:137 +#: ../liveusb/creator.py:139 msgid "ISO MD5 checksum verification failed" msgstr "Не вдалося перевірити контрольну суму ISO MD5" @@ -206,70 +206,70 @@ msgstr "Якщо ви не виберете існуючий Live ISO, вибр msgid "Install Tails" msgstr "Встановити Tails" -#: ../liveusb/gui.py:630 +#: ../liveusb/gui.py:616 msgid "Installation complete!" msgstr "Установка завершена!" -#: ../liveusb/gui.py:279 +#: ../liveusb/gui.py:265 #, python-format msgid "Installation complete! (%s)" msgstr "Установка завершена! (%s)" -#: ../liveusb/gui.py:631 +#: ../liveusb/gui.py:617 msgid "Installation was completed. Press OK to close this program." msgstr "Установка була завершена. Натисніть Гаразд, щоб закрити програму." -#: ../liveusb/creator.py:917 ../liveusb/creator.py:1242 +#: ../liveusb/creator.py:942 ../liveusb/creator.py:1267 msgid "Installing bootloader..." msgstr "Установка завантажувача..." -#: ../liveusb/gui.py:284 +#: ../liveusb/gui.py:270 msgid "LiveUSB creation failed!" msgstr "Помилка при створенні LiveUSB!" -#: ../liveusb/creator.py:1337 +#: ../liveusb/creator.py:1362 msgid "" "Make sure to extract the entire liveusb-creator zip file before running this" " program." msgstr "Обов'язково розпакуйте zip-файл liveusb-creator цілком перед запуском цієї програми" -#: ../liveusb/creator.py:1213 +#: ../liveusb/creator.py:1238 msgid "" "Make sure your USB key is plugged in and formatted with the FAT filesystem" msgstr "Перевірте, що USB-пристрій приєднаний та форматований (FAT)" -#: ../liveusb/creator.py:836 +#: ../liveusb/creator.py:844 #, python-format msgid "Mount %s exists after unmounting" msgstr "Точка монтування %s існує після демонтування" -#: ../liveusb/gui.py:573 +#: ../liveusb/gui.py:559 #, python-format msgid "No free space on device %(device)s" msgstr "На пристрої %(device)s немає вільного місця" -#: ../liveusb/creator.py:803 +#: ../liveusb/creator.py:811 msgid "No mount points found" msgstr "Немає точок монтування" -#: ../liveusb/creator.py:392 +#: ../liveusb/creator.py:400 msgid "Not enough free space on device." msgstr "Недостатньо вільного місця на пристрої." -#: ../liveusb/gui.py:554 +#: ../liveusb/gui.py:540 msgid "Partition is FAT16; Restricting overlay size to 2G" msgstr "Розділ FAT16: Розмір оверлею можливий не більше 2ГБ" -#: ../liveusb/gui.py:550 +#: ../liveusb/gui.py:536 msgid "Partition is FAT32; Restricting overlay size to 4G" msgstr "Розділ відформатований в FAT32; Розмір постійного сховища обмежений 4G" -#: ../liveusb/creator.py:225 ../liveusb/creator.py:843 +#: ../liveusb/creator.py:227 ../liveusb/creator.py:851 #, python-format msgid "Partitioning device %(device)s" msgstr "Розмітка пристрою %(device)s" -#: ../liveusb/gui.py:621 +#: ../liveusb/gui.py:607 msgid "Persistent Storage" msgstr "Постійне сховище" @@ -277,53 +277,53 @@ msgstr "Постійне сховище" msgid "Persistent Storage (0 MB)" msgstr "Постійне сховище (0 MB)" -#: ../liveusb/gui.py:702 ../liveusb/gui.py:731 +#: ../liveusb/gui.py:688 ../liveusb/gui.py:717 msgid "Please confirm your device selection" msgstr "Будь-ласка, підтвердіть вибір пристрою" -#: ../liveusb/gui.py:467 +#: ../liveusb/gui.py:453 msgid "Refreshing releases..." msgstr "Оновлення списку релізів..." -#: ../liveusb/gui.py:472 +#: ../liveusb/gui.py:458 msgid "Releases updated!" msgstr "Список релізів оновлений" -#: ../liveusb/creator.py:940 ../liveusb/creator.py:1260 +#: ../liveusb/creator.py:965 ../liveusb/creator.py:1285 #, python-format msgid "Removing %(file)s" msgstr "Видалення %(file)s" -#: ../liveusb/creator.py:470 +#: ../liveusb/creator.py:478 msgid "Removing existing Live OS" msgstr "Видалення існуючої Live OS" -#: ../liveusb/creator.py:1115 +#: ../liveusb/creator.py:1140 #, python-format msgid "Resetting Master Boot Record of %s" msgstr "Очищення головного завантажувального запису %s" -#: ../liveusb/gui.py:793 +#: ../liveusb/gui.py:779 msgid "Select Live ISO" msgstr "Виберіть Live ISO" -#: ../liveusb/creator.py:181 +#: ../liveusb/creator.py:183 msgid "Setting up OLPC boot file..." msgstr "Налаштування файлу завантаження OLPC..." -#: ../liveusb/creator.py:717 +#: ../liveusb/creator.py:725 #, python-format msgid "" "Some partitions of the target device %(device)s are mounted. They will be " "unmounted before starting the installation process." msgstr "Деякі розділи цільового пристрою %(device)s змонтовані. Вони будуть демонтовані перед початком установки." -#: ../liveusb/creator.py:130 +#: ../liveusb/creator.py:132 msgid "" "Source type does not support verification of ISO MD5 checksum, skipping" msgstr "Тип джерела не підтримує перевірку контрольних сум MD5 для ISO, пропускаємо" -#: ../liveusb/creator.py:1149 +#: ../liveusb/creator.py:1174 msgid "Synchronizing data on disk..." msgstr "Синхронізація даних на диску..." @@ -331,19 +331,19 @@ msgstr "Синхронізація даних на диску..." msgid "Target Device" msgstr "Цільовий пристрій" -#: ../liveusb/gui.py:667 +#: ../liveusb/gui.py:653 msgid "" "The Master Boot Record on your device is blank. Pressing 'Install Tails' " "again will reset the MBR on this device." msgstr "Головний завантажувальний запис на Вашому пристрої порожній. Повторне натискання кнопки 'Встановити Tails' призведе до відновлення MBR на цьому пристрої." -#: ../liveusb/gui.py:796 +#: ../liveusb/gui.py:782 msgid "" "The selected file is unreadable. Please fix its permissions or select " "another file." msgstr "Вибраний файл не читається. Виправте файл або виберіть інший." -#: ../liveusb/creator.py:336 +#: ../liveusb/creator.py:344 #, python-format msgid "" "There was a problem executing the following command: `%(command)s`.\n" @@ -381,87 +381,87 @@ msgstr "Це смуга перебігу, яка показує скільки msgid "This is the status console, where all messages get written to." msgstr "Це консоль стану, куди пишуться усі повідомлення." -#: ../liveusb/creator.py:880 +#: ../liveusb/creator.py:905 msgid "Trying to continue anyway." msgstr "Спроба все одно продовжити." -#: ../liveusb/creator.py:912 +#: ../liveusb/creator.py:937 #, python-format msgid "Unable to change volume label: %(message)s" msgstr "Не вдалося змінити мітку тому: %(message)s" -#: ../liveusb/creator.py:479 ../liveusb/creator.py:490 +#: ../liveusb/creator.py:487 ../liveusb/creator.py:498 #, python-format msgid "Unable to chmod %(file)s: %(message)s" msgstr "Не вдалося chmod %(file)s: %(message)s" -#: ../liveusb/creator.py:460 +#: ../liveusb/creator.py:468 #, python-format msgid "Unable to copy %(infile)s to %(outfile)s: %(message)s" msgstr "Не вдалося скопіювати %(infile)s на %(outfile)s: %(message)s" -#: ../liveusb/gui.py:418 +#: ../liveusb/gui.py:404 msgid "Unable to find any USB drive" msgstr "Не вдалося знайти жодного USB пристрою" -#: ../liveusb/creator.py:1203 +#: ../liveusb/creator.py:1228 msgid "Unable to find any supported device" msgstr "Не вдалося знайти пристрій, що підтримується" -#: ../liveusb/creator.py:1041 +#: ../liveusb/creator.py:1066 msgid "Unable to find partition" msgstr "Не вдалося знайти розділ" -#: ../liveusb/creator.py:1283 +#: ../liveusb/creator.py:1308 msgid "" "Unable to get Win32_LogicalDisk; win32com query did not return any results" msgstr "Неможливо отримати Win32_LogicalDisk; win32com нічого не повернув" -#: ../liveusb/gui.py:695 +#: ../liveusb/gui.py:681 msgid "Unable to mount device" msgstr "Не вдалося змонтувати пристрій" -#: ../liveusb/creator.py:791 +#: ../liveusb/creator.py:799 #, python-format msgid "Unable to mount device: %(message)s" msgstr "Не вдалося змонтувати пристрій: %(message)s" -#: ../liveusb/creator.py:495 +#: ../liveusb/creator.py:503 #, python-format msgid "Unable to remove directory from previous LiveOS: %(message)s" msgstr "Не вдалося видалити директорію з попередньої LiveOS: %(message)s" -#: ../liveusb/creator.py:483 +#: ../liveusb/creator.py:491 #, python-format msgid "Unable to remove file from previous LiveOS: %(message)s" msgstr "Не вдалося видалити файл з попередньої LiveOS: %(message)s" -#: ../liveusb/creator.py:1118 +#: ../liveusb/creator.py:1143 msgid "" "Unable to reset MBR. You may not have the `syslinux` package installed." msgstr "Неможливо очистити MBR. Можливо, у Вас не встановлений пакет `syslinux`." -#: ../liveusb/gui.py:802 +#: ../liveusb/gui.py:788 msgid "" "Unable to use the selected file. You may have better luck if you move your " "ISO to the root of your drive (ie: C:\\)" msgstr "Неможливо використовувати вказаний файл. Спробуйте перемістити ISO в корінь диска (наприклад, C:\\)" -#: ../liveusb/creator.py:698 +#: ../liveusb/creator.py:706 #, python-format msgid "Unable to write on %(device)s, skipping." msgstr "Неможливо записати на %(device)s, пропускаю." -#: ../liveusb/creator.py:381 +#: ../liveusb/creator.py:389 msgid "Unknown ISO, skipping checksum verification" msgstr "Невідомий ISO, перевірка контрольної суми пропущена" -#: ../liveusb/creator.py:787 +#: ../liveusb/creator.py:795 #, python-format msgid "Unknown dbus exception while trying to mount device: %(message)s" msgstr "Невідомий виняток dbus під час монтування пристрою: %(message)s" -#: ../liveusb/creator.py:766 ../liveusb/creator.py:891 +#: ../liveusb/creator.py:774 ../liveusb/creator.py:916 msgid "Unknown filesystem. Your device may need to be reformatted." msgstr "Невідома файлова система. Ваш пристрій потребує переформатування." @@ -470,40 +470,45 @@ msgstr "Невідома файлова система. Ваш пристрій msgid "Unknown release: %s" msgstr "Невідомий випуск: %s" -#: ../liveusb/creator.py:828 +#: ../liveusb/creator.py:836 #, python-format msgid "Unmounting '%(udi)s' on '%(device)s'" msgstr "Розмонтування '%(udi)s' на '%(device)s'" -#: ../liveusb/creator.py:824 +#: ../liveusb/creator.py:832 #, python-format msgid "Unmounting mounted filesystems on '%(device)s'" msgstr "Демонтування файлових систем на '%(device)s'" -#: ../liveusb/creator.py:877 +#: ../liveusb/creator.py:902 #, python-format msgid "Unsupported device '%(device)s', please report a bug." msgstr "Непідтримуваний пристрій '%(device)s', будь ласка, повідомте про помилку." -#: ../liveusb/creator.py:771 ../liveusb/creator.py:894 +#: ../liveusb/creator.py:779 ../liveusb/creator.py:919 #, python-format msgid "Unsupported filesystem: %s" msgstr "Непідтримувана файлова система: %s" -#: ../liveusb/creator.py:769 +#: ../liveusb/creator.py:777 #, python-format msgid "" "Unsupported filesystem: %s\n" "In case you are trying to upgrade a manually installed Tails system (that is, if it was installed without this installer), this option is not supported: you need to install it anew to start with, e.g. by choosing the \"Clone & Install\" action instead." msgstr "Непідтримувана файлова система: %s\nУ разі, якщо ви самостійно плануєте оновити систему (якщо система була встановлена без установника), даний параметр не підтримується: вам треба встановити нову систему, просто вибравши команду \"Копіювати і Встановити\"." -#: ../liveusb/creator.py:1216 +#: ../liveusb/creator.py:1241 #, python-format msgid "" "Unsupported filesystem: %s\n" "Please backup and format your USB key with the FAT filesystem." msgstr "Непідтримувана файлова система: %s\nЗробіть резервну копію даних та відформатуйте USB-пристрій у файлову систему FAT." +#: ../liveusb/creator.py:877 +#, python-format +msgid "Updating properties of system partition %(system_partition)s" +msgstr "Оновити властивості системного розділу %(system_partition)s" + #: ../liveusb/launcher_ui.py:163 msgid "Upgrade from ISO" msgstr "Оновити з ISO" @@ -512,54 +517,54 @@ msgstr "Оновити з ISO" msgid "Use existing Live system ISO" msgstr "Використовувати існуючий Live ISO" -#: ../liveusb/creator.py:132 +#: ../liveusb/creator.py:134 msgid "Verifying ISO MD5 checksum" msgstr "Перевірка контрольної суми ISO MD5" -#: ../liveusb/creator.py:355 +#: ../liveusb/creator.py:363 msgid "Verifying SHA1 checksum of LiveCD image..." msgstr "Перевірка SHA1 контрольної суми LiveCD образу..." -#: ../liveusb/creator.py:359 +#: ../liveusb/creator.py:367 msgid "Verifying SHA256 checksum of LiveCD image..." msgstr "Перевірка SHA256 контрольної суми LiveCD образу..." -#: ../liveusb/creator.py:888 ../liveusb/creator.py:1209 +#: ../liveusb/creator.py:913 ../liveusb/creator.py:1234 msgid "Verifying filesystem..." msgstr "Перевірка файлової системи..." -#: ../liveusb/gui.py:729 +#: ../liveusb/gui.py:715 msgid "" "Warning: Creating a new persistent overlay will delete your existing one." msgstr "Увага: Створення нового постійного шару видалить наявний шар." -#: ../liveusb/gui.py:681 +#: ../liveusb/gui.py:667 msgid "" "Warning: The Master Boot Record on your device does not match your system's " "syslinux MBR. If you have trouble booting this stick, try running the " "liveusb-creator with the --reset-mbr option." msgstr "Увага: Master Boot Record на вашому пристрої не відповідає syslinux системного MBR. Якщо у вас виникли проблеми із завантаженням із флешки, спробуйте завантажити liveusb-creator з параметром --reset-mbr option." -#: ../liveusb/gui.py:392 +#: ../liveusb/gui.py:378 msgid "" "Warning: This tool needs to be run as an Administrator. To do this, right " "click on the icon and open the Properties. Under the Compatibility tab, " "check the \"Run this program as an administrator\" box." msgstr "Увага: Для роботи потрібні права Адміністратора. Що б отримати їх, натисніть правою кнопкою на піктограму програми і відкрийте Властивості. У вкладці Сумісність поставте галочку на \"Виконувати цю програму від імені адміністратора\"." -#: ../liveusb/creator.py:151 +#: ../liveusb/creator.py:153 #, python-format msgid "Wrote to device at %(speed)d MB/sec" msgstr "Записано на пристрій на %(speed)d MB/sec" -#: ../liveusb/gui.py:703 +#: ../liveusb/gui.py:689 #, python-format msgid "" "You are going to install Tails on the %(size)s %(vendor)s %(model)s device " "(%(device)s). All data on the selected device will be lost. Continue?" msgstr "Ви збираєтеся встановити Tails на пристрій %(size)s %(vendor)s %(model)s (%(device)s). Всі дані будуть втрачені. Продовжити?" -#: ../liveusb/gui.py:719 +#: ../liveusb/gui.py:705 #, python-format msgid "" "You are going to upgrade Tails on the %(parent_size)s %(vendor)s %(model)s " @@ -567,17 +572,17 @@ msgid "" "unchanged. Continue?" msgstr "Ви збираєтеся оновити Tails на пристрої %(parent_size)s %(vendor)s %(model)s (%(device)s). Постійне сховище на цьому томі залишиться без змін. Продовжити?" -#: ../liveusb/creator.py:605 +#: ../liveusb/creator.py:613 msgid "" "You are using an old version of syslinux-extlinux that does not support the " "ext4 filesystem" msgstr "Ви використовуєте стару версію syslinux-extlinux, яка не підтримує файлову систему ext4" -#: ../liveusb/gui.py:787 +#: ../liveusb/gui.py:773 msgid "You can try again to resume your download" msgstr "Можете спробувати продовжити завантаження" -#: ../liveusb/creator.py:91 +#: ../liveusb/creator.py:93 msgid "You must run this application as root" msgstr "Необхідно запустити програму з-під root"

1 0