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

[translation/tor-launcher-progress] Update translations for tor-launcher-progress
by translation＠torproject.org 17 Aug '14

17 Aug '14

commit f7b8381a17160550dd92780031025ac4a1e45436 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Aug 17 12:45:33 2014 +0000 Update translations for tor-launcher-progress --- de/progress.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/de/progress.dtd b/de/progress.dtd index 45bd6d6..3386f46 100644 --- a/de/progress.dtd +++ b/de/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor-Status"> <!ENTITY … [View More]

1 0

[onionoo/master] Make ClientsStatus smarter about itself.
by karsten＠torproject.org 17 Aug '14

17 Aug '14

commit 934eff6921bb5e166a551276fb1d698b66507b16 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Aug 15 10:54:24 2014 +0200 Make ClientsStatus smarter about itself. Removes another dependency on DateTimeHelper, which gets us closer to implementing #12866. --- .../org/torproject/onionoo/docs/ClientsStatus.java | 65 +++++++++++++++++++ .../onionoo/updater/ClientsStatusUpdater.java | 66 ++------------------ 2 files changed, 70 insertions(+), 61 … [View More]deletions(-) diff --git a/src/main/java/org/torproject/onionoo/docs/ClientsStatus.java b/src/main/java/org/torproject/onionoo/docs/ClientsStatus.java index 2bd2168..2e7e2ee 100644 --- a/src/main/java/org/torproject/onionoo/docs/ClientsStatus.java +++ b/src/main/java/org/torproject/onionoo/docs/ClientsStatus.java @@ -6,8 +6,19 @@ import java.util.Scanner; import java.util.SortedSet; import java.util.TreeSet; +import org.torproject.onionoo.util.DateTimeHelper; +import org.torproject.onionoo.util.TimeFactory; + public class ClientsStatus extends Document { + private transient boolean isDirty = false; + public boolean isDirty() { + return this.isDirty; + } + public void clearDirty() { + this.isDirty = false; + } + private SortedSet<ClientsHistory> history = new TreeSet<ClientsHistory>(); public void setHistory(SortedSet<ClientsHistory> history) { @@ -32,6 +43,60 @@ public class ClientsStatus extends Document { s.close(); } + public void addToHistory(SortedSet<ClientsHistory> newIntervals) { + for (ClientsHistory interval : newIntervals) { + if ((this.history.headSet(interval).isEmpty() || + this.history.headSet(interval).last().getEndMillis() <= + interval.getStartMillis()) && + (this.history.tailSet(interval).isEmpty() || + this.history.tailSet(interval).first().getStartMillis() >= + interval.getEndMillis())) { + this.history.add(interval); + this.isDirty = true; + } + } + } + + public void compressHistory() { + SortedSet<ClientsHistory> uncompressedHistory = + new TreeSet<ClientsHistory>(this.history); + history.clear(); + ClientsHistory lastResponses = null; + String lastMonthString = "1970-01"; + long now = TimeFactory.getTime().currentTimeMillis(); + for (ClientsHistory responses : uncompressedHistory) { + long intervalLengthMillis; + if (now - responses.getEndMillis() <= + DateTimeHelper.ROUGHLY_THREE_MONTHS) { + intervalLengthMillis = DateTimeHelper.ONE_DAY; + } else if (now - responses.getEndMillis() <= + DateTimeHelper.ROUGHLY_ONE_YEAR) { + intervalLengthMillis = DateTimeHelper.TWO_DAYS; + } else { + intervalLengthMillis = DateTimeHelper.TEN_DAYS; + } + String monthString = DateTimeHelper.format( + responses.getStartMillis(), + DateTimeHelper.ISO_YEARMONTH_FORMAT); + if (lastResponses != null && + lastResponses.getEndMillis() == responses.getStartMillis() && + ((lastResponses.getEndMillis() - 1L) / intervalLengthMillis) == + ((responses.getEndMillis() - 1L) / intervalLengthMillis) && + lastMonthString.equals(monthString)) { + lastResponses.addResponses(responses); + } else { + if (lastResponses != null) { + this.history.add(lastResponses); + } + lastResponses = responses; + } + lastMonthString = monthString; + } + if (lastResponses != null) { + this.history.add(lastResponses); + } + } + public String toDocumentString() { StringBuilder sb = new StringBuilder(); for (ClientsHistory interval : this.history) { diff --git a/src/main/java/org/torproject/onionoo/updater/ClientsStatusUpdater.java b/src/main/java/org/torproject/onionoo/updater/ClientsStatusUpdater.java index 72d5142..a8797ba 100644 --- a/src/main/java/org/torproject/onionoo/updater/ClientsStatusUpdater.java +++ b/src/main/java/org/torproject/onionoo/updater/ClientsStatusUpdater.java @@ -16,7 +16,6 @@ import org.torproject.onionoo.docs.DocumentStore; import org.torproject.onionoo.docs.DocumentStoreFactory; import org.torproject.onionoo.util.DateTimeHelper; import org.torproject.onionoo.util.Logger; -import org.torproject.onionoo.util.TimeFactory; /* * Example extra-info descriptor used as input: @@ -43,12 +42,9 @@ public class ClientsStatusUpdater implements DescriptorListener, private DocumentStore documentStore; - private long now; - public ClientsStatusUpdater() { this.descriptorSource = DescriptorSourceFactory.getDescriptorSource(); this.documentStore = DocumentStoreFactory.getDocumentStore(); - this.now = TimeFactory.getTime().currentTimeMillis(); this.registerDescriptorListeners(); } @@ -152,67 +148,15 @@ public class ClientsStatusUpdater implements DescriptorListener, if (clientsStatus == null) { clientsStatus = new ClientsStatus(); } - this.addToHistory(clientsStatus, e.getValue()); - this.compressHistory(clientsStatus); - this.documentStore.store(clientsStatus, hashedFingerprint); - } - } - - private void addToHistory(ClientsStatus clientsStatus, - SortedSet<ClientsHistory> newIntervals) { - SortedSet<ClientsHistory> history = clientsStatus.getHistory(); - for (ClientsHistory interval : newIntervals) { - if ((history.headSet(interval).isEmpty() || - history.headSet(interval).last().getEndMillis() <= - interval.getStartMillis()) && - (history.tailSet(interval).isEmpty() || - history.tailSet(interval).first().getStartMillis() >= - interval.getEndMillis())) { - history.add(interval); + clientsStatus.addToHistory(e.getValue()); + if (clientsStatus.isDirty()) { + clientsStatus.compressHistory(); + this.documentStore.store(clientsStatus, hashedFingerprint); + clientsStatus.clearDirty(); } } } - private void compressHistory(ClientsStatus clientsStatus) { - SortedSet<ClientsHistory> history = clientsStatus.getHistory(); - SortedSet<ClientsHistory> compressedHistory = - new TreeSet<ClientsHistory>(); - ClientsHistory lastResponses = null; - String lastMonthString = "1970-01"; - for (ClientsHistory responses : history) { - long intervalLengthMillis; - if (this.now - responses.getEndMillis() <= - DateTimeHelper.ROUGHLY_THREE_MONTHS) { - intervalLengthMillis = DateTimeHelper.ONE_DAY; - } else if (this.now - responses.getEndMillis() <= - DateTimeHelper.ROUGHLY_ONE_YEAR) { - intervalLengthMillis = DateTimeHelper.TWO_DAYS; - } else { - intervalLengthMillis = DateTimeHelper.TEN_DAYS; - } - String monthString = DateTimeHelper.format( - responses.getStartMillis(), - DateTimeHelper.ISO_YEARMONTH_FORMAT); - if (lastResponses != null && - lastResponses.getEndMillis() == responses.getStartMillis() && - ((lastResponses.getEndMillis() - 1L) / intervalLengthMillis) == - ((responses.getEndMillis() - 1L) / intervalLengthMillis) && - lastMonthString.equals(monthString)) { - lastResponses.addResponses(responses); - } else { - if (lastResponses != null) { - compressedHistory.add(lastResponses); - } - lastResponses = responses; - } - lastMonthString = monthString; - } - if (lastResponses != null) { - compressedHistory.add(lastResponses); - } - clientsStatus.setHistory(compressedHistory); - } - public String getStatsString() { int newIntervals = 0; for (SortedSet<ClientsHistory> hist : this.newResponses.values()) { [View Less]

1 0

[onionoo/master] Take out an unused synchronized block.
by karsten＠torproject.org 17 Aug '14

17 Aug '14

commit 7b9de70416b1a03c5fc9985f9c19f4f76a190db2 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Aug 15 11:02:42 2014 +0200 Take out an unused synchronized block. Forgot to remove this block in 97fbdee. --- .../onionoo/updater/WeightsStatusUpdater.java | 22 +++++++------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/src/main/java/org/torproject/onionoo/updater/WeightsStatusUpdater.java b/src/main/java/org/torproject/onionoo/… [View More]

1 0

[onionoo/master] Make WeightsStatus smarter about itself.
by karsten＠torproject.org 17 Aug '14

17 Aug '14

