commit 8daed2f71ae2f6e689af994d9a7206d1618fbb1d Author: Karsten Loesing karsten.loesing@gmx.net Date: Tue May 26 10:14:23 2020 +0200

Remove some unused/commented out code. --- onionperf/analysis.py | 12 ------------ onionperf/onionperf | 43 ------------------------------------------- 2 files changed, 55 deletions(-)

diff --git a/onionperf/analysis.py b/onionperf/analysis.py index b79eac1..59d8217 100644 --- a/onionperf/analysis.py +++ b/onionperf/analysis.py @@ -19,18 +19,6 @@ from stem.response import ControlMessage, convert # onionperf imports from . import util

-ERRORS = { 'AUTH' : 'TGEN/AUTH', - 'READ' : 'TGEN/READ', - 'STALLOUT' : 'TGEN/STALLOUT', - 'TIMEOUT' : 'TGEN/TIMEOUT', - 'PROXY' : 'TOR', - 'PROXY_CANT_ATTACH' : 'TOR/CANT_ATTACH', - 'PROXY_DESTROY' : 'TOR/DESTROY', - 'PROXY_END_TIMEOUT' : 'TOR/END/TIMEOUT', - 'PROXY_END_CONNECTREFUSED' : 'TOR/END/CONNECTREFUSED', - 'PROXY_RESOLVEFAILED' : 'TOR/RESOLVEFAILED', - 'PROXY_TIMEOUT' : 'TOR/TIMEOUT' } - class Analysis(object):

def __init__(self, nickname=None, ip_address=None): diff --git a/onionperf/onionperf b/onionperf/onionperf index 1edd5a7..38ef443 100755 --- a/onionperf/onionperf +++ b/onionperf/onionperf @@ -272,49 +272,6 @@ files generated by this script will be written""", action="store_true", dest="do_simple", default=False)

-# analyze_parser = sub_parser.add_parser('analyze', description=DESC_ANALYZE, help=HELP_ANALYZE) -# analyze_parser.set_defaults(func=analyze, formatter_class=argparse.RawDescriptionHelpFormatter) -# -# analyze_parser.add_argument( -# help="""The PATH to search for tgen and tor log files, which may be '-' -# for STDIN; each log file may end in '.xz' to enable -# inline xz decompression""", -# metavar="PATH", type=type_str_path_in, -# action="store", dest="searchpath") -# -# analyze_parser.add_argument('-t', '--type', -# help="""The TYPE of Analysis to perform, which may be 'tgen', 'tor', or 'all'""", -# metavar="TYPE", type=type_supported_analysis, -# action="store", dest="atype", -# default="all") -# -# analyze_parser.add_argument('-e', '--expression', -# help="""Append a regex PATTERN to the list of strings used with -# re.search to find log file names in the search path""", -# metavar="PATTERN", type=str, -# action="append", dest="patterns", -# default=[]) -# -# analyze_parser.add_argument('-m', '--multiproc', -# help="""Enable multiprocessing with N worker process, which may be '0' -# to use the number of processor cores""", -# metavar="N", type=type_nonnegative_integer, -# action="store", dest="nprocesses", -# default=1) -# -# analyze_parser.add_argument('-p', '--prefix', -# help="""A directory PATH prefix where the processed data -# files generated by this script will be written""", -# metavar="PATH", type=type_str_dir_path_out, -# action="store", dest="prefix", -# default=os.getcwd()) -# -# analyze_parser.add_argument('-n', '--nickname', -# help="""the 'SOURCE' STRING to use in .tpf torperf stats files produced by OnionPerf""", -# metavar="STRING", type=str, -# action="store", dest="nickname", -# default=None) - # visualize visualize_parser = sub_parser.add_parser('visualize', description=DESC_VISUALIZE, help=HELP_VISUALIZE, formatter_class=my_formatter_class)