tor-commits September 2018

tor-commits@lists.torproject.org

17 participants
3230 discussions

[sbws/master] Move functions to methods
by juga＠torproject.org 18 Sep '18

18 Sep '18

commit a98787cface97bb7e248e2e4a98123d5425ef9dd Author: juga0 <juga(a)riseup.net> Date: Wed Aug 29 17:35:23 2018 +0000 Move functions to methods --- sbws/lib/v3bwfile.py | 93 +++++++++++++++++++++++++++++++++------------------- 1 file changed, 59 insertions(+), 34 deletions(-) diff --git a/sbws/lib/v3bwfile.py b/sbws/lib/v3bwfile.py index ef9eadc..42e318c 100644 --- a/sbws/lib/v3bwfile.py +++ b/sbws/lib/v3bwfile.py @@ -2,12 +2,13 @@ """Classes and functions that create the bandwidth measurements document (v3bw) used by bandwidth authorities.""" +import copy import logging import os -from statistics import median +from statistics import median, mean from sbws import __version__ -from sbws.globals import SPEC_VERSION, BW_LINE_SIZE +from sbws.globals import SPEC_VERSION, BW_LINE_SIZE, SCALE_CONSTANT from sbws.lib.resultdump import ResultSuccess, _ResultType from sbws.util.filelock import DirectoryLock from sbws.util.timestamp import now_isodt_str, unixts_to_isodt_str @@ -40,33 +41,6 @@ BW_KEYVALUES_INT = ['bw', 'rtt', 'success', 'error_stream', BW_KEYVALUES = ['node_id', 'bw'] + BW_EXTRA_ARG_KEYVALUES -def total_bw(bw_lines): - return sum([l.bw for l in bw_lines]) - - -def avg_bw(bw_lines): - assert len(bw_lines) > 0 - return total_bw(bw_lines) / len(bw_lines) - - -def scale_lines(bw_lines, scale_constant): - avg = avg_bw(bw_lines) - for line in bw_lines: - line.bw = round(line.bw / avg * scale_constant) - warn_if_not_accurate_enough(bw_lines, scale_constant) - return bw_lines - - -def warn_if_not_accurate_enough(bw_lines, scale_constant): - margin = 0.001 - accuracy_ratio = avg_bw(bw_lines) / scale_constant - log.info('The generated lines are within {:.5}% of what they should ' - 'be'.format((1 - accuracy_ratio) * 100)) - if accuracy_ratio < 1 - margin or accuracy_ratio > 1 + margin: - log.warning('There was %f%% error and only +/- %f%% is ' - 'allowed', (1 - accuracy_ratio) * 100, margin * 100) - - def num_results_of_type(results, type_str): return len([r for r in results if r.type == type_str]) @@ -387,17 +361,68 @@ class V3BWFile(object): f = cls(header, bw_lines) return f + @staticmethod + def bw_sbws_scale(bw_lines, scale_constant=SCALE_CONSTANT, + reverse=False): + """Return a new V3BwLine list scaled using sbws method. + + :param list bw_lines: + bw lines to scale, not self.bw_lines, + since this method will be before self.bw_lines have been + initialized. + :param int scale_constant: + the constant to multiply by the ratio and + the bandwidth to obtain the new bandwidth + :returns list: V3BwLine list + """ + # If a relay has MaxAdvertisedBandwidth set, they may be capable of + # some large amount of bandwidth but prefer if they didn't receive it. + # We also could have managed to measure them faster than their + # {,Relay}BandwidthRate somehow. + # + # See https://github.com/pastly/simple-bw-scanner/issues/155 and + # https://trac.torproject.org/projects/tor/ticket/8494 + # + # Note how this isn't some measured-by-us average of bandwidth. It's + # the first value on the 'bandwidth' line in the relay's server + # descriptor. + log.debug('Scaling bandwidth using sbws method.') + m = median([l.bw for l in bw_lines]) + bw_lines_scaled = copy.deepcopy(bw_lines) + for l in bw_lines_scaled: + # min is to limit the bw to descriptor average-bandwidth + # max to avoid bandwidth with 0 value + l.bw = max(round(min(l.desc_avg_bw_bs, + l.bw_bs_median * scale_constant / m) + / 1000), 1) + return sorted(bw_lines_scaled, key=lambda x: x.bw, reverse=reverse) + + @staticmethod + def warn_if_not_accurate_enough(bw_lines, + scale_constant=SCALE_CONSTANT): + margin = 0.001 + accuracy_ratio = median([l.bw for l in bw_lines]) / scale_constant + log.info('The generated lines are within {:.5}% of what they should ' + 'be'.format((1 - accuracy_ratio) * 100)) + if accuracy_ratio < 1 - margin or accuracy_ratio > 1 + margin: + log.warning('There was %f%% error and only +/- %f%% is ' + 'allowed', (1 - accuracy_ratio) * 100, margin * 100) + @property - def total_bw(self): - return total_bw(self.bw_lines) + def sum_bw(self): + return sum([l.bw for l in self.bw_lines]) @property - def num_lines(self): + def num(self): return len(self.bw_lines) @property - def avg_bw(self): - return self.total_bw / self.num_lines + def mean_bw(self): + return mean([l.bw for l in self.bw_lines]) + + @property + def median_bw(self): + return median([l.bw for l in self.bw_lines]) def write(self, output): if output == '/dev/stdout':

1 0

[sbws/master] Return bw in kb if not scaled
by juga＠torproject.org 18 Sep '18

18 Sep '18

commit 32b2014a248bf87ab1344c3aaeaf4b8c059347e5 Author: juga0 <juga(a)riseup.net> Date: Wed Aug 29 19:16:31 2018 +0000 Return bw in kb if not scaled --- sbws/lib/v3bwfile.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/sbws/lib/v3bwfile.py b/sbws/lib/v3bwfile.py index eff87f8..bd8f5d6 100644 --- a/sbws/lib/v3bwfile.py +++ b/sbws/lib/v3bwfile.py @@ -359,14 +359,23 @@ class V3BWFile(object): scale_constant=None): bw_lines = [V3BWLine.from_results(results[fp]) for fp in results] bw_lines = sorted(bw_lines, key=lambda d: d.bw, reverse=True) - if scale_constant: + if scale_constant is not None: bw_lines = cls.bw_sbws_scale(bw_lines, scale_constant) cls.warn_if_not_accurate_enough(bw_lines, scale_constant) + else: + bw_lines = cls.bw_kb(bw_lines) header = V3BWHeader.from_results(results, state_fpath) f = cls(header, bw_lines) return f @staticmethod + def bw_kb(bw_lines, reverse=False): + bw_lines_scaled = copy.deepcopy(bw_lines) + for l in bw_lines_scaled: + l.bw = max(round(l.bw / 1000), 1) + return sorted(bw_lines_scaled, key=lambda x: x.bw, reverse=reverse) + + @staticmethod def bw_sbws_scale(bw_lines, scale_constant=SCALE_CONSTANT, reverse=False): """Return a new V3BwLine list scaled using sbws method.

1 0

[sbws/master] Add observed bandwidth data
by juga＠torproject.org 18 Sep '18

18 Sep '18

commit 12036db4320841576161b1ca30b0399446319b44 Author: juga0 <juga(a)riseup.net> Date: Wed Aug 29 20:21:37 2018 +0000 Add observed bandwidth data --- tests/unit/conftest.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/unit/conftest.py b/tests/unit/conftest.py index 0564a50..80d27fa 100644 --- a/tests/unit/conftest.py +++ b/tests/unit/conftest.py @@ -63,9 +63,10 @@ DOWNLOADS3 = [ ] SCANNER = "test" AVG_BW = 966080 +OBS_BW = 524288 RELAY1 = Result.Relay(FP1, NICK1, IP1, ED25519, - average_bandwidth=AVG_BW) + average_bandwidth=AVG_BW, observed_bandwidth=OBS_BW) RELAY2 = Result.Relay(FP2, NICK2, IP2, ED25519) RESULT = Result(RELAY1, CIRC12, DEST_URL, SCANNER, t=TIME1) @@ -84,7 +85,8 @@ RELAY_DICT = { "address": IP1, "nickname": NICK1, "master_key_ed25519": ED25519, - "relay_average_bandwidth": AVG_BW + "relay_average_bandwidth": AVG_BW, + "relay_observed_bandwidth": OBS_BW } BASE_RESULT_NO_RELAY_DICT = {

1 0

[sbws/master] Add more data and more realistic to the tests
by juga＠torproject.org 18 Sep '18

18 Sep '18

commit 2e4e08582327df45ceced99d4d5c0748689ede17 Author: juga0 <juga(a)riseup.net> Date: Wed Aug 29 20:10:01 2018 +0000 Add more data and more realistic to the tests --- tests/unit/conftest.py | 53 ++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 45 insertions(+), 8 deletions(-) diff --git a/tests/unit/conftest.py b/tests/unit/conftest.py index 3ebee46..0564a50 100644 --- a/tests/unit/conftest.py +++ b/tests/unit/conftest.py @@ -22,19 +22,56 @@ NICK1 = 'A' NICK2 = 'B' IP1 = '169.254.100.1' IP2 = '169.254.100.2' -RTTS = [5, 25] -DOWNLOADS = [{'duration': 4, 'amount': 40}] +RTTS1 = [ + 0.2943556308746338, 0.2885427474975586, 0.2802879810333252, + 0.28124427795410156, 0.2827129364013672, 0.2901294231414795, + 0.2784590721130371, 0.2838578224182129, 0.2842121124267578, + 0.28656768798828125 +] +RTTS2 = [ + 0.9097037315368652, 0.9293286800384521, 2.3764255046844482, + 0.869133710861206, 0.8188621997833252, 0.9046516418457031, + 1.3477752208709717, 0.8118226528167725, 0.8821918964385986, + 0.8746812343597412 +] +RTTS3 = [ + 0.510988712310791, 0.4889242649078369, 0.5003941059112549, + 0.49333715438842773, 0.5000274181365967, 0.5426476001739502, + 0.5190870761871338, 0.4908745288848877, 0.5516133308410645, + 0.4995298385620117 +] +DOWNLOADS1 = [ + {"duration": 28.01000952720642, "amount": 25916542}, + {"duration": 28.203476428985596, "amount": 25916542}, + {"duration": 27.897520780563354, "amount": 25916542}, + {"duration": 29.330559492111206, "amount": 25916542}, + {"duration": 27.93175745010376, "amount": 25916542} +] +DOWNLOADS2 = [ + {"duration": 23.68175435066223, "amount": 81920}, + {"duration": 27.667736768722534, "amount": 81920}, + {"duration": 31.022956371307373, "amount": 81920}, + {"duration": 33.020694971084595, "amount": 81920}, + {"duration": 33.59471535682678, "amount": 81920} +] +DOWNLOADS3 = [ + {"duration": 30.008347988128662, "amount": 644411}, + {"duration": 30.73241639137268, "amount": 644411}, + {"duration": 31.845987796783447, "amount": 644411}, + {"duration": 29.703084230422974, "amount": 644411}, + {"duration": 30.438726663589478, "amount": 644411} +] SCANNER = "test" -AVG_BW = 1024 * 1024 +AVG_BW = 966080 RELAY1 = Result.Relay(FP1, NICK1, IP1, ED25519, average_bandwidth=AVG_BW) -RELAY2 = Result.Relay(FP1, NICK2, IP2, ED25519) +RELAY2 = Result.Relay(FP2, NICK2, IP2, ED25519) RESULT = Result(RELAY1, CIRC12, DEST_URL, SCANNER, t=TIME1) -RESULT_SUCCESS1 = ResultSuccess(RTTS, DOWNLOADS, RELAY1, CIRC12, DEST_URL, +RESULT_SUCCESS1 = ResultSuccess(RTTS1, DOWNLOADS1, RELAY1, CIRC12, DEST_URL, SCANNER, t=TIME1) -RESULT_SUCCESS2 = ResultSuccess(RTTS, DOWNLOADS, RELAY2, CIRC21, DEST_URL, +RESULT_SUCCESS2 = ResultSuccess(RTTS2, DOWNLOADS2, RELAY2, CIRC21, DEST_URL, SCANNER, t=TIME2) RESULT_ERROR_STREAM = ResultErrorStream(RELAY1, CIRC12, DEST_URL, SCANNER, t=TIME1, msg="Something bad") @@ -69,9 +106,9 @@ RESULT_ERROR_STREAM_DICT.update({ RESULT_SUCCESS_DICT = BASE_RESULT_DICT.copy() RESULT_SUCCESS_DICT.update({ - "rtts": RTTS, + "rtts": RTTS1, "type": "success", - "downloads": DOWNLOADS, + "downloads": DOWNLOADS1, })

1 0

[sbws/master] Add entry about v3bwfile refactor
by juga＠torproject.org 18 Sep '18

18 Sep '18

commit 517d0394702eda253a0191cb5d867d5e4821c007 Author: juga0 <juga(a)riseup.net> Date: Thu Sep 13 16:41:49 2018 +0000 Add entry about v3bwfile refactor --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5d0acce..79f41a3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,6 +28,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Remove obsolete ``sbws init`` from `DEPLOY`. - Point to config documentation. - Add, unify and reuse terms in `glossary`. +- refactor v3bwfile (#27386): move scaling method inside class ## [0.7.0] - 2018-08-09

1 0

[sbws/master] Move cap to avg bw inside of scale method
by juga＠torproject.org 18 Sep '18

18 Sep '18

commit 514671efb4ccc4f9b63dad0f5373891f7f27b990 Author: juga0 <juga(a)riseup.net> Date: Wed Aug 29 18:01:11 2018 +0000 Move cap to avg bw inside of scale method also: * fix missing avg bw after moving functions to methods * add more attrs to V3BWLine that are going to be used by other scaling methods --- sbws/lib/v3bwfile.py | 81 ++++++++++++++++++++++++++++------------------------ 1 file changed, 43 insertions(+), 38 deletions(-) diff --git a/sbws/lib/v3bwfile.py b/sbws/lib/v3bwfile.py index 42e318c..eff87f8 100644 --- a/sbws/lib/v3bwfile.py +++ b/sbws/lib/v3bwfile.py @@ -33,12 +33,16 @@ LINE_TERMINATOR = TERMINATOR + LINE_SEP # KeyValue separator in Bandwidth Lines BW_KEYVALUE_SEP_V110 = ' ' -BW_EXTRA_ARG_KEYVALUES = ['master_key_ed25519', 'nick', 'rtt', 'time', - 'success', 'error_stream', 'error_circ', - 'error_misc'] +# not inclding in the files the extra bws for now +BW_KEYVALUES_BASIC = ['node_id', 'bw'] +BW_KEYVALUES_FILE = BW_KEYVALUES_BASIC + \ + ['master_key_ed25519', 'nick', 'rtt', 'time', + 'success', 'error_stream', 'error_circ', 'error_misc'] +BW_KEYVALUES_EXTRA_BWS = ['bw_bs_median', 'bw_bs_mean', 'desc_avg_bw_bs'] +BW_KEYVALUES_EXTRA = BW_KEYVALUES_FILE + BW_KEYVALUES_EXTRA_BWS BW_KEYVALUES_INT = ['bw', 'rtt', 'success', 'error_stream', - 'error_circ', 'error_misc'] -BW_KEYVALUES = ['node_id', 'bw'] + BW_EXTRA_ARG_KEYVALUES + 'error_circ', 'error_misc'] + BW_KEYVALUES_EXTRA_BWS +BW_KEYVALUES = BW_KEYVALUES_BASIC + BW_KEYVALUES_EXTRA def num_results_of_type(results, type_str): @@ -222,26 +226,43 @@ class V3BWLine(object): self.node_id = node_id self.bw = bw [setattr(self, k, v) for k, v in kwargs.items() - if k in BW_EXTRA_ARG_KEYVALUES] + if k in BW_KEYVALUES_EXTRA] def __str__(self): return self.bw_strv110 @classmethod def from_results(cls, results): + """Convert sbws results to relays' Bandwidth Lines + + ``bs`` stands for Bytes/seconds + ``bw_bs_mean`` means the bw is obtained from the mean of the all the + downloads' bandwidth. + Downloads' bandwidth are calculated as the amount of data received + divided by the the time it took to received. + bw = data (Bytes) / time (seconds) + """ success_results = [r for r in results if isinstance(r, ResultSuccess)] - # log.debug('len(success_results) %s', len(success_results)) node_id = '$' + results[0].fingerprint - bw = cls.bw_from_results(success_results) kwargs = dict() kwargs['nick'] = results[0].nickname if getattr(results[0], 'master_key_ed25519'): kwargs['master_key_ed25519'] = results[0].master_key_ed25519 - kwargs['rtt'] = cls.rtt_from_results(success_results) kwargs['time'] = cls.last_time_from_results(results) kwargs.update(cls.result_types_from_results(results)) - bwl = cls(node_id, bw, **kwargs) - return bwl + # useful args for scaling + if success_results: + # the most recent should be the last + kwargs['desc_avg_bw_bs'] = \ + success_results[-1].relay_average_bandwidth + kwargs['rtt'] = cls.rtt_from_results(success_results) + bw = cls.bw_bs_median_from_results(success_results) + kwargs['bw_bs_mean'] = cls.bw_bs_mean_from_results(success_results) + kwargs['bw_bs_median'] = cls.bw_bs_median_from_results( + success_results) + bwl = cls(node_id, bw, **kwargs) + return bwl + return None @classmethod def from_data(cls, data, fingerprint): @@ -261,6 +282,16 @@ class V3BWLine(object): return bw_line @staticmethod + def bw_bs_median_from_results(results): + return max(round(median([dl['amount'] / dl['duration'] + for r in results for dl in r.downloads])), 1) + + @staticmethod + def bw_bs_mean_from_results(results): + return max(round(mean([dl['amount'] / dl['duration'] + for r in results for dl in r.downloads])), 1) + + @staticmethod def last_time_from_results(results): return unixts_to_isodt_str(round(max([r.time for r in results]))) @@ -278,32 +309,6 @@ class V3BWLine(object): for rt in _ResultType]) return rt_dict - @staticmethod - def bw_from_results(results): - median_bw = median([dl['amount'] / dl['duration'] - for r in results for dl in r.downloads]) - # If a relay has MaxAdvertisedBandwidth set, they may be capable of - # some large amount of bandwidth but prefer if they didn't receive it. - # We also could have managed to measure them faster than their - # {,Relay}BandwidthRate somehow. - # - # See https://github.com/pastly/simple-bw-scanner/issues/155 and - # https://trac.torproject.org/projects/tor/ticket/8494 - # - # Note how this isn't some measured-by-us average of bandwidth. It's - # the first value on the 'bandwidth' line in the relay's server - # descriptor. - bw = median_bw - relay_average_bw = [r.relay_average_bandwidth for r in results - if r.relay_average_bandwidth is not None] - if relay_average_bw: - median_relay_average_bw = median(relay_average_bw) - if median_bw > median_relay_average_bw: - bw = median_relay_average_bw - # convert to KB and ensure it's at least 1 - bw_kb = max(round(bw / 1024), 1) - return bw_kb - @property def bw_keyvalue_tuple_ls(self): """Return list of KeyValue Bandwidth Line tuples.""" @@ -393,7 +398,7 @@ class V3BWFile(object): # min is to limit the bw to descriptor average-bandwidth # max to avoid bandwidth with 0 value l.bw = max(round(min(l.desc_avg_bw_bs, - l.bw_bs_median * scale_constant / m) + l.bw * scale_constant / m) / 1000), 1) return sorted(bw_lines_scaled, key=lambda x: x.bw, reverse=reverse)