commit a902feb6bac7b03cedfa3148671039cca00ea8ee Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Aug 15 11:13:14 2014 +0200 Make WeightsStatus smarter about itself. Removes another dependency on DateTimeHelper, which gets us closer to implementing #12866. --- .../org/torproject/onionoo/docs/WeightsStatus.java | 93 +++++++++++++++++ .../onionoo/updater/WeightsStatusUpdater.java | 106 ++------------------ 2 files changed, 104 insertions(+), 95 … [View More]deletions(-) diff --git a/src/main/java/org/torproject/onionoo/docs/WeightsStatus.java b/src/main/java/org/torproject/onionoo/docs/WeightsStatus.java index 678789b..ccc818a 100644 --- a/src/main/java/org/torproject/onionoo/docs/WeightsStatus.java +++ b/src/main/java/org/torproject/onionoo/docs/WeightsStatus.java @@ -8,9 +8,18 @@ import java.util.SortedMap; import java.util.TreeMap; import org.torproject.onionoo.util.DateTimeHelper; +import org.torproject.onionoo.util.TimeFactory; public class WeightsStatus extends Document { + private transient boolean isDirty = false; + public boolean isDirty() { + return this.isDirty; + } + public void clearDirty() { + this.isDirty = false; + } + private SortedMap<long[], double[]> history = new TreeMap<long[], double[]>(new Comparator<long[]>() { public int compare(long[] a, long[] b) { @@ -77,6 +86,90 @@ public class WeightsStatus extends Document { s.close(); } + public void addToHistory(long validAfterMillis, long freshUntilMillis, + double[] weights) { + long[] interval = new long[] { validAfterMillis, freshUntilMillis }; + if ((this.history.headMap(interval).isEmpty() || + this.history.headMap(interval).lastKey()[1] <= + validAfterMillis) && + (this.history.tailMap(interval).isEmpty() || + this.history.tailMap(interval).firstKey()[0] >= + freshUntilMillis)) { + this.history.put(interval, weights); + this.isDirty = true; + } + } + + public void compressHistory() { + SortedMap<long[], double[]> uncompressedHistory = + new TreeMap<long[], double[]>(this.history); + history.clear(); + long lastStartMillis = 0L, lastEndMillis = 0L; + double[] lastWeights = null; + String lastMonthString = "1970-01"; + int lastMissingValues = -1; + long now = TimeFactory.getTime().currentTimeMillis(); + for (Map.Entry<long[], double[]> e : uncompressedHistory.entrySet()) { + long startMillis = e.getKey()[0], endMillis = e.getKey()[1]; + double[] weights = e.getValue(); + long intervalLengthMillis; + if (now - endMillis <= DateTimeHelper.ONE_WEEK) { + intervalLengthMillis = DateTimeHelper.ONE_HOUR; + } else if (now - endMillis <= + DateTimeHelper.ROUGHLY_ONE_MONTH) { + intervalLengthMillis = DateTimeHelper.FOUR_HOURS; + } else if (now - endMillis <= + DateTimeHelper.ROUGHLY_THREE_MONTHS) { + intervalLengthMillis = DateTimeHelper.TWELVE_HOURS; + } else if (now - endMillis <= + DateTimeHelper.ROUGHLY_ONE_YEAR) { + intervalLengthMillis = DateTimeHelper.TWO_DAYS; + } else { + intervalLengthMillis = DateTimeHelper.TEN_DAYS; + } + String monthString = DateTimeHelper.format(startMillis, + DateTimeHelper.ISO_YEARMONTH_FORMAT); + int missingValues = 0; + for (int i = 0; i < weights.length; i++) { + if (weights[i] < -0.5) { + missingValues += 1 << i; + } + } + if (lastEndMillis == startMillis && + ((lastEndMillis - 1L) / intervalLengthMillis) == + ((endMillis - 1L) / intervalLengthMillis) && + lastMonthString.equals(monthString) && + lastMissingValues == missingValues) { + double lastIntervalInHours = (double) ((lastEndMillis + - lastStartMillis) / DateTimeHelper.ONE_HOUR); + double currentIntervalInHours = (double) ((endMillis + - startMillis) / DateTimeHelper.ONE_HOUR); + double newIntervalInHours = (double) ((endMillis + - lastStartMillis) / DateTimeHelper.ONE_HOUR); + 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) { + this.history.put(new long[] { lastStartMillis, lastEndMillis }, + lastWeights); + } + lastStartMillis = startMillis; + lastEndMillis = endMillis; + lastWeights = weights; + } + lastMonthString = monthString; + lastMissingValues = missingValues; + } + if (lastStartMillis > 0L) { + this.history.put(new long[] { lastStartMillis, lastEndMillis }, + lastWeights); + } + } + public String toDocumentString() { StringBuilder sb = new StringBuilder(); for (Map.Entry<String, Integer> e : diff --git a/src/main/java/org/torproject/onionoo/updater/WeightsStatusUpdater.java b/src/main/java/org/torproject/onionoo/updater/WeightsStatusUpdater.java index f13ad14..2be213f 100644 --- a/src/main/java/org/torproject/onionoo/updater/WeightsStatusUpdater.java +++ b/src/main/java/org/torproject/onionoo/updater/WeightsStatusUpdater.java @@ -16,8 +16,6 @@ import org.torproject.descriptor.ServerDescriptor; import org.torproject.onionoo.docs.DocumentStore; import org.torproject.onionoo.docs.DocumentStoreFactory; import org.torproject.onionoo.docs.WeightsStatus; -import org.torproject.onionoo.util.DateTimeHelper; -import org.torproject.onionoo.util.TimeFactory; public class WeightsStatusUpdater implements DescriptorListener, StatusUpdater { @@ -26,12 +24,9 @@ public class WeightsStatusUpdater implements DescriptorListener, private DocumentStore documentStore; - private long now; - public WeightsStatusUpdater() { this.descriptorSource = DescriptorSourceFactory.getDescriptorSource(); this.documentStore = DocumentStoreFactory.getDocumentStore(); - this.now = TimeFactory.getTime().currentTimeMillis(); this.registerDescriptorListeners(); } @@ -90,9 +85,19 @@ public class WeightsStatusUpdater implements DescriptorListener, for (Map.Entry<String, double[]> e : pathSelectionWeights.entrySet()) { String fingerprint = e.getKey(); + WeightsStatus weightsStatus = this.documentStore.retrieve( + WeightsStatus.class, true, fingerprint); + if (weightsStatus == null) { + weightsStatus = new WeightsStatus(); + } double[] weights = e.getValue(); - this.addToHistory(fingerprint, validAfterMillis, freshUntilMillis, + weightsStatus.addToHistory(validAfterMillis, freshUntilMillis, weights); + if (weightsStatus.isDirty()) { + weightsStatus.compressHistory(); + this.documentStore.store(weightsStatus, fingerprint); + weightsStatus.clearDirty(); + } } } @@ -228,95 +233,6 @@ public class WeightsStatusUpdater implements DescriptorListener, return pathSelectionProbabilities; } - private void addToHistory(String fingerprint, long validAfterMillis, - long freshUntilMillis, double[] weights) { - WeightsStatus weightsStatus = this.documentStore.retrieve( - WeightsStatus.class, true, fingerprint); - if (weightsStatus == null) { - weightsStatus = new WeightsStatus(); - } - SortedMap<long[], double[]> history = weightsStatus.getHistory(); - 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); - this.compressHistory(weightsStatus); - this.documentStore.store(weightsStatus, fingerprint); - } - } - - private void compressHistory(WeightsStatus weightsStatus) { - SortedMap<long[], double[]> history = weightsStatus.getHistory(); - SortedMap<long[], double[]> compressedHistory = - new TreeMap<long[], double[]>(history.comparator()); - long lastStartMillis = 0L, lastEndMillis = 0L; - double[] lastWeights = null; - String lastMonthString = "1970-01"; - int lastMissingValues = -1; - 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 <= DateTimeHelper.ONE_WEEK) { - intervalLengthMillis = DateTimeHelper.ONE_HOUR; - } else if (this.now - endMillis <= - DateTimeHelper.ROUGHLY_ONE_MONTH) { - intervalLengthMillis = DateTimeHelper.FOUR_HOURS; - } else if (this.now - endMillis <= - DateTimeHelper.ROUGHLY_THREE_MONTHS) { - intervalLengthMillis = DateTimeHelper.TWELVE_HOURS; - } else if (this.now - endMillis <= - DateTimeHelper.ROUGHLY_ONE_YEAR) { - intervalLengthMillis = DateTimeHelper.TWO_DAYS; - } else { - intervalLengthMillis = DateTimeHelper.TEN_DAYS; - } - String monthString = DateTimeHelper.format(startMillis, - DateTimeHelper.ISO_YEARMONTH_FORMAT); - int missingValues = 0; - for (int i = 0; i < weights.length; i++) { - if (weights[i] < -0.5) { - missingValues += 1 << i; - } - } - if (lastEndMillis == startMillis && - ((lastEndMillis - 1L) / intervalLengthMillis) == - ((endMillis - 1L) / intervalLengthMillis) && - lastMonthString.equals(monthString) && - lastMissingValues == missingValues) { - double lastIntervalInHours = (double) ((lastEndMillis - - lastStartMillis) / DateTimeHelper.ONE_HOUR); - double currentIntervalInHours = (double) ((endMillis - - startMillis) / DateTimeHelper.ONE_HOUR); - double newIntervalInHours = (double) ((endMillis - - lastStartMillis) / DateTimeHelper.ONE_HOUR); - 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; - } - lastMonthString = monthString; - lastMissingValues = missingValues; - } - if (lastStartMillis > 0L) { - compressedHistory.put(new long[] { lastStartMillis, lastEndMillis }, - lastWeights); - } - weightsStatus.setHistory(compressedHistory); - } - public String getStatsString() { /* TODO Add statistics string. */ return null; [View Less]

1 0

[onionoo/master] Make BandwidthStatus smarter about itself.
by karsten＠torproject.org 17 Aug '14

17 Aug '14

