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

[sbws/master] Generate v3bw files in a dir and named with timestamp
by pastly＠torproject.org 26 Jun '18

26 Jun '18

commit b94f7ae022d7de761235fa80f69a21c9ba99aa7b Author: juga0 <juga(a)riseup.net> Date: Thu Jun 14 14:27:59 2018 +0000 Generate v3bw files in a dir and named with timestamp --- sbws/config.default.ini | 3 ++- sbws/core/generate.py | 2 ++ sbws/lib/v3bwfile.py | 4 ++-- sbws/util/config.py | 2 +- sbws/util/timestamp.py | 10 ++++++++++ 5 files changed, 17 insertions(+), 4 deletions(-) diff --git a/sbws/config.default.ini b/sbws/config.default.ini index 15ab014..faa0ab1 100644 --- a/sbws/config.default.ini +++ b/sbws/config.default.ini @@ -1,6 +1,7 @@ [paths] datadir = ${sbws_home}/datadir -v3bw_fname = ${sbws_home}/v3bw.txt +v3bw_dname = ${sbws_home}/v3bw +v3bw_fname = ${v3bw_dname}/{}.v3bw started_filepath = ${sbws_home}/started_at log_filepath = ${sbws_home}/sbws.log diff --git a/sbws/core/generate.py b/sbws/core/generate.py index 4921f57..61f807d 100644 --- a/sbws/core/generate.py +++ b/sbws/core/generate.py @@ -35,6 +35,8 @@ def main(args, conf): if not is_initted(args.directory): fail_hard('Sbws isn\'t initialized. Try sbws init') + os.makedirs(conf['paths']['v3bw_dname'], exist_ok=True) + datadir = conf['paths']['datadir'] if not os.path.isdir(datadir): fail_hard('%s does not exist', datadir) diff --git a/sbws/lib/v3bwfile.py b/sbws/lib/v3bwfile.py index c6ba9af..ba15d14 100644 --- a/sbws/lib/v3bwfile.py +++ b/sbws/lib/v3bwfile.py @@ -9,7 +9,7 @@ from sbws import __version__ from sbws.globals import SPEC_VERSION, BW_LINE_SIZE from sbws.lib.resultdump import ResultSuccess, _ResultType from sbws.util.filelock import FileLock -from sbws.util.timestamp import now_isodt_str, unixts_to_isodt_str +from sbws.util.timestamp import now_isodt_str, unixts_to_isodt_str, now_fname log = logging.getLogger(__name__) @@ -395,7 +395,7 @@ class V3BwFile(object): bw_lines = scale_lines(bw_lines, args.scale_constant) header = V3BwHeader.from_results(conf, results) f = cls(header, bw_lines) - output = args.output or conf['paths']['v3bw_fname'] + output = args.output or conf['paths']['v3bw_fname'].format(now_fname()) f.write(output) return f diff --git a/sbws/util/config.py b/sbws/util/config.py index cdf8601..1425dda 100644 --- a/sbws/util/config.py +++ b/sbws/util/config.py @@ -149,7 +149,7 @@ def _validate_paths(conf): sec = 'paths' err_tmpl = Template('$sec/$key ($val): $e') unvalidated_keys = [ - 'datadir', 'sbws_home', 'v3bw_fname', + 'datadir', 'sbws_home', 'v3bw_fname', 'v3bw_dname', 'started_filepath', 'log_filepath'] all_valid_keys = unvalidated_keys allow_missing = ['sbws_home'] diff --git a/sbws/util/timestamp.py b/sbws/util/timestamp.py index 0de7551..d4629a3 100644 --- a/sbws/util/timestamp.py +++ b/sbws/util/timestamp.py @@ -47,6 +47,16 @@ def now_isodt_str(): return dt_obj_to_isodt_str(datetime.utcnow()) +def now_fname(): + """ + Return now timestamp in UTC formatted as %Y%m%d_%H%M%S string for file + names. + + :returns: now timestamp in UTC formatted as %Y%m%d_%H%M%S string + """ + return datetime.utcnow().strftime("%Y%m%d_%H%M%S") + + def unixts_to_str(unixts): """Convert unix timestamp integer or float to string""" # even if it is only converting to str, ensure that input is nothing else