1 0

[sbws/master] Include observed bandwidth in results
by juga＠torproject.org 18 Sep '18

18 Sep '18

commit 71eab6fb0b6c2ef6aad637415c26f7326797d1b5 Author: juga0 <juga(a)riseup.net> Date: Wed Aug 29 20:22:36 2018 +0000 Include observed bandwidth in results --- tests/unit/lib/data/results.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/unit/lib/data/results.txt b/tests/unit/lib/data/results.txt index 359f213..0a0ec8c 100644 --- a/tests/unit/lib/data/results.txt +++ b/tests/unit/lib/data/results.txt @@ -1,2 +1,2 @@ -{"version": 4, "time": 1523887747, "circ": ["AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB"], "type": "success", "rtts": [0.4596822261810303, 0.44872617721557617, 0.4563450813293457, 0.44872212409973145, 0.4561030864715576, 0.4765200614929199, 0.4495084285736084, 0.45711588859558105, 0.45520496368408203, 0.4635589122772217], "fingerprint": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "scanner": "IDidntEditTheSBWSConfig", "downloads": [{"amount": 590009, "duration": 6.1014368534088135}, {"amount": 590009, "duration": 8.391342878341675}, {"amount": 321663, "duration": 7.064587831497192}, {"amount": 321663, "duration": 8.266003131866455}, {"amount": 321663, "duration": 5.779450178146362}], "dest_url": "http://y.z", "nickname": "A", "address": "111.111.111.111", "master_key_ed25519": "g+Shk00y9Md0hg1S6ptnuc/wWKbADBgdjT0Kg+TSF3s", "relay_average_bandwidth": 1000000000} +{"version": 4, "time": 1523887747, "circ": ["AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB"], "type": "success", "rtts": [0.4596822261810303, 0.44872617721557617, 0.4563450813293457, 0.44872212409973145, 0.4561030864715576, 0.4765200614929199, 0.4495084285736084, 0.45711588859558105, 0.45520496368408203, 0.4635589122772217], "fingerprint": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "scanner": "IDidntEditTheSBWSConfig", "downloads": [{"amount": 590009, "duration": 6.1014368534088135}, {"amount": 590009, "duration": 8.391342878341675}, {"amount": 321663, "duration": 7.064587831497192}, {"amount": 321663, "duration": 8.266003131866455}, {"amount": 321663, "duration": 5.779450178146362}], "dest_url": "http://y.z", "nickname": "A", "address": "111.111.111.111", "master_key_ed25519": "g+Shk00y9Md0hg1S6ptnuc/wWKbADBgdjT0Kg+TSF3s", "relay_average_bandwidth": 1000000000, "relay_observed_bandwidth": 524288} {"version": 4, "time": 1523974147, "circ": ["AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB"], "type": "error-stream", "msg": "Something bad happened while measuring bandwidth", "fingerprint": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "scanner": "IDidntEditTheSBWSConfig", "dest_url": "http://y.z", "nickname": "A", "address": "111.111.111.111", "master_key_ed25519": "g+Shk00y9Md0hg1S6ptnuc/wWKbADBgdjT0Kg+TSF3s"}