commit ca10a8da5a0d30216c6365faca9cff7ba40a2d7a Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Aug 15 18:54:28 2014 +0200 Make BandwidthStatus smarter about itself. Removes another dependency on DateTimeHelper, which gets us closer to implementing #12866. --- .../torproject/onionoo/docs/BandwidthStatus.java | 92 ++++++++++++++++++++ .../onionoo/updater/BandwidthStatusUpdater.java | 88 ++----------------- 2 files changed, 98 insertions(+), 82 … [View More]deletions(-) diff --git a/src/main/java/org/torproject/onionoo/docs/BandwidthStatus.java b/src/main/java/org/torproject/onionoo/docs/BandwidthStatus.java index a2980e5..c01a242 100644 --- a/src/main/java/org/torproject/onionoo/docs/BandwidthStatus.java +++ b/src/main/java/org/torproject/onionoo/docs/BandwidthStatus.java @@ -2,14 +2,25 @@ * See LICENSE for licensing information */ package org.torproject.onionoo.docs; +import java.util.Map; import java.util.Scanner; import java.util.SortedMap; import java.util.TreeMap; +import org.torproject.descriptor.BandwidthHistory; import org.torproject.onionoo.util.DateTimeHelper; +import org.torproject.onionoo.util.TimeFactory; public class BandwidthStatus extends Document { + private transient boolean isDirty = false; + public boolean isDirty() { + return this.isDirty; + } + public void clearDirty() { + this.isDirty = false; + } + private SortedMap<Long, long[]> writeHistory = new TreeMap<Long, long[]>(); public void setWriteHistory(SortedMap<Long, long[]> writeHistory) { @@ -62,6 +73,87 @@ public class BandwidthStatus extends Document { s.close(); } + public void addToWriteHistory(BandwidthHistory bandwidthHistory) { + this.addToHistory(this.writeHistory, bandwidthHistory); + } + + public void addToReadHistory(BandwidthHistory bandwidthHistory) { + this.addToHistory(this.readHistory, bandwidthHistory); + } + + private void addToHistory(SortedMap<Long, long[]> history, + BandwidthHistory bandwidthHistory) { + long intervalMillis = bandwidthHistory.getIntervalLength() + * DateTimeHelper.ONE_SECOND; + for (Map.Entry<Long, Long> e : + bandwidthHistory.getBandwidthValues().entrySet()) { + long endMillis = e.getKey(), + startMillis = endMillis - intervalMillis; + long bandwidthValue = e.getValue(); + /* TODO Should we first check whether an interval is already + * contained in history? */ + history.put(startMillis, new long[] { startMillis, endMillis, + bandwidthValue }); + this.isDirty = true; + } + } + + public void compressHistory() { + this.compressHistory(this.writeHistory); + this.compressHistory(this.readHistory); + } + + private void compressHistory(SortedMap<Long, long[]> history) { + SortedMap<Long, long[]> uncompressedHistory = + new TreeMap<Long, long[]>(history); + history.clear(); + long lastStartMillis = 0L, lastEndMillis = 0L, lastBandwidth = 0L; + String lastMonthString = "1970-01"; + long now = TimeFactory.getTime().currentTimeMillis(); + for (long[] v : uncompressedHistory.values()) { + long startMillis = v[0], endMillis = v[1], bandwidth = v[2]; + long intervalLengthMillis; + if (now - endMillis <= DateTimeHelper.THREE_DAYS) { + intervalLengthMillis = DateTimeHelper.FIFTEEN_MINUTES; + } else if (now - endMillis <= DateTimeHelper.ONE_WEEK) { + intervalLengthMillis = DateTimeHelper.ONE_HOUR; + } else if (now - endMillis <= + DateTimeHelper.ROUGHLY_ONE_MONTH) { + intervalLengthMillis = DateTimeHelper.FOUR_HOURS; + } else if (now - endMillis <= + DateTimeHelper.ROUGHLY_THREE_MONTHS) { + intervalLengthMillis = DateTimeHelper.TWELVE_HOURS; + } else if (now - endMillis <= + DateTimeHelper.ROUGHLY_ONE_YEAR) { + intervalLengthMillis = DateTimeHelper.TWO_DAYS; + } else { + intervalLengthMillis = DateTimeHelper.TEN_DAYS; + } + String monthString = DateTimeHelper.format(startMillis, + DateTimeHelper.ISO_YEARMONTH_FORMAT); + if (lastEndMillis == startMillis && + ((lastEndMillis - 1L) / intervalLengthMillis) == + ((endMillis - 1L) / intervalLengthMillis) && + lastMonthString.equals(monthString)) { + lastEndMillis = endMillis; + lastBandwidth += bandwidth; + } else { + if (lastStartMillis > 0L) { + history.put(lastStartMillis, new long[] { lastStartMillis, + lastEndMillis, lastBandwidth }); + } + lastStartMillis = startMillis; + lastEndMillis = endMillis; + lastBandwidth = bandwidth; + } + lastMonthString = monthString; + } + if (lastStartMillis > 0L) { + history.put(lastStartMillis, new long[] { lastStartMillis, + lastEndMillis, lastBandwidth }); + } + } + public String toDocumentString() { StringBuilder sb = new StringBuilder(); for (long[] v : writeHistory.values()) { diff --git a/src/main/java/org/torproject/onionoo/updater/BandwidthStatusUpdater.java b/src/main/java/org/torproject/onionoo/updater/BandwidthStatusUpdater.java index 5c27464..9a7717c 100644 --- a/src/main/java/org/torproject/onionoo/updater/BandwidthStatusUpdater.java +++ b/src/main/java/org/torproject/onionoo/updater/BandwidthStatusUpdater.java @@ -2,18 +2,11 @@ * See LICENSE for licensing information */ package org.torproject.onionoo.updater; -import java.util.Map; -import java.util.SortedMap; -import java.util.TreeMap; - -import org.torproject.descriptor.BandwidthHistory; import org.torproject.descriptor.Descriptor; import org.torproject.descriptor.ExtraInfoDescriptor; import org.torproject.onionoo.docs.BandwidthStatus; import org.torproject.onionoo.docs.DocumentStore; import org.torproject.onionoo.docs.DocumentStoreFactory; -import org.torproject.onionoo.util.DateTimeHelper; -import org.torproject.onionoo.util.TimeFactory; public class BandwidthStatusUpdater implements DescriptorListener, StatusUpdater { @@ -22,12 +15,9 @@ public class BandwidthStatusUpdater implements DescriptorListener, private DocumentStore documentStore; - private long now; - public BandwidthStatusUpdater() { this.descriptorSource = DescriptorSourceFactory.getDescriptorSource(); this.documentStore = DocumentStoreFactory.getDocumentStore(); - this.now = TimeFactory.getTime().currentTimeMillis(); this.registerDescriptorListeners(); } @@ -56,81 +46,15 @@ public class BandwidthStatusUpdater implements DescriptorListener, bandwidthStatus = new BandwidthStatus(); } if (descriptor.getWriteHistory() != null) { - this.parseHistory(descriptor.getWriteHistory(), - bandwidthStatus.getWriteHistory()); + bandwidthStatus.addToWriteHistory(descriptor.getWriteHistory()); } if (descriptor.getReadHistory() != null) { - this.parseHistory(descriptor.getReadHistory(), - bandwidthStatus.getReadHistory()); - } - this.compressHistory(bandwidthStatus.getWriteHistory()); - this.compressHistory(bandwidthStatus.getReadHistory()); - this.documentStore.store(bandwidthStatus, fingerprint); - } - - private void parseHistory(BandwidthHistory bandwidthHistory, - SortedMap<Long, long[]> history) { - long intervalMillis = bandwidthHistory.getIntervalLength() - * DateTimeHelper.ONE_SECOND; - for (Map.Entry<Long, Long> e : - bandwidthHistory.getBandwidthValues().entrySet()) { - long endMillis = e.getKey(), - startMillis = endMillis - intervalMillis; - long bandwidthValue = e.getValue(); - /* TODO Should we first check whether an interval is already - * contained in history? */ - history.put(startMillis, new long[] { startMillis, endMillis, - bandwidthValue }); - } - } - - private void compressHistory(SortedMap<Long, long[]> history) { - SortedMap<Long, long[]> uncompressedHistory = - new TreeMap<Long, long[]>(history); - history.clear(); - long lastStartMillis = 0L, lastEndMillis = 0L, lastBandwidth = 0L; - String lastMonthString = "1970-01"; - for (long[] v : uncompressedHistory.values()) { - long startMillis = v[0], endMillis = v[1], bandwidth = v[2]; - long intervalLengthMillis; - if (this.now - endMillis <= DateTimeHelper.THREE_DAYS) { - intervalLengthMillis = DateTimeHelper.FIFTEEN_MINUTES; - } else if (this.now - endMillis <= DateTimeHelper.ONE_WEEK) { - intervalLengthMillis = DateTimeHelper.ONE_HOUR; - } else if (this.now - endMillis <= - DateTimeHelper.ROUGHLY_ONE_MONTH) { - intervalLengthMillis = DateTimeHelper.FOUR_HOURS; - } else if (this.now - endMillis <= - DateTimeHelper.ROUGHLY_THREE_MONTHS) { - intervalLengthMillis = DateTimeHelper.TWELVE_HOURS; - } else if (this.now - endMillis <= - DateTimeHelper.ROUGHLY_ONE_YEAR) { - intervalLengthMillis = DateTimeHelper.TWO_DAYS; - } else { - intervalLengthMillis = DateTimeHelper.TEN_DAYS; - } - String monthString = DateTimeHelper.format(startMillis, - DateTimeHelper.ISO_YEARMONTH_FORMAT); - if (lastEndMillis == startMillis && - ((lastEndMillis - 1L) / intervalLengthMillis) == - ((endMillis - 1L) / intervalLengthMillis) && - lastMonthString.equals(monthString)) { - lastEndMillis = endMillis; - lastBandwidth += bandwidth; - } else { - if (lastStartMillis > 0L) { - history.put(lastStartMillis, new long[] { lastStartMillis, - lastEndMillis, lastBandwidth }); - } - lastStartMillis = startMillis; - lastEndMillis = endMillis; - lastBandwidth = bandwidth; - } - lastMonthString = monthString; + bandwidthStatus.addToReadHistory(descriptor.getReadHistory()); } - if (lastStartMillis > 0L) { - history.put(lastStartMillis, new long[] { lastStartMillis, - lastEndMillis, lastBandwidth }); + if (bandwidthStatus.isDirty()) { + bandwidthStatus.compressHistory(); + this.documentStore.store(bandwidthStatus, fingerprint); + bandwidthStatus.clearDirty(); } } [View Less]

1 0

[onionoo/master] Remove some references to DateTimeHelper constants.
by karsten＠torproject.org 17 Aug '14

17 Aug '14