1 0

[sbws/master] Fix two linter warnings
by pastly＠torproject.org 26 Jun '18

26 Jun '18

commit ef6e152b3c94f3e258575521e6d0887d7b68debc Author: Matt Traudt <sirmatt(a)ksu.edu> Date: Thu Jun 14 12:44:49 2018 -0400 Fix two linter warnings --- sbws/lib/v3bwfile.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sbws/lib/v3bwfile.py b/sbws/lib/v3bwfile.py index 40a8fd5..ddfefe7 100644 --- a/sbws/lib/v3bwfile.py +++ b/sbws/lib/v3bwfile.py @@ -75,7 +75,7 @@ def read_started_ts(conf): """ try: filepath = conf['paths']['started_filepath'] - except TypeError as e: + except TypeError: return '' try: with FileLock(filepath): @@ -184,7 +184,7 @@ class V3BwHeader(object): assert isinstance(lines, list) try: index_terminator = lines.index(TERMINATOR) - except ValueError as e: + except ValueError: # is not a bw file or is v100 log.warn('Terminator is not in lines') return None

1 0

[sbws/master] Change the path of the v3bw files to a dir too
by pastly＠torproject.org 26 Jun '18

26 Jun '18

commit 3de8eeda75c25530ae05d4e28b6b2f633bbde15a Author: juga0 <juga(a)riseup.net> Date: Thu Jun 14 15:00:45 2018 +0000 Change the path of the v3bw files to a dir too It does not change functionality right now, but probably needed for future tests --- tests/unit/lib/data/{v3bw.txt => v3bw/20180425_131057.v3bw} | 0 tests/unit/lib/test_v3bwfile.py | 6 ++++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/unit/lib/data/v3bw.txt b/tests/unit/lib/data/v3bw/20180425_131057.v3bw similarity index 100% rename from tests/unit/lib/data/v3bw.txt rename to tests/unit/lib/data/v3bw/20180425_131057.v3bw diff --git a/tests/unit/lib/test_v3bwfile.py b/tests/unit/lib/test_v3bwfile.py index ca47a2b..e18278d 100644 --- a/tests/unit/lib/test_v3bwfile.py +++ b/tests/unit/lib/test_v3bwfile.py @@ -125,7 +125,8 @@ def test_v3bwheader_from_file(datadir): file_created=file_created, generator_started=generator_started, earliest_bandwidth=earliest_bandwidth) - text = datadir.read('v3bw.txt') + # at some point this should be read from conftest + text = datadir.read('v3bw/20180425_131057.v3bw') h, _ = V3BwHeader.from_text_v110(text) assert str(h) == str(header) @@ -156,7 +157,8 @@ def test_v3bwline_from_results_file(datadir): def test_v3bwfile(datadir, tmpdir): """Test generate v3bw file (including relay_lines).""" - v3bw = datadir.read('v3bw.txt') + # at some point this should be obtained from conftest + v3bw = datadir.read('v3bw/20180425_131057.v3bw') results = load_result_file(str(datadir.join("results.txt"))) header = V3BwHeader(timestamp_l, file_created=file_created,

1 0

[sbws/master] Changelog entry belongs in Unreleased; add more details
by pastly＠torproject.org 26 Jun '18

26 Jun '18

commit c47238dd07d890ad09ada9f078e5425d44ba539e Author: Matt Traudt <sirmatt(a)ksu.edu> Date: Thu Jun 14 12:44:02 2018 -0400 Changelog entry belongs in Unreleased; add more details --- CHANGELOG.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d3255c8..8981cb2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] +## Changed + +- Change the path where the Bandwidth List files are generated: now they are + stored in `v3bw` directory, named `YYmmdd_HHMMSS.v3bw`, and previously +generated ones are kept. A `latest.v3bw` symlink is updated. (GH#179 GHPR#190) + ## [0.4.1] ### Changed @@ -21,8 +27,6 @@ is at least 2.00, 1.75, 1.50, 1.25, or 1.00 times as fast. If that fails, instead of giving up, (2) pick the fastest relay in the network instead of giving up. This compliments the previous change about measuring target exits in the exit position. -- Change the path where the Bandwidth List files are generated: now they are - stored in `v3bw` directory and named `YYmmdd_HHMMSS.v3bw` ### Fixed

1 0

[sbws/master] Make symlink relative ...
by pastly＠torproject.org 26 Jun '18

26 Jun '18

commit e59349c8c95b5fe749aaeda32333515aa1122e6d Author: Matt Traudt <sirmatt(a)ksu.edu> Date: Thu Jun 14 18:25:21 2018 -0400 Make symlink relative ... I think this is the more common way to do things. It allows you to move the files around without the symlink breaking. --- sbws/lib/v3bwfile.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sbws/lib/v3bwfile.py b/sbws/lib/v3bwfile.py index ddfefe7..9b8e2e8 100644 --- a/sbws/lib/v3bwfile.py +++ b/sbws/lib/v3bwfile.py @@ -414,9 +414,10 @@ class V3BwFile(object): fd.write(str(self.header)) for line in self.bw_lines: fd.write(str(line)) + output_basename = os.path.basename(output) log.debug('Creating symlink from {} to {}.' - .format(output, out_link)) - os.symlink(output, out_link) + .format(output_basename, out_link)) + os.symlink(output_basename, out_link) else: with open(output, 'wt') as fd: fd.write(str(self.header))

1 0

[sbws/master] Fix header level
by pastly＠torproject.org 26 Jun '18

26 Jun '18

commit 0402bdc483313927108539663d956f2d97b9400d Author: Matt Traudt <pastly(a)users.noreply.github.com> Date: Thu Jun 14 14:00:21 2018 -0400 Fix header level --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8981cb2..3e838ac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] -## Changed +### Changed - Change the path where the Bandwidth List files are generated: now they are stored in `v3bw` directory, named `YYmmdd_HHMMSS.v3bw`, and previously

1 0

[sbws/master] Create symlink to latest v3bw file
by pastly＠torproject.org 26 Jun '18

26 Jun '18

commit 0db6329319ec9ea2a9486838257d5c1c3e210cc1 Author: juga0 <juga(a)riseup.net> Date: Thu Jun 14 15:54:24 2018 +0000 Create symlink to latest v3bw file also lock the directory except when writing to the standard output, needed for test_generate.py --- sbws/lib/v3bwfile.py | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/sbws/lib/v3bwfile.py b/sbws/lib/v3bwfile.py index ba15d14..1294d99 100644 --- a/sbws/lib/v3bwfile.py +++ b/sbws/lib/v3bwfile.py @@ -3,12 +3,13 @@ (v3bw) used by bandwidth authorities.""" import logging +import os from statistics import median from sbws import __version__ from sbws.globals import SPEC_VERSION, BW_LINE_SIZE from sbws.lib.resultdump import ResultSuccess, _ResultType -from sbws.util.filelock import FileLock +from sbws.util.filelock import FileLock, DirectoryLock from sbws.util.timestamp import now_isodt_str, unixts_to_isodt_str, now_fname log = logging.getLogger(__name__) @@ -401,7 +402,16 @@ class V3BwFile(object): def write(self, output): log.info('Writing v3bw file to %s', output) - with open(output, 'wt') as fd: - fd.write(str(self.header)) - for line in self.bw_lines: - fd.write(str(line)) + # to keep test_generate.py working + if output != '/dev/stdout': + with DirectoryLock(os.path.dirname(output)): + with open(output, 'wt') as fd: + fd.write(str(self.header)) + for line in self.bw_lines: + fd.write(str(line)) + os.symlink(output, 'latest.v3bw') + else: + with open(output, 'wt') as fd: + fd.write(str(self.header)) + for line in self.bw_lines: + fd.write(str(line))