1 0

[sbws/master] ops, fix indentation
by juga＠torproject.org 18 Sep '18

18 Sep '18

commit e62a0354c940b43a495f10cc20f7fac5d204f799 Author: juga0 <juga(a)riseup.net> Date: Wed Aug 29 19:56:27 2018 +0000 ops, fix indentation --- sbws/lib/v3bwfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbws/lib/v3bwfile.py b/sbws/lib/v3bwfile.py index bd8f5d6..448323c 100644 --- a/sbws/lib/v3bwfile.py +++ b/sbws/lib/v3bwfile.py @@ -124,7 +124,7 @@ class V3BWHeader(object): for l in lines[:index_terminator] if l.split(KEYVALUE_SEP_V110)[0] in ALL_KEYVALUES]) h = cls(ts, **kwargs) - # last line is new line + # last line is new line return h, lines[index_terminator + 1:-1] @classmethod

1 0

[sbws/master] Store observed bandwidth in results
by juga＠torproject.org 18 Sep '18

18 Sep '18

commit 26587a8904250db11cd47042a969531d890a13d7 Author: juga0 <juga(a)riseup.net> Date: Sat Aug 25 12:54:58 2018 +0000 Store observed bandwidth in results --- sbws/lib/resultdump.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/sbws/lib/resultdump.py b/sbws/lib/resultdump.py index c5d88d3..abf45fb 100644 --- a/sbws/lib/resultdump.py +++ b/sbws/lib/resultdump.py @@ -200,17 +200,19 @@ class Result: ''' Implements just enough of a stem RouterStatusEntryV3 for this Result class to be happy ''' def __init__(self, fingerprint, nickname, address, master_key_ed25519, - average_bandwidth=None): + average_bandwidth=None, observed_bandwidth=None): self.fingerprint = fingerprint self.nickname = nickname self.address = address self.master_key_ed25519 = master_key_ed25519 self.average_bandwidth = average_bandwidth + self.observed_bandwidth = observed_bandwidth def __init__(self, relay, circ, dest_url, scanner_nick, t=None): self._relay = Result.Relay(relay.fingerprint, relay.nickname, relay.address, relay.master_key_ed25519, - relay.average_bandwidth) + relay.average_bandwidth, + relay.observed_bandwidth) self._circ = circ self._dest_url = dest_url self._scanner = scanner_nick @@ -225,6 +227,10 @@ class Result: return self._relay.average_bandwidth @property + def relay_observed_bandwidth(self): + return self._relay.observed_bandwidth + + @property def fingerprint(self): return self._relay.fingerprint @@ -473,7 +479,8 @@ class ResultSuccess(Result): d['rtts'], d['downloads'], Result.Relay( d['fingerprint'], d['nickname'], d['address'], - d['master_key_ed25519'], d['relay_average_bandwidth']), + d['master_key_ed25519'], d['relay_average_bandwidth'], + d['relay_observed_bandwidth']), d['circ'], d['dest_url'], d['scanner'], t=d['time']) @@ -483,6 +490,7 @@ class ResultSuccess(Result): 'rtts': self.rtts, 'downloads': self.downloads, 'relay_average_bandwidth': self.relay_average_bandwidth, + 'relay_observed_bandwidth': self.relay_observed_bandwidth, }) return d

1 0

[sbws/master] Add new constants for scaling
by juga＠torproject.org 18 Sep '18

18 Sep '18

commit d3a94d02420239e5b35073784077017c22d25220 Author: juga0 <juga(a)riseup.net> Date: Thu Aug 30 12:01:15 2018 +0000 Add new constants for scaling --- sbws/globals.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/sbws/globals.py b/sbws/globals.py index daa0a55..5e7de85 100644 --- a/sbws/globals.py +++ b/sbws/globals.py @@ -29,7 +29,15 @@ DEFAULT_LOG_CONFIG_PATH = os.path.join(PKG_DIR, 'config.log.default.ini') USER_CONFIG_PATH = os.path.join(os.path.expanduser('~'), '.sbws.ini') SOCKET_TIMEOUT = 60 # seconds -SCALE_CONSTANT = 7500 + +SBWS_SCALE_CONSTANT = 7500 +TORFLOW_SCALING = 1 +SBWS_SCALING = 2 +TORFLOW_BW_MARGIN = 0.05 +TORFLOW_OBS_LAST = 0 +TORFLOW_OBS_MEAN = 1 +TORFLOW_OBS_DECAYING = 3 + BW_LINE_SIZE = 510

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits September 2018