commit 1576e9ad60d6bfe08fb9945772c6d239a76ffbce Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Aug 15 12:05:31 2014 +0200 Remove some references to DateTimeHelper constants. --- .../org/torproject/onionoo/server/NodeIndexer.java | 14 +++++++----- .../onionoo/server/PerformanceMetrics.java | 16 +++++++------ .../torproject/onionoo/server/ResourceServlet.java | 24 ++++++++++++-------- .../onionoo/updater/ReverseDomainNameResolver.java | 9 +++----- … [View More].../java/org/torproject/onionoo/util/Logger.java | 9 ++++---- .../onionoo/UptimeDocumentWriterTest.java | 9 ++++---- 6 files changed, 45 insertions(+), 36 deletions(-) diff --git a/src/main/java/org/torproject/onionoo/server/NodeIndexer.java b/src/main/java/org/torproject/onionoo/server/NodeIndexer.java index 1cbd75e..bafd442 100644 --- a/src/main/java/org/torproject/onionoo/server/NodeIndexer.java +++ b/src/main/java/org/torproject/onionoo/server/NodeIndexer.java @@ -20,7 +20,6 @@ import org.torproject.onionoo.docs.DocumentStore; import org.torproject.onionoo.docs.DocumentStoreFactory; import org.torproject.onionoo.docs.SummaryDocument; import org.torproject.onionoo.docs.UpdateStatus; -import org.torproject.onionoo.util.DateTimeHelper; import org.torproject.onionoo.util.Time; import org.torproject.onionoo.util.TimeFactory; @@ -77,11 +76,14 @@ public class NodeIndexer implements ServletContextListener, Runnable { } } + private static final long ONE_MINUTE = 60L * 1000L, + ONE_DAY = 24L * 60L * ONE_MINUTE; + public void run() { while (this.nodeIndexerThread != null) { this.indexNodeStatuses(); try { - Thread.sleep(DateTimeHelper.ONE_MINUTE); + Thread.sleep(ONE_MINUTE); } catch (InterruptedException e) { } } @@ -191,7 +193,7 @@ public class NodeIndexer implements ServletContextListener, Runnable { newRelaysByFamily.put(fingerprint, entry.getFamilyFingerprints()); } int daysSinceFirstSeen = (int) ((time.currentTimeMillis() - - entry.getFirstSeenMillis()) / DateTimeHelper.ONE_DAY); + - entry.getFirstSeenMillis()) / ONE_DAY); if (!newRelaysByFirstSeenDays.containsKey(daysSinceFirstSeen)) { newRelaysByFirstSeenDays.put(daysSinceFirstSeen, new HashSet<String>()); @@ -200,7 +202,7 @@ public class NodeIndexer implements ServletContextListener, Runnable { newRelaysByFirstSeenDays.get(daysSinceFirstSeen).add( hashedFingerprint); int daysSinceLastSeen = (int) ((time.currentTimeMillis() - - entry.getLastSeenMillis()) / DateTimeHelper.ONE_DAY); + - entry.getLastSeenMillis()) / ONE_DAY); if (!newRelaysByLastSeenDays.containsKey(daysSinceLastSeen)) { newRelaysByLastSeenDays.put(daysSinceLastSeen, new HashSet<String>()); @@ -250,7 +252,7 @@ public class NodeIndexer implements ServletContextListener, Runnable { hashedHashedFingerprint); } int daysSinceFirstSeen = (int) ((time.currentTimeMillis() - - entry.getFirstSeenMillis()) / DateTimeHelper.ONE_DAY); + - entry.getFirstSeenMillis()) / ONE_DAY); if (!newBridgesByFirstSeenDays.containsKey(daysSinceFirstSeen)) { newBridgesByFirstSeenDays.put(daysSinceFirstSeen, new HashSet<String>()); @@ -260,7 +262,7 @@ public class NodeIndexer implements ServletContextListener, Runnable { newBridgesByFirstSeenDays.get(daysSinceFirstSeen).add( hashedHashedFingerprint); int daysSinceLastSeen = (int) ((time.currentTimeMillis() - - entry.getLastSeenMillis()) / DateTimeHelper.ONE_DAY); + - entry.getLastSeenMillis()) / ONE_DAY); if (!newBridgesByLastSeenDays.containsKey(daysSinceLastSeen)) { newBridgesByLastSeenDays.put(daysSinceLastSeen, new HashSet<String>()); diff --git a/src/main/java/org/torproject/onionoo/server/PerformanceMetrics.java b/src/main/java/org/torproject/onionoo/server/PerformanceMetrics.java index 09a20a2..9d9f3be 100644 --- a/src/main/java/org/torproject/onionoo/server/PerformanceMetrics.java +++ b/src/main/java/org/torproject/onionoo/server/PerformanceMetrics.java @@ -14,7 +14,6 @@ import java.util.TimeZone; import java.util.TreeMap; import java.util.TreeSet; -import org.torproject.onionoo.util.DateTimeHelper; import org.torproject.onionoo.util.Time; import org.torproject.onionoo.util.TimeFactory; @@ -124,7 +123,8 @@ public class PerformanceMetrics { private static long lastLoggedMillis = -1L; - private static final long LOG_INTERVAL = DateTimeHelper.ONE_HOUR; + private static final long LOG_INTERVAL_SECONDS = 60L * 60L, + LOG_INTERVAL_MILLIS = LOG_INTERVAL_SECONDS * 1000L; private static Counter totalProcessedRequests = new Counter(); @@ -151,13 +151,14 @@ public class PerformanceMetrics { if (lastLoggedMillis < 0L) { lastLoggedMillis = time.currentTimeMillis(); } else if (receivedRequestMillis - lastLoggedMillis > - LOG_INTERVAL) { + LOG_INTERVAL_MILLIS) { SimpleDateFormat dateTimeFormat = new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss"); dateTimeFormat.setTimeZone(TimeZone.getTimeZone("UTC")); System.err.println("Request statistics (" - + dateTimeFormat.format(lastLoggedMillis + LOG_INTERVAL) - + ", " + (LOG_INTERVAL / DateTimeHelper.ONE_SECOND) + " s):"); + + dateTimeFormat.format(lastLoggedMillis + + LOG_INTERVAL_MILLIS) + ", " + (LOG_INTERVAL_SECONDS) + + " s):"); System.err.println(" Total processed requests: " + totalProcessedRequests); System.err.println(" Most frequently requested resource: " @@ -183,8 +184,9 @@ public class PerformanceMetrics { handleRequestMillis.clear(); buildResponseMillis.clear(); do { - lastLoggedMillis += LOG_INTERVAL; - } while (receivedRequestMillis - lastLoggedMillis > LOG_INTERVAL); + lastLoggedMillis += LOG_INTERVAL_MILLIS; + } while (receivedRequestMillis - lastLoggedMillis > + LOG_INTERVAL_MILLIS); } totalProcessedRequests.increment(); handleRequestMillis.addLong(parsedRequestMillis diff --git a/src/main/java/org/torproject/onionoo/server/ResourceServlet.java b/src/main/java/org/torproject/onionoo/server/ResourceServlet.java index 5f22c39..d527962 100644 --- a/src/main/java/org/torproject/onionoo/server/ResourceServlet.java +++ b/src/main/java/org/torproject/onionoo/server/ResourceServlet.java @@ -17,7 +17,6 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.torproject.onionoo.util.DateTimeHelper; import org.torproject.onionoo.util.Time; import org.torproject.onionoo.util.TimeFactory; @@ -35,12 +34,14 @@ public class ResourceServlet extends HttpServlet { config.getInitParameter("maintenance").equals("1"); } + private static final long INDEX_WAITING_TIME = 10L * 1000L; + public long getLastModified(HttpServletRequest request) { if (this.maintenanceMode) { return super.getLastModified(request); } else { return NodeIndexerFactory.getNodeIndexer().getLastIndexed( - DateTimeHelper.TEN_SECONDS); + INDEX_WAITING_TIME); } } @@ -53,6 +54,11 @@ public class ResourceServlet extends HttpServlet { this.doGet(requestWrapper, responseWrapper); } + private static final long INDEX_MAX_AGE = 6L * 60L * 60L * 1000L, + CACHE_MIN_TIME = 5L * 60L * 1000L, + CACHE_MAX_TIME = 45L * 60L * 1000L, + CACHE_INTERVAL = 5L * 60L * 1000L; + public void doGet(HttpServletRequestWrapper request, HttpServletResponseWrapper response) throws IOException { @@ -64,18 +70,18 @@ public class ResourceServlet extends HttpServlet { long nowMillis = TimeFactory.getTime().currentTimeMillis(); long indexWrittenMillis = NodeIndexerFactory.getNodeIndexer().getLastIndexed( - DateTimeHelper.TEN_SECONDS); + INDEX_WAITING_TIME); long indexAgeMillis = nowMillis - indexWrittenMillis; - if (indexAgeMillis > DateTimeHelper.SIX_HOURS) { + if (indexAgeMillis > INDEX_MAX_AGE) { response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); return; } - long cacheMaxAgeMillis = Math.max(DateTimeHelper.FIVE_MINUTES, - ((DateTimeHelper.FOURTY_FIVE_MINUTES - indexAgeMillis) - / DateTimeHelper.FIVE_MINUTES) * DateTimeHelper.FIVE_MINUTES); + long cacheMaxAgeMillis = Math.max(CACHE_MIN_TIME, + ((CACHE_MAX_TIME - indexAgeMillis) + / CACHE_INTERVAL) * CACHE_INTERVAL); NodeIndex nodeIndex = NodeIndexerFactory.getNodeIndexer(). - getLatestNodeIndex(DateTimeHelper.TEN_SECONDS); + getLatestNodeIndex(INDEX_WAITING_TIME); if (nodeIndex == null) { response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); return; @@ -311,7 +317,7 @@ public class ResourceServlet extends HttpServlet { response.setContentType("application/json"); response.setCharacterEncoding("utf-8"); response.setHeader("Cache-Control", "public, max-age=" - + (cacheMaxAgeMillis / DateTimeHelper.ONE_SECOND)); + + (cacheMaxAgeMillis / 1000L)); PrintWriter pw = response.getWriter(); rb.buildResponse(pw); int relayDocumentsWritten = rh.getOrderedRelays().size(); diff --git a/src/main/java/org/torproject/onionoo/updater/ReverseDomainNameResolver.java b/src/main/java/org/torproject/onionoo/updater/ReverseDomainNameResolver.java index 833c900..dc662a5 100644 --- a/src/main/java/org/torproject/onionoo/updater/ReverseDomainNameResolver.java +++ b/src/main/java/org/torproject/onionoo/updater/ReverseDomainNameResolver.java @@ -10,7 +10,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.torproject.onionoo.util.DateTimeHelper; import org.torproject.onionoo.util.Logger; import org.torproject.onionoo.util.Time; import org.torproject.onionoo.util.TimeFactory; @@ -23,12 +22,10 @@ public class ReverseDomainNameResolver { this.time = TimeFactory.getTime(); } - static final long RDNS_LOOKUP_MAX_REQUEST_MILLIS = - DateTimeHelper.TEN_SECONDS; - static final long RDNS_LOOKUP_MAX_DURATION_MILLIS = - DateTimeHelper.FIVE_MINUTES; + static final long RDNS_LOOKUP_MAX_REQUEST_MILLIS = 10L * 1000L; + static final long RDNS_LOOKUP_MAX_DURATION_MILLIS = 5L * 60L * 1000L; private static final long RDNS_LOOKUP_MAX_AGE_MILLIS = - DateTimeHelper.TWELVE_HOURS; + 12L * 60L * 60L * 1000L; private static final int RDNS_LOOKUP_WORKERS_NUM = 5; private Map<String, Long> addressLastLookupTimes; diff --git a/src/main/java/org/torproject/onionoo/util/Logger.java b/src/main/java/org/torproject/onionoo/util/Logger.java index b85059d..a9c7cde 100644 --- a/src/main/java/org/torproject/onionoo/util/Logger.java +++ b/src/main/java/org/torproject/onionoo/util/Logger.java @@ -27,11 +27,12 @@ public class Logger { return String.format("%,d", decimalNumber); } + private static final long ONE_SECOND = 1000L, + ONE_MINUTE = 60L * ONE_SECOND; + public static String formatMillis(long millis) { - return String.format("%02d:%02d.%03d minutes", - millis / DateTimeHelper.ONE_MINUTE, - (millis % DateTimeHelper.ONE_MINUTE) / DateTimeHelper.ONE_SECOND, - millis % DateTimeHelper.ONE_SECOND); + return String.format("%02d:%02d.%03d minutes", millis / ONE_MINUTE, + (millis % ONE_MINUTE) / ONE_SECOND, millis % ONE_SECOND); } public static String formatBytes(long bytes) { diff --git a/src/test/java/org/torproject/onionoo/UptimeDocumentWriterTest.java b/src/test/java/org/torproject/onionoo/UptimeDocumentWriterTest.java index afae0e8..c109859 100644 --- a/src/test/java/org/torproject/onionoo/UptimeDocumentWriterTest.java +++ b/src/test/java/org/torproject/onionoo/UptimeDocumentWriterTest.java @@ -75,18 +75,19 @@ public class UptimeDocumentWriterTest { GABELMOO_FINGERPRINT); } + private static final long ONE_SECOND = 1000L, + ONE_HOUR = 60L * 60L * ONE_SECOND, FOUR_HOURS = 4L * ONE_HOUR; + private void assertOneWeekGraph(UptimeDocument document, int graphs, String first, String last, int count, List<Integer> values) { this.assertGraph(document, graphs, "1_week", first, last, - (int) (DateTimeHelper.ONE_HOUR / DateTimeHelper.ONE_SECOND), - count, values); + (int) (ONE_HOUR / ONE_SECOND), count, values); } private void assertOneMonthGraph(UptimeDocument document, int graphs, String first, String last, int count, List<Integer> values) { this.assertGraph(document, graphs, "1_month", first, last, - (int) (DateTimeHelper.FOUR_HOURS / DateTimeHelper.ONE_SECOND), - count, values); + (int) (FOUR_HOURS / ONE_SECOND), count, values); } private void assertGraph(UptimeDocument document, int graphs, [View Less]

1 0

[onionoo/master] Remove three dependencies on DateTimeHelper.
by karsten＠torproject.org 17 Aug '14

17 Aug '14

commit 27769183b1d5add69444677a858d27c98144068a Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Aug 15 11:52:43 2014 +0200 Remove three dependencies on DateTimeHelper. --- .../java/org/torproject/onionoo/server/NodeIndex.java | 13 ++++++++++--- .../org/torproject/onionoo/server/PerformanceMetrics.java | 7 ++++++- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/torproject/onionoo/server/NodeIndex.java b/src/main/java/org/… [View More]torproject/onionoo/server/NodeIndex.java index f2859a5..fbc8896 100644 --- a/src/main/java/org/torproject/onionoo/server/NodeIndex.java +++ b/src/main/java/org/torproject/onionoo/server/NodeIndex.java @@ -1,19 +1,23 @@ package org.torproject.onionoo.server; +import java.text.SimpleDateFormat; import java.util.List; import java.util.Map; import java.util.Set; import java.util.SortedMap; +import java.util.TimeZone; import org.torproject.onionoo.docs.SummaryDocument; -import org.torproject.onionoo.util.DateTimeHelper; class NodeIndex { private String relaysPublishedString; public void setRelaysPublishedMillis(long relaysPublishedMillis) { + SimpleDateFormat dateTimeFormat = new SimpleDateFormat( + "yyyy-MM-dd HH:mm:ss"); + dateTimeFormat.setTimeZone(TimeZone.getTimeZone("UTC")); this.relaysPublishedString = - DateTimeHelper.format(relaysPublishedMillis); + dateTimeFormat.format(relaysPublishedMillis); } public String getRelaysPublishedString() { return relaysPublishedString; @@ -21,8 +25,11 @@ class NodeIndex { private String bridgesPublishedString; public void setBridgesPublishedMillis(long bridgesPublishedMillis) { + SimpleDateFormat dateTimeFormat = new SimpleDateFormat( + "yyyy-MM-dd HH:mm:ss"); + dateTimeFormat.setTimeZone(TimeZone.getTimeZone("UTC")); this.bridgesPublishedString = - DateTimeHelper.format(bridgesPublishedMillis); + dateTimeFormat.format(bridgesPublishedMillis); } public String getBridgesPublishedString() { return bridgesPublishedString; diff --git a/src/main/java/org/torproject/onionoo/server/PerformanceMetrics.java b/src/main/java/org/torproject/onionoo/server/PerformanceMetrics.java index 7639580..09a20a2 100644 --- a/src/main/java/org/torproject/onionoo/server/PerformanceMetrics.java +++ b/src/main/java/org/torproject/onionoo/server/PerformanceMetrics.java @@ -2,6 +2,7 @@ * See LICENSE for licensing information */ package org.torproject.onionoo.server; +import java.text.SimpleDateFormat; import java.util.Arrays; import java.util.Collection; import java.util.Collections; @@ -9,6 +10,7 @@ import java.util.HashMap; import java.util.Map; import java.util.SortedMap; import java.util.SortedSet; +import java.util.TimeZone; import java.util.TreeMap; import java.util.TreeSet; @@ -150,8 +152,11 @@ public class PerformanceMetrics { lastLoggedMillis = time.currentTimeMillis(); } else if (receivedRequestMillis - lastLoggedMillis > LOG_INTERVAL) { + SimpleDateFormat dateTimeFormat = new SimpleDateFormat( + "yyyy-MM-dd HH:mm:ss"); + dateTimeFormat.setTimeZone(TimeZone.getTimeZone("UTC")); System.err.println("Request statistics (" - + DateTimeHelper.format(lastLoggedMillis + LOG_INTERVAL) + + dateTimeFormat.format(lastLoggedMillis + LOG_INTERVAL) + ", " + (LOG_INTERVAL / DateTimeHelper.ONE_SECOND) + " s):"); System.err.println(" Total processed requests: " + totalProcessedRequests); [View Less]

1 0

[onionoo/master] Simplify UptimeStatusTest.
by karsten＠torproject.org 17 Aug '14

17 Aug '14

commit ee54f8e957ea24c66465e216eb9bec9e024d14e9 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Aug 15 18:37:35 2014 +0200 Simplify UptimeStatusTest. There's no reason (anymore) to test the status class together with DocumentStore. --- .../org/torproject/onionoo/UptimeStatusTest.java | 94 ++++---------------- 1 file changed, 18 insertions(+), 76 deletions(-) diff --git a/src/test/java/org/torproject/onionoo/UptimeStatusTest.java b/src/test/java/org/… [View More]torproject/onionoo/UptimeStatusTest.java index 984a281..f83e5a4 100644 --- a/src/test/java/org/torproject/onionoo/UptimeStatusTest.java +++ b/src/test/java/org/torproject/onionoo/UptimeStatusTest.java @@ -4,40 +4,21 @@ package org.torproject.onionoo; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import java.util.Arrays; import java.util.TreeSet; -import org.junit.Before; import org.junit.Test; import org.torproject.onionoo.docs.DateTimeHelper; -import org.torproject.onionoo.docs.DocumentStoreFactory; import org.torproject.onionoo.docs.UptimeHistory; import org.torproject.onionoo.docs.UptimeStatus; public class UptimeStatusTest { - private DummyDocumentStore documentStore; - - @Before - public void createDummyDocumentStore() { - this.documentStore = new DummyDocumentStore(); - DocumentStoreFactory.setDocumentStore(this.documentStore); - } - - private static final String MORIA1_FINGERPRINT = - "9695DFC35FFEB861329B9F1AB04C46397020CE31"; - @Test() - public void testEmptyStatusNoWriteToDisk() { - UptimeStatus uptimeStatus = this.documentStore.retrieve( - UptimeStatus.class, true, MORIA1_FINGERPRINT); - assertEquals("Should make one retrieve attempt.", 1, - this.documentStore.getPerformedRetrieveOperations()); - assertNull("Uptime status should not exist.", uptimeStatus); - uptimeStatus = new UptimeStatus(); + public void testEmptyStatusNotDirty() { + UptimeStatus uptimeStatus = new UptimeStatus(); assertFalse("Newly created uptime status should not be dirty.", uptimeStatus.isDirty()); } @@ -50,7 +31,6 @@ public class UptimeStatusTest { uptimeStatus.compressHistory(); assertTrue("Changed uptime status should say it's dirty.", uptimeStatus.isDirty()); - this.documentStore.store(uptimeStatus, MORIA1_FINGERPRINT); assertEquals("History must contain single entry.", 1, uptimeStatus.getRelayHistory().size()); UptimeHistory newUptimeHistory = @@ -62,9 +42,6 @@ public class UptimeStatusTest { newUptimeHistory.getStartMillis()); assertEquals("History uptime hours not 1.", 1, newUptimeHistory.getUptimeHours()); - assertEquals("Newly created uptime status with non-empty history " - + "must be written to disk.", 1, - this.documentStore.getPerformedStoreOperations()); } @Test() @@ -74,7 +51,6 @@ public class UptimeStatusTest { new Long[] { DateTimeHelper.parse("2013-12-20 00:00:00"), DateTimeHelper.parse("2013-12-20 01:00:00") }))); uptimeStatus.compressHistory(); - this.documentStore.store(uptimeStatus, MORIA1_FINGERPRINT); assertEquals("History must contain single entry.", 1, uptimeStatus.getRelayHistory().size()); UptimeHistory newUptimeHistory = @@ -88,32 +64,21 @@ public class UptimeStatusTest { newUptimeHistory.getUptimeHours()); } - private static final String GABELMOO_FINGERPRINT = - "F2044413DAC2E02E3D6BCF4735A19BCA1DE97281"; - - private static final String GABELMOO_UPTIME_SAMPLE = + private static final String RELAY_UPTIME_SAMPLE = "r 2013-07-22-17 1161\n" /* ends 2013-09-09 02:00:00 */ + "r 2013-09-09-03 2445\n" /* ends 2013-12-20 00:00:00 */ + "r 2013-12-20-01 2203\n"; /* ends 2014-03-21 20:00:00 */ - private void addGabelmooUptimeSample() { - UptimeStatus uptimeStatus = new UptimeStatus(); - uptimeStatus.fromDocumentString(GABELMOO_UPTIME_SAMPLE); - this.documentStore.addDocument(uptimeStatus, GABELMOO_FINGERPRINT); - } - @Test() public void testGabelmooFillInGaps() { - this.addGabelmooUptimeSample(); - UptimeStatus uptimeStatus = this.documentStore.retrieve( - UptimeStatus.class, true, GABELMOO_FINGERPRINT); + UptimeStatus uptimeStatus = new UptimeStatus(); + uptimeStatus.fromDocumentString(RELAY_UPTIME_SAMPLE); uptimeStatus.addToHistory(true, new TreeSet<Long>(Arrays.asList( new Long[] { DateTimeHelper.parse("2013-09-09 02:00:00"), DateTimeHelper.parse("2013-12-20 00:00:00") }))); assertEquals("Uncompressed history must contain five entries.", 5, uptimeStatus.getRelayHistory().size()); uptimeStatus.compressHistory(); - this.documentStore.store(uptimeStatus, GABELMOO_FINGERPRINT); assertEquals("Compressed history must contain one entry.", 1, uptimeStatus.getRelayHistory().size()); UptimeHistory newUptimeHistory = @@ -129,40 +94,34 @@ public class UptimeStatusTest { @Test() public void testAddExistingHourToIntervalStart() { - this.addGabelmooUptimeSample(); - UptimeStatus uptimeStatus = this.documentStore.retrieve( - UptimeStatus.class, true, GABELMOO_FINGERPRINT); + UptimeStatus uptimeStatus = new UptimeStatus(); + uptimeStatus.fromDocumentString(RELAY_UPTIME_SAMPLE); uptimeStatus.addToHistory(true, new TreeSet<Long>(Arrays.asList( new Long[] { DateTimeHelper.parse("2013-07-22 17:00:00") }))); uptimeStatus.compressHistory(); - this.documentStore.store(uptimeStatus, GABELMOO_FINGERPRINT); assertFalse("Unchanged history should not make uptime status dirty.", uptimeStatus.isDirty()); } @Test() public void testAddExistingHourToIntervalEnd() { - this.addGabelmooUptimeSample(); - UptimeStatus uptimeStatus = this.documentStore.retrieve( - UptimeStatus.class, true, GABELMOO_FINGERPRINT); + UptimeStatus uptimeStatus = new UptimeStatus(); + uptimeStatus.fromDocumentString(RELAY_UPTIME_SAMPLE); uptimeStatus.addToHistory(true, new TreeSet<Long>(Arrays.asList( new Long[] { DateTimeHelper.parse("2013-09-09 01:00:00") }))); uptimeStatus.compressHistory(); - this.documentStore.store(uptimeStatus, GABELMOO_FINGERPRINT); assertFalse("Unchanged history should not make uptime status dirty.", uptimeStatus.isDirty()); } @Test() public void testTwoHoursOverlappingWithIntervalStart() { - this.addGabelmooUptimeSample(); - UptimeStatus uptimeStatus = this.documentStore.retrieve( - UptimeStatus.class, true, GABELMOO_FINGERPRINT); + UptimeStatus uptimeStatus = new UptimeStatus(); + uptimeStatus.fromDocumentString(RELAY_UPTIME_SAMPLE); uptimeStatus.addToHistory(true, new TreeSet<Long>(Arrays.asList( new Long[] { DateTimeHelper.parse("2013-07-22 16:00:00"), DateTimeHelper.parse("2013-07-22 17:00:00")}))); uptimeStatus.compressHistory(); - this.documentStore.store(uptimeStatus, GABELMOO_FINGERPRINT); assertEquals("Compressed history must still contain three entries.", 3, uptimeStatus.getRelayHistory().size()); UptimeHistory newUptimeHistory = @@ -178,14 +137,12 @@ public class UptimeStatusTest { @Test() public void testTwoHoursOverlappingWithIntervalEnd() { - this.addGabelmooUptimeSample(); - UptimeStatus uptimeStatus = this.documentStore.retrieve( - UptimeStatus.class, true, GABELMOO_FINGERPRINT); + UptimeStatus uptimeStatus = new UptimeStatus(); + uptimeStatus.fromDocumentString(RELAY_UPTIME_SAMPLE); uptimeStatus.addToHistory(true, new TreeSet<Long>(Arrays.asList( new Long[] { DateTimeHelper.parse("2013-09-09 01:00:00"), DateTimeHelper.parse("2013-09-09 02:00:00")}))); uptimeStatus.compressHistory(); - this.documentStore.store(uptimeStatus, GABELMOO_FINGERPRINT); assertEquals("Compressed history must now contain two entries.", 2, uptimeStatus.getRelayHistory().size()); UptimeHistory newUptimeHistory = @@ -199,30 +156,18 @@ public class UptimeStatusTest { newUptimeHistory.getUptimeHours()); } - private static final String ALL_RELAYS_AND_BRIDGES_FINGERPRINT = null; - - private static final String ALL_RELAYS_AND_BRIDGES_UPTIME_SAMPLE = + private static final String RELAYS_AND_BRIDGES_UPTIME_SAMPLE = "r 2013-07-22-17 5811\n" /* ends 2014-03-21 20:00:00 */ + "b 2013-07-22-17 5811\n"; /* ends 2014-03-21 20:00:00 */ - private void addAllRelaysAndBridgesUptimeSample() { - UptimeStatus uptimeStatus = new UptimeStatus(); - uptimeStatus.fromDocumentString(ALL_RELAYS_AND_BRIDGES_UPTIME_SAMPLE); - this.documentStore.addDocument(uptimeStatus, - ALL_RELAYS_AND_BRIDGES_FINGERPRINT); - } - @Test() public void testAddRelayUptimeHours() { - this.addAllRelaysAndBridgesUptimeSample(); - UptimeStatus uptimeStatus = this.documentStore.retrieve( - UptimeStatus.class, true, ALL_RELAYS_AND_BRIDGES_FINGERPRINT); + UptimeStatus uptimeStatus = new UptimeStatus(); + uptimeStatus.fromDocumentString(RELAYS_AND_BRIDGES_UPTIME_SAMPLE); uptimeStatus.addToHistory(true, new TreeSet<Long>(Arrays.asList( new Long[] { DateTimeHelper.parse("2013-07-22 16:00:00"), DateTimeHelper.parse("2014-03-21 20:00:00")}))); uptimeStatus.compressHistory(); - this.documentStore.store(uptimeStatus, - ALL_RELAYS_AND_BRIDGES_FINGERPRINT); assertEquals("Compressed relay history must still contain one entry.", 1, uptimeStatus.getRelayHistory().size()); UptimeHistory newUptimeHistory = @@ -238,15 +183,12 @@ public class UptimeStatusTest { @Test() public void testAddBridgeUptimeHours() { - this.addAllRelaysAndBridgesUptimeSample(); - UptimeStatus uptimeStatus = this.documentStore.retrieve( - UptimeStatus.class, true, ALL_RELAYS_AND_BRIDGES_FINGERPRINT); + UptimeStatus uptimeStatus = new UptimeStatus(); + uptimeStatus.fromDocumentString(RELAYS_AND_BRIDGES_UPTIME_SAMPLE); uptimeStatus.addToHistory(false, new TreeSet<Long>(Arrays.asList( new Long[] { DateTimeHelper.parse("2013-07-22 16:00:00"), DateTimeHelper.parse("2014-03-21 20:00:00")}))); uptimeStatus.compressHistory(); - this.documentStore.store(uptimeStatus, - ALL_RELAYS_AND_BRIDGES_FINGERPRINT); assertEquals("Compressed bridge history must still contain one " + "entry.", 1, uptimeStatus.getBridgeHistory().size()); UptimeHistory newUptimeHistory = [View Less]

1 0

[onionoo/master] Add unit tests for BandwidthStatus.
by karsten＠torproject.org 17 Aug '14

17 Aug '14

commit 9248ccd903069fad8cd48ab6a538b09eadc77144 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Aug 15 18:46:04 2014 +0200 Add unit tests for BandwidthStatus. --- .../onionoo/docs/BandwidthStatusTest.java | 146 ++++++++++++++++++++ 1 file changed, 146 insertions(+) diff --git a/src/test/java/org/torproject/onionoo/docs/BandwidthStatusTest.java b/src/test/java/org/torproject/onionoo/docs/BandwidthStatusTest.java new file mode 100644 index 0000000..91d086d -… [View More]-- /dev/null +++ b/src/test/java/org/torproject/onionoo/docs/BandwidthStatusTest.java @@ -0,0 +1,146 @@ +/* Copyright 2014 The Tor Project + * See LICENSE for licensing information */ +package org.torproject.onionoo.docs; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import java.util.SortedMap; +import java.util.TreeMap; + +import org.junit.Before; +import org.junit.Test; +import org.torproject.descriptor.BandwidthHistory; +import org.torproject.onionoo.DummyTime; +import org.torproject.onionoo.util.TimeFactory; + +public class BandwidthStatusTest { + + private long currentTimeMillis = DateTimeHelper.parse( + "2014-08-01 02:22:22"); + + @Before + public void createDummyTime() { + TimeFactory.setTime(new DummyTime(this.currentTimeMillis)); + } + + @Test() + public void testEmptyStatusNotDirty() { + BandwidthStatus bandwidthStatus = new BandwidthStatus(); + assertFalse("Newly created bandwidth status should not be dirty.", + bandwidthStatus.isDirty()); + } + + private static class DummyBandwidthHistory implements BandwidthHistory { + DummyBandwidthHistory(String line) { + this.line = line; + String[] parts = line.split(" "); + this.historyEndMillis = DateTimeHelper.parse(parts[1] + " " + + parts[2]); + this.intervalLength = Long.parseLong(parts[3].substring(1)); + long intervalEndMillis = this.historyEndMillis, + intervalLengthMillis = this.intervalLength * 1000L; + String[] valueStrings = parts[5].split(","); + for (int i = valueStrings.length - 1; i >= 0; i--) { + this.bandwidthValues.put(intervalEndMillis, + Long.parseLong(valueStrings[i])); + intervalEndMillis -= intervalLengthMillis; + } + } + private String line; + public String getLine() { + return this.line; + } + private long historyEndMillis; + public long getHistoryEndMillis() { + return this.historyEndMillis; + } + private long intervalLength; + public long getIntervalLength() { + return this.intervalLength; + } + private SortedMap<Long, Long> bandwidthValues = + new TreeMap<Long, Long>(); + public SortedMap<Long, Long> getBandwidthValues() { + return this.bandwidthValues; + } + } + + @Test() + public void testNewStatusWithSingleInterval() { + BandwidthStatus bandwidthStatus = new BandwidthStatus(); + bandwidthStatus.addToWriteHistory(new DummyBandwidthHistory( + "write-history 2014-08-01 00:22:22 (900 s) 30720")); + assertTrue("Updated bandwidth status should be marked as dirty.", + bandwidthStatus.isDirty()); + assertEquals("Formatted document string not as expected.", + "w 2014-08-01 00:07:22 2014-08-01 00:22:22 30720\n", + bandwidthStatus.toDocumentString()); + bandwidthStatus.clearDirty(); + assertFalse("Dirty flag should be cleared.", + bandwidthStatus.isDirty()); + } + + @Test() + public void testNewStatusWithTwoIntervals() { + BandwidthStatus bandwidthStatus = new BandwidthStatus(); + bandwidthStatus.addToWriteHistory(new DummyBandwidthHistory( + "write-history 2014-08-01 00:22:22 (900 s) 4096,30720")); + assertEquals("Formatted document string not as expected.", + "w 2014-07-31 23:52:22 2014-08-01 00:07:22 4096\n" + + "w 2014-08-01 00:07:22 2014-08-01 00:22:22 30720\n", + bandwidthStatus.toDocumentString()); + } + + @Test() + public void testExistingStatusWithNewIntervals() { + BandwidthStatus bandwidthStatus = new BandwidthStatus(); + String existingLines = + "w 2014-07-31 23:52:22 2014-08-01 00:07:22 4096\n" + + "w 2014-08-01 00:07:22 2014-08-01 00:22:22 30720\n"; + bandwidthStatus.fromDocumentString(existingLines); + bandwidthStatus.addToWriteHistory(new DummyBandwidthHistory( + "write-history 2014-08-01 00:37:22 (900 s) 0")); + assertEquals("New interval should be appended.", + existingLines + "w 2014-08-01 00:22:22 2014-08-01 00:37:22 0\n", + bandwidthStatus.toDocumentString()); + } + + @Test() + public void testCompressRecentIntervals() { + BandwidthStatus bandwidthStatus = new BandwidthStatus(); + String existingLines = + "w 2014-08-01 00:07:22 2014-08-01 00:22:22 30720\n" + + "w 2014-08-01 00:22:22 2014-08-01 00:37:22 4096\n"; + bandwidthStatus.fromDocumentString(existingLines); + bandwidthStatus.compressHistory(); + assertEquals("Two recent intervals should not be compressed.", + existingLines, bandwidthStatus.toDocumentString()); + } + + @Test() + public void testCompressOldIntervals() { + BandwidthStatus bandwidthStatus = new BandwidthStatus(); + bandwidthStatus.fromDocumentString( + "w 2013-08-01 00:07:22 2013-08-01 00:22:22 30720\n" + + "w 2013-08-01 00:22:22 2013-08-01 00:37:22 4096\n"); + bandwidthStatus.compressHistory(); + assertEquals("Two old intervals should be compressed into one.", + "w 2013-08-01 00:07:22 2013-08-01 00:37:22 34816\n", + bandwidthStatus.toDocumentString()); + } + + @Test() + public void testCompressOldIntervalsOverMonthEnd() { + BandwidthStatus bandwidthStatus = new BandwidthStatus(); + String statusLines = + "w 2013-07-31 23:52:22 2013-08-01 00:07:22 4096\n" + + "w 2013-08-01 00:07:22 2013-08-01 00:22:22 30720\n"; + bandwidthStatus.fromDocumentString(statusLines); + bandwidthStatus.compressHistory(); + assertEquals("Two old intervals should not be merged over month end.", + statusLines, bandwidthStatus.toDocumentString()); + } +} + [View Less]

1 0

[onionoo/master] Move UptimeStatusTest to sub package.
by karsten＠torproject.org 17 Aug '14

17 Aug '14

commit ed10c7c37262c647c3d78a5f0fc55a7bf4296ab2 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Aug 15 18:39:09 2014 +0200 Move UptimeStatusTest to sub package. --- .../org/torproject/onionoo/UptimeStatusTest.java | 205 -------------------- .../torproject/onionoo/docs/UptimeStatusTest.java | 205 ++++++++++++++++++++ 2 files changed, 205 insertions(+), 205 deletions(-) diff --git a/src/test/java/org/torproject/onionoo/UptimeStatusTest.java b/src/test/java/org/… [View More]torproject/onionoo/UptimeStatusTest.java deleted file mode 100644 index f83e5a4..0000000 --- a/src/test/java/org/torproject/onionoo/UptimeStatusTest.java +++ /dev/null @@ -1,205 +0,0 @@ -/* Copyright 2014 The Tor Project - * See LICENSE for licensing information */ -package org.torproject.onionoo; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import java.util.Arrays; -import java.util.TreeSet; - -import org.junit.Test; -import org.torproject.onionoo.docs.DateTimeHelper; -import org.torproject.onionoo.docs.UptimeHistory; -import org.torproject.onionoo.docs.UptimeStatus; - -public class UptimeStatusTest { - - @Test() - public void testEmptyStatusNotDirty() { - UptimeStatus uptimeStatus = new UptimeStatus(); - assertFalse("Newly created uptime status should not be dirty.", - uptimeStatus.isDirty()); - } - - @Test() - public void testSingleHourWriteToDisk() { - UptimeStatus uptimeStatus = new UptimeStatus(); - uptimeStatus.addToHistory(true, new TreeSet<Long>(Arrays.asList( - new Long[] { DateTimeHelper.parse("2013-12-20 00:00:00") }))); - uptimeStatus.compressHistory(); - assertTrue("Changed uptime status should say it's dirty.", - uptimeStatus.isDirty()); - assertEquals("History must contain single entry.", 1, - uptimeStatus.getRelayHistory().size()); - UptimeHistory newUptimeHistory = - uptimeStatus.getRelayHistory().first(); - assertEquals("History not for relay.", true, - newUptimeHistory.isRelay()); - assertEquals("History start millis not same as provided.", - DateTimeHelper.parse("2013-12-20 00:00:00"), - newUptimeHistory.getStartMillis()); - assertEquals("History uptime hours not 1.", 1, - newUptimeHistory.getUptimeHours()); - } - - @Test() - public void testTwoConsecutiveHours() { - UptimeStatus uptimeStatus = new UptimeStatus(); - uptimeStatus.addToHistory(true, new TreeSet<Long>(Arrays.asList( - new Long[] { DateTimeHelper.parse("2013-12-20 00:00:00"), - DateTimeHelper.parse("2013-12-20 01:00:00") }))); - uptimeStatus.compressHistory(); - assertEquals("History must contain single entry.", 1, - uptimeStatus.getRelayHistory().size()); - UptimeHistory newUptimeHistory = - uptimeStatus.getRelayHistory().first(); - assertEquals("History not for relay.", true, - newUptimeHistory.isRelay()); - assertEquals("History start millis not same as provided.", - DateTimeHelper.parse("2013-12-20 00:00:00"), - newUptimeHistory.getStartMillis()); - assertEquals("History uptime hours not 2.", 2, - newUptimeHistory.getUptimeHours()); - } - - private static final String RELAY_UPTIME_SAMPLE = - "r 2013-07-22-17 1161\n" /* ends 2013-09-09 02:00:00 */ - + "r 2013-09-09-03 2445\n" /* ends 2013-12-20 00:00:00 */ - + "r 2013-12-20-01 2203\n"; /* ends 2014-03-21 20:00:00 */ - - @Test() - public void testGabelmooFillInGaps() { - UptimeStatus uptimeStatus = new UptimeStatus(); - uptimeStatus.fromDocumentString(RELAY_UPTIME_SAMPLE); - uptimeStatus.addToHistory(true, new TreeSet<Long>(Arrays.asList( - new Long[] { DateTimeHelper.parse("2013-09-09 02:00:00"), - DateTimeHelper.parse("2013-12-20 00:00:00") }))); - assertEquals("Uncompressed history must contain five entries.", 5, - uptimeStatus.getRelayHistory().size()); - uptimeStatus.compressHistory(); - assertEquals("Compressed history must contain one entry.", 1, - uptimeStatus.getRelayHistory().size()); - UptimeHistory newUptimeHistory = - uptimeStatus.getRelayHistory().first(); - assertEquals("History not for relay.", true, - newUptimeHistory.isRelay()); - assertEquals("History start millis not as expected.", - DateTimeHelper.parse("2013-07-22 17:00:00"), - newUptimeHistory.getStartMillis()); - assertEquals("History uptime hours not 1161+1+2445+1+2203=5811.", - 5811, newUptimeHistory.getUptimeHours()); - } - - @Test() - public void testAddExistingHourToIntervalStart() { - UptimeStatus uptimeStatus = new UptimeStatus(); - uptimeStatus.fromDocumentString(RELAY_UPTIME_SAMPLE); - uptimeStatus.addToHistory(true, new TreeSet<Long>(Arrays.asList( - new Long[] { DateTimeHelper.parse("2013-07-22 17:00:00") }))); - uptimeStatus.compressHistory(); - assertFalse("Unchanged history should not make uptime status dirty.", - uptimeStatus.isDirty()); - } - - @Test() - public void testAddExistingHourToIntervalEnd() { - UptimeStatus uptimeStatus = new UptimeStatus(); - uptimeStatus.fromDocumentString(RELAY_UPTIME_SAMPLE); - uptimeStatus.addToHistory(true, new TreeSet<Long>(Arrays.asList( - new Long[] { DateTimeHelper.parse("2013-09-09 01:00:00") }))); - uptimeStatus.compressHistory(); - assertFalse("Unchanged history should not make uptime status dirty.", - uptimeStatus.isDirty()); - } - - @Test() - public void testTwoHoursOverlappingWithIntervalStart() { - UptimeStatus uptimeStatus = new UptimeStatus(); - uptimeStatus.fromDocumentString(RELAY_UPTIME_SAMPLE); - uptimeStatus.addToHistory(true, new TreeSet<Long>(Arrays.asList( - new Long[] { DateTimeHelper.parse("2013-07-22 16:00:00"), - DateTimeHelper.parse("2013-07-22 17:00:00")}))); - uptimeStatus.compressHistory(); - assertEquals("Compressed history must still contain three entries.", - 3, uptimeStatus.getRelayHistory().size()); - UptimeHistory newUptimeHistory = - uptimeStatus.getRelayHistory().first(); - assertEquals("History not for relay.", true, - newUptimeHistory.isRelay()); - assertEquals("History start millis not as expected.", - DateTimeHelper.parse("2013-07-22 16:00:00"), - newUptimeHistory.getStartMillis()); - assertEquals("History uptime hours not 1+1161=1162.", 1162, - newUptimeHistory.getUptimeHours()); - } - - @Test() - public void testTwoHoursOverlappingWithIntervalEnd() { - UptimeStatus uptimeStatus = new UptimeStatus(); - uptimeStatus.fromDocumentString(RELAY_UPTIME_SAMPLE); - uptimeStatus.addToHistory(true, new TreeSet<Long>(Arrays.asList( - new Long[] { DateTimeHelper.parse("2013-09-09 01:00:00"), - DateTimeHelper.parse("2013-09-09 02:00:00")}))); - uptimeStatus.compressHistory(); - assertEquals("Compressed history must now contain two entries.", - 2, uptimeStatus.getRelayHistory().size()); - UptimeHistory newUptimeHistory = - uptimeStatus.getRelayHistory().first(); - assertEquals("History not for relay.", true, - newUptimeHistory.isRelay()); - assertEquals("History start millis not as expected.", - DateTimeHelper.parse("2013-07-22 17:00:00"), - newUptimeHistory.getStartMillis()); - assertEquals("History uptime hours not 1161+1+2445=3607.", 3607, - newUptimeHistory.getUptimeHours()); - } - - private static final String RELAYS_AND_BRIDGES_UPTIME_SAMPLE = - "r 2013-07-22-17 5811\n" /* ends 2014-03-21 20:00:00 */ - + "b 2013-07-22-17 5811\n"; /* ends 2014-03-21 20:00:00 */ - - @Test() - public void testAddRelayUptimeHours() { - UptimeStatus uptimeStatus = new UptimeStatus(); - uptimeStatus.fromDocumentString(RELAYS_AND_BRIDGES_UPTIME_SAMPLE); - uptimeStatus.addToHistory(true, new TreeSet<Long>(Arrays.asList( - new Long[] { DateTimeHelper.parse("2013-07-22 16:00:00"), - DateTimeHelper.parse("2014-03-21 20:00:00")}))); - uptimeStatus.compressHistory(); - assertEquals("Compressed relay history must still contain one entry.", - 1, uptimeStatus.getRelayHistory().size()); - UptimeHistory newUptimeHistory = - uptimeStatus.getRelayHistory().first(); - assertEquals("History not for relay.", true, - newUptimeHistory.isRelay()); - assertEquals("History start millis not as expected.", - DateTimeHelper.parse("2013-07-22 16:00:00"), - newUptimeHistory.getStartMillis()); - assertEquals("History uptime hours not 1+5811+1=5813.", 5813, - newUptimeHistory.getUptimeHours()); - } - - @Test() - public void testAddBridgeUptimeHours() { - UptimeStatus uptimeStatus = new UptimeStatus(); - uptimeStatus.fromDocumentString(RELAYS_AND_BRIDGES_UPTIME_SAMPLE); - uptimeStatus.addToHistory(false, new TreeSet<Long>(Arrays.asList( - new Long[] { DateTimeHelper.parse("2013-07-22 16:00:00"), - DateTimeHelper.parse("2014-03-21 20:00:00")}))); - uptimeStatus.compressHistory(); - assertEquals("Compressed bridge history must still contain one " - + "entry.", 1, uptimeStatus.getBridgeHistory().size()); - UptimeHistory newUptimeHistory = - uptimeStatus.getBridgeHistory().last(); - assertEquals("History not for bridge.", false, - newUptimeHistory.isRelay()); - assertEquals("History start millis not as expected.", - DateTimeHelper.parse("2013-07-22 16:00:00"), - newUptimeHistory.getStartMillis()); - assertEquals("History uptime hours not 1+5811+1=5813.", 5813, - newUptimeHistory.getUptimeHours()); - } -} - diff --git a/src/test/java/org/torproject/onionoo/docs/UptimeStatusTest.java b/src/test/java/org/torproject/onionoo/docs/UptimeStatusTest.java new file mode 100644 index 0000000..043ea80 --- /dev/null +++ b/src/test/java/org/torproject/onionoo/docs/UptimeStatusTest.java @@ -0,0 +1,205 @@ +/* Copyright 2014 The Tor Project + * See LICENSE for licensing information */ +package org.torproject.onionoo.docs; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import java.util.Arrays; +import java.util.TreeSet; + +import org.junit.Test; +import org.torproject.onionoo.docs.DateTimeHelper; +import org.torproject.onionoo.docs.UptimeHistory; +import org.torproject.onionoo.docs.UptimeStatus; + +public class UptimeStatusTest { + + @Test() + public void testEmptyStatusNotDirty() { + UptimeStatus uptimeStatus = new UptimeStatus(); + assertFalse("Newly created uptime status should not be dirty.", + uptimeStatus.isDirty()); + } + + @Test() + public void testSingleHourWriteToDisk() { + UptimeStatus uptimeStatus = new UptimeStatus(); + uptimeStatus.addToHistory(true, new TreeSet<Long>(Arrays.asList( + new Long[] { DateTimeHelper.parse("2013-12-20 00:00:00") }))); + uptimeStatus.compressHistory(); + assertTrue("Changed uptime status should say it's dirty.", + uptimeStatus.isDirty()); + assertEquals("History must contain single entry.", 1, + uptimeStatus.getRelayHistory().size()); + UptimeHistory newUptimeHistory = + uptimeStatus.getRelayHistory().first(); + assertEquals("History not for relay.", true, + newUptimeHistory.isRelay()); + assertEquals("History start millis not same as provided.", + DateTimeHelper.parse("2013-12-20 00:00:00"), + newUptimeHistory.getStartMillis()); + assertEquals("History uptime hours not 1.", 1, + newUptimeHistory.getUptimeHours()); + } + + @Test() + public void testTwoConsecutiveHours() { + UptimeStatus uptimeStatus = new UptimeStatus(); + uptimeStatus.addToHistory(true, new TreeSet<Long>(Arrays.asList( + new Long[] { DateTimeHelper.parse("2013-12-20 00:00:00"), + DateTimeHelper.parse("2013-12-20 01:00:00") }))); + uptimeStatus.compressHistory(); + assertEquals("History must contain single entry.", 1, + uptimeStatus.getRelayHistory().size()); + UptimeHistory newUptimeHistory = + uptimeStatus.getRelayHistory().first(); + assertEquals("History not for relay.", true, + newUptimeHistory.isRelay()); + assertEquals("History start millis not same as provided.", + DateTimeHelper.parse("2013-12-20 00:00:00"), + newUptimeHistory.getStartMillis()); + assertEquals("History uptime hours not 2.", 2, + newUptimeHistory.getUptimeHours()); + } + + private static final String RELAY_UPTIME_SAMPLE = + "r 2013-07-22-17 1161\n" /* ends 2013-09-09 02:00:00 */ + + "r 2013-09-09-03 2445\n" /* ends 2013-12-20 00:00:00 */ + + "r 2013-12-20-01 2203\n"; /* ends 2014-03-21 20:00:00 */ + + @Test() + public void testGabelmooFillInGaps() { + UptimeStatus uptimeStatus = new UptimeStatus(); + uptimeStatus.fromDocumentString(RELAY_UPTIME_SAMPLE); + uptimeStatus.addToHistory(true, new TreeSet<Long>(Arrays.asList( + new Long[] { DateTimeHelper.parse("2013-09-09 02:00:00"), + DateTimeHelper.parse("2013-12-20 00:00:00") }))); + assertEquals("Uncompressed history must contain five entries.", 5, + uptimeStatus.getRelayHistory().size()); + uptimeStatus.compressHistory(); + assertEquals("Compressed history must contain one entry.", 1, + uptimeStatus.getRelayHistory().size()); + UptimeHistory newUptimeHistory = + uptimeStatus.getRelayHistory().first(); + assertEquals("History not for relay.", true, + newUptimeHistory.isRelay()); + assertEquals("History start millis not as expected.", + DateTimeHelper.parse("2013-07-22 17:00:00"), + newUptimeHistory.getStartMillis()); + assertEquals("History uptime hours not 1161+1+2445+1+2203=5811.", + 5811, newUptimeHistory.getUptimeHours()); + } + + @Test() + public void testAddExistingHourToIntervalStart() { + UptimeStatus uptimeStatus = new UptimeStatus(); + uptimeStatus.fromDocumentString(RELAY_UPTIME_SAMPLE); + uptimeStatus.addToHistory(true, new TreeSet<Long>(Arrays.asList( + new Long[] { DateTimeHelper.parse("2013-07-22 17:00:00") }))); + uptimeStatus.compressHistory(); + assertFalse("Unchanged history should not make uptime status dirty.", + uptimeStatus.isDirty()); + } + + @Test() + public void testAddExistingHourToIntervalEnd() { + UptimeStatus uptimeStatus = new UptimeStatus(); + uptimeStatus.fromDocumentString(RELAY_UPTIME_SAMPLE); + uptimeStatus.addToHistory(true, new TreeSet<Long>(Arrays.asList( + new Long[] { DateTimeHelper.parse("2013-09-09 01:00:00") }))); + uptimeStatus.compressHistory(); + assertFalse("Unchanged history should not make uptime status dirty.", + uptimeStatus.isDirty()); + } + + @Test() + public void testTwoHoursOverlappingWithIntervalStart() { + UptimeStatus uptimeStatus = new UptimeStatus(); + uptimeStatus.fromDocumentString(RELAY_UPTIME_SAMPLE); + uptimeStatus.addToHistory(true, new TreeSet<Long>(Arrays.asList( + new Long[] { DateTimeHelper.parse("2013-07-22 16:00:00"), + DateTimeHelper.parse("2013-07-22 17:00:00")}))); + uptimeStatus.compressHistory(); + assertEquals("Compressed history must still contain three entries.", + 3, uptimeStatus.getRelayHistory().size()); + UptimeHistory newUptimeHistory = + uptimeStatus.getRelayHistory().first(); + assertEquals("History not for relay.", true, + newUptimeHistory.isRelay()); + assertEquals("History start millis not as expected.", + DateTimeHelper.parse("2013-07-22 16:00:00"), + newUptimeHistory.getStartMillis()); + assertEquals("History uptime hours not 1+1161=1162.", 1162, + newUptimeHistory.getUptimeHours()); + } + + @Test() + public void testTwoHoursOverlappingWithIntervalEnd() { + UptimeStatus uptimeStatus = new UptimeStatus(); + uptimeStatus.fromDocumentString(RELAY_UPTIME_SAMPLE); + uptimeStatus.addToHistory(true, new TreeSet<Long>(Arrays.asList( + new Long[] { DateTimeHelper.parse("2013-09-09 01:00:00"), + DateTimeHelper.parse("2013-09-09 02:00:00")}))); + uptimeStatus.compressHistory(); + assertEquals("Compressed history must now contain two entries.", + 2, uptimeStatus.getRelayHistory().size()); + UptimeHistory newUptimeHistory = + uptimeStatus.getRelayHistory().first(); + assertEquals("History not for relay.", true, + newUptimeHistory.isRelay()); + assertEquals("History start millis not as expected.", + DateTimeHelper.parse("2013-07-22 17:00:00"), + newUptimeHistory.getStartMillis()); + assertEquals("History uptime hours not 1161+1+2445=3607.", 3607, + newUptimeHistory.getUptimeHours()); + } + + private static final String RELAYS_AND_BRIDGES_UPTIME_SAMPLE = + "r 2013-07-22-17 5811\n" /* ends 2014-03-21 20:00:00 */ + + "b 2013-07-22-17 5811\n"; /* ends 2014-03-21 20:00:00 */ + + @Test() + public void testAddRelayUptimeHours() { + UptimeStatus uptimeStatus = new UptimeStatus(); + uptimeStatus.fromDocumentString(RELAYS_AND_BRIDGES_UPTIME_SAMPLE); + uptimeStatus.addToHistory(true, new TreeSet<Long>(Arrays.asList( + new Long[] { DateTimeHelper.parse("2013-07-22 16:00:00"), + DateTimeHelper.parse("2014-03-21 20:00:00")}))); + uptimeStatus.compressHistory(); + assertEquals("Compressed relay history must still contain one entry.", + 1, uptimeStatus.getRelayHistory().size()); + UptimeHistory newUptimeHistory = + uptimeStatus.getRelayHistory().first(); + assertEquals("History not for relay.", true, + newUptimeHistory.isRelay()); + assertEquals("History start millis not as expected.", + DateTimeHelper.parse("2013-07-22 16:00:00"), + newUptimeHistory.getStartMillis()); + assertEquals("History uptime hours not 1+5811+1=5813.", 5813, + newUptimeHistory.getUptimeHours()); + } + + @Test() + public void testAddBridgeUptimeHours() { + UptimeStatus uptimeStatus = new UptimeStatus(); + uptimeStatus.fromDocumentString(RELAYS_AND_BRIDGES_UPTIME_SAMPLE); + uptimeStatus.addToHistory(false, new TreeSet<Long>(Arrays.asList( + new Long[] { DateTimeHelper.parse("2013-07-22 16:00:00"), + DateTimeHelper.parse("2014-03-21 20:00:00")}))); + uptimeStatus.compressHistory(); + assertEquals("Compressed bridge history must still contain one " + + "entry.", 1, uptimeStatus.getBridgeHistory().size()); + UptimeHistory newUptimeHistory = + uptimeStatus.getBridgeHistory().last(); + assertEquals("History not for bridge.", false, + newUptimeHistory.isRelay()); + assertEquals("History start millis not as expected.", + DateTimeHelper.parse("2013-07-22 16:00:00"), + newUptimeHistory.getStartMillis()); + assertEquals("History uptime hours not 1+5811+1=5813.", 5813, + newUptimeHistory.getUptimeHours()); + } +} + [View Less]

1 0