1 0

[sbws/master] Refactor V3BwFile ...
by pastly＠torproject.org 26 Jun '18

26 Jun '18

commit 873530454b07d99674f805b8652888b866cb9683 Author: Matt Traudt <sirmatt(a)ksu.edu> Date: Thu Jun 14 18:34:37 2018 -0400 Refactor V3BwFile ... It doesn't need to know how to write to a file. It store and organizes data. --- sbws/core/generate.py | 29 +++++++++++++++++++++++++++++ sbws/lib/v3bwfile.py | 31 ++----------------------------- 2 files changed, 31 insertions(+), 29 deletions(-) diff --git a/sbws/core/generate.py b/sbws/core/generate.py index 61f807d..3f0df18 100644 --- a/sbws/core/generate.py +++ b/sbws/core/generate.py @@ -4,6 +4,8 @@ from sbws.lib.resultdump import load_recent_results_in_datadir from argparse import ArgumentDefaultsHelpFormatter import os import logging +from sbws.util.filelock import DirectoryLock +from sbws.util.timestamp import now_fname log = logging.getLogger(__name__) @@ -31,6 +33,31 @@ def gen_parser(sub): 'out, and we do so proportionally') +def _write_v3bw_file(v3bwfile, output): + log.info('Writing v3bw file to %s', output) + out_dir = os.path.dirname(output) + out_link = os.path.join(out_dir, 'latest.v3bw') + if os.path.exists(out_link): + log.debug('Deleting existing symlink before creating a new one.') + os.remove(out_link) + # to keep test_generate.py working + if output != '/dev/stdout': + with DirectoryLock(out_dir): + with open(output, 'wt') as fd: + fd.write(str(v3bwfile.header)) + for line in v3bwfile.bw_lines: + fd.write(str(line)) + output_basename = os.path.basename(output) + log.debug('Creating symlink from {} to {}.' + .format(output_basename, out_link)) + os.symlink(output_basename, out_link) + else: + with open(output, 'wt') as fd: + fd.write(str(v3bwfile.header)) + for line in v3bwfile.bw_lines: + fd.write(str(line)) + + def main(args, conf): if not is_initted(args.directory): fail_hard('Sbws isn\'t initialized. Try sbws init') @@ -51,4 +78,6 @@ def main(args, conf): 'ran sbws scanner recently?)') return bw_file = V3BwFile.from_arg_results(args, conf, results) + output = args.output or conf['paths']['v3bw_fname'].format(now_fname()) + _write_v3bw_file(bw_file, output) log.info('Mean bandwidth per line: %f "KiB"', bw_file.avg_bw) diff --git a/sbws/lib/v3bwfile.py b/sbws/lib/v3bwfile.py index 9b8e2e8..3cff29d 100644 --- a/sbws/lib/v3bwfile.py +++ b/sbws/lib/v3bwfile.py @@ -3,14 +3,13 @@ (v3bw) used by bandwidth authorities.""" import logging -import os from statistics import median from sbws import __version__ from sbws.globals import SPEC_VERSION, BW_LINE_SIZE from sbws.lib.resultdump import ResultSuccess, _ResultType -from sbws.util.filelock import FileLock, DirectoryLock -from sbws.util.timestamp import now_isodt_str, unixts_to_isodt_str, now_fname +from sbws.util.filelock import FileLock +from sbws.util.timestamp import now_isodt_str, unixts_to_isodt_str log = logging.getLogger(__name__) @@ -396,30 +395,4 @@ class V3BwFile(object): bw_lines = scale_lines(bw_lines, args.scale_constant) header = V3BwHeader.from_results(conf, results) f = cls(header, bw_lines) - output = args.output or conf['paths']['v3bw_fname'].format(now_fname()) - f.write(output) return f - - def write(self, output): - log.info('Writing v3bw file to %s', output) - out_dir = os.path.dirname(output) - out_link = os.path.join(out_dir, 'latest.v3bw') - if os.path.exists(out_link): - log.debug('Deleting existing symlink before creating a new one.') - os.remove(out_link) - # to keep test_generate.py working - if output != '/dev/stdout': - with DirectoryLock(out_dir): - with open(output, 'wt') as fd: - fd.write(str(self.header)) - for line in self.bw_lines: - fd.write(str(line)) - output_basename = os.path.basename(output) - log.debug('Creating symlink from {} to {}.' - .format(output_basename, out_link)) - os.symlink(output_basename, out_link) - else: - with open(output, 'wt') as fd: - fd.write(str(self.header)) - for line in self.bw_lines: - fd.write(str(line))

1 0

[sbws/master] Update changelog: v3bw files are stored in v3bw dir
by pastly＠torproject.org 26 Jun '18

26 Jun '18

commit a46bac3d3268ce5e2ebbb16794ef197065fc2d17 Author: juga0 <juga(a)riseup.net> Date: Thu Jun 14 15:07:21 2018 +0000 Update changelog: v3bw files are stored in v3bw dir --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 79d781f..d3255c8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,8 @@ is at least 2.00, 1.75, 1.50, 1.25, or 1.00 times as fast. If that fails, instead of giving up, (2) pick the fastest relay in the network instead of giving up. This compliments the previous change about measuring target exits in the exit position. +- Change the path where the Bandwidth List files are generated: now they are + stored in `v3bw` directory and named `YYmmdd_HHMMSS.v3bw` ### Fixed

1 0

[sbws/master] Standardize capitalization of v3bw class names
by pastly＠torproject.org 26 Jun '18

26 Jun '18

commit ee80724056521a4aa3b0741ab53f68b0448189bb Author: Matt Traudt <sirmatt(a)ksu.edu> Date: Thu Jun 14 18:37:25 2018 -0400 Standardize capitalization of v3bw class names --- sbws/core/generate.py | 4 ++-- sbws/lib/v3bwfile.py | 10 +++++----- tests/unit/lib/test_v3bwfile.py | 24 ++++++++++++------------ 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/sbws/core/generate.py b/sbws/core/generate.py index 3f0df18..25653b1 100644 --- a/sbws/core/generate.py +++ b/sbws/core/generate.py @@ -1,5 +1,5 @@ from sbws.globals import (fail_hard, is_initted, SCALE_CONSTANT) -from sbws.lib.v3bwfile import V3BwFile +from sbws.lib.v3bwfile import V3BWFile from sbws.lib.resultdump import load_recent_results_in_datadir from argparse import ArgumentDefaultsHelpFormatter import os @@ -77,7 +77,7 @@ def main(args, conf): log.warning('No recent results, so not generating anything. (Have you ' 'ran sbws scanner recently?)') return - bw_file = V3BwFile.from_arg_results(args, conf, results) + bw_file = V3BWFile.from_arg_results(args, conf, results) output = args.output or conf['paths']['v3bw_fname'].format(now_fname()) _write_v3bw_file(bw_file, output) log.info('Mean bandwidth per line: %f "KiB"', bw_file.avg_bw) diff --git a/sbws/lib/v3bwfile.py b/sbws/lib/v3bwfile.py index e09392e..5b07f80 100644 --- a/sbws/lib/v3bwfile.py +++ b/sbws/lib/v3bwfile.py @@ -95,7 +95,7 @@ def result_type_to_key(type_str): return type_str.replace('-', '_') -class V3BwHeader(object): +class V3BWHeader(object): """ Create a bandwidth measurements (V3bw) header following bandwidth measurements document spec version 1.1.0. @@ -178,7 +178,7 @@ class V3BwHeader(object): def from_lines_v110(cls, lines): """ :param list lines: list of lines to parse - :returns: tuple of V3BwHeader object and non-header lines + :returns: tuple of V3BWHeader object and non-header lines """ assert isinstance(lines, list) try: @@ -198,7 +198,7 @@ class V3BwHeader(object): def from_text_v110(self, text): """ :param str text: text to parse - :returns: tuple of V3BwHeader object and non-header lines + :returns: tuple of V3BWHeader object and non-header lines """ assert isinstance(text, str) return self.from_lines_v110(text.split(LINE_SEP)) @@ -351,7 +351,7 @@ class V3BWLine(object): return cls.from_results(data[fingerprint]) -class V3BwFile(object): +class V3BWFile(object): """ Create a Bandwidth List file following spec version 1.1.0 @@ -384,6 +384,6 @@ class V3BwFile(object): bw_lines = sorted(bw_lines, key=lambda d: d.bw, reverse=True) if args.scale: bw_lines = scale_lines(bw_lines, args.scale_constant) - header = V3BwHeader.from_results(conf, results) + header = V3BWHeader.from_results(conf, results) f = cls(header, bw_lines) return f diff --git a/tests/unit/lib/test_v3bwfile.py b/tests/unit/lib/test_v3bwfile.py index e18278d..2f4a631 100644 --- a/tests/unit/lib/test_v3bwfile.py +++ b/tests/unit/lib/test_v3bwfile.py @@ -5,9 +5,9 @@ import json from sbws import __version__ as version from sbws.globals import SPEC_VERSION, RESULT_VERSION from sbws.lib.resultdump import Result, load_result_file -from sbws.lib.v3bwfile import (V3BwHeader, V3BWLine, TERMINATOR, LINE_SEP, +from sbws.lib.v3bwfile import (V3BWHeader, V3BWLine, TERMINATOR, LINE_SEP, KEYVALUE_SEP_V110, num_results_of_type, - V3BwFile) + V3BWFile) timestamp = 1523974147 timestamp_l = str(timestamp) @@ -86,13 +86,13 @@ RESULT_ERROR_STREAM_STR = str(RESULT_ERROR_STREAM_DICT) def test_v3bwheader_str(): """Test header str""" - header = V3BwHeader(timestamp_l, file_created=file_created) + header = V3BWHeader(timestamp_l, file_created=file_created) assert header_str == str(header) def test_v3bwheader_extra_str(): """Test header str with additional headers""" - header = V3BwHeader(timestamp_l, + header = V3BWHeader(timestamp_l, file_created=file_created, generator_started=generator_started, earliest_bandwidth=earliest_bandwidth) @@ -101,33 +101,33 @@ def test_v3bwheader_extra_str(): def test_v3bwheader_from_lines(): """""" - header_obj = V3BwHeader(timestamp_l, + header_obj = V3BWHeader(timestamp_l, file_created=file_created, generator_started=generator_started, earliest_bandwidth=earliest_bandwidth) - header, _ = V3BwHeader.from_lines_v110(header_extra_ls) + header, _ = V3BWHeader.from_lines_v110(header_extra_ls) assert str(header_obj) == str(header) def test_v3bwheader_from_text(): """""" - header_obj = V3BwHeader(timestamp_l, + header_obj = V3BWHeader(timestamp_l, file_created=file_created, generator_started=generator_started, earliest_bandwidth=earliest_bandwidth) - header, _ = V3BwHeader.from_text_v110(header_extra_str) + header, _ = V3BWHeader.from_text_v110(header_extra_str) assert str(header_obj) == str(header) def test_v3bwheader_from_file(datadir): """Test header str with additional headers""" - header = V3BwHeader(timestamp_l, + header = V3BWHeader(timestamp_l, file_created=file_created, generator_started=generator_started, earliest_bandwidth=earliest_bandwidth) # at some point this should be read from conftest text = datadir.read('v3bw/20180425_131057.v3bw') - h, _ = V3BwHeader.from_text_v110(text) + h, _ = V3BWHeader.from_text_v110(text) assert str(h) == str(header) @@ -160,10 +160,10 @@ def test_v3bwfile(datadir, tmpdir): # at some point this should be obtained from conftest v3bw = datadir.read('v3bw/20180425_131057.v3bw') results = load_result_file(str(datadir.join("results.txt"))) - header = V3BwHeader(timestamp_l, + header = V3BWHeader(timestamp_l, file_created=file_created, generator_started=generator_started, earliest_bandwidth=earliest_bandwidth) bwls = [V3BWLine.from_results(results[fp]) for fp in results] - f = V3BwFile(header, bwls) + f = V3BWFile(header, bwls) assert v3bw == str(f)

1 0