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

[arm/master] Generating bandwidth title during BW events
by atagar＠torproject.org 26 Oct '14

26 Oct '14

commit 6c5905c992b795bca10e8f3982ddb3bc7f47141d Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Oct 26 13:49:45 2014 -0700 Generating bandwidth title during BW events We generated the bandwidth stat's title during NEWDESC events rather than BW. Chaning this for a few reasons... 1. We did it to reduce load, but Stem has caching so this isn't as much of a concern any longer. 2. Only listing to NEWDESC events meant that we showed the wrong values if the user did a SETCONF for their rate. 3. This was the only stat to listen to NEWDESC events. The more we can get these doing the same thing the simpler we'll be able to make the code. --- arm/graph_panel.py | 62 +++++++++++++++++++--------------------------------- 1 file changed, 23 insertions(+), 39 deletions(-) diff --git a/arm/graph_panel.py b/arm/graph_panel.py index 04e14a8..4bb0939 100644 --- a/arm/graph_panel.py +++ b/arm/graph_panel.py @@ -28,7 +28,7 @@ import stem.control from arm.util import bandwidth_from_state, msg, panel, tor_controller -from stem.control import Listener, State +from stem.control import Listener from stem.util import conf, enum, log, str_tools, system GraphStat = enum.Enum('BANDWIDTH', 'CONNECTIONS', 'SYSTEM_RESOURCES') @@ -189,11 +189,6 @@ class BandwidthStats(GraphCategory): controller = tor_controller() - self.reset_listener(controller, State.INIT, None) # initializes values - - controller.add_status_listener(self.reset_listener) - self.new_desc_event(None) # updates title params - # We both show our 'total' attributes and use it to determine our average. # # If we can get *both* our start time and the totals from tor (via 'GETINFO @@ -211,9 +206,6 @@ class BandwidthStats(GraphCategory): else: self.start_time = time.time() - def reset_listener(self, controller, event_type, _): - self.new_desc_event(None) # updates title params - def prepopulate_from_state(self): """ Attempts to use tor's state file to prepopulate values for the 15 minute @@ -280,46 +272,38 @@ class BandwidthStats(GraphCategory): ', total: %s' % _size_label(self.secondary.total * 1024), ] - def new_desc_event(self, event): + stats = [] controller = tor_controller() - if not controller.is_alive(): - return # keep old values - - my_fingerprint = controller.get_info('fingerprint', None) + bw_rate = controller.get_effective_rate(None) + bw_burst = controller.get_effective_rate(None, burst = True) - if not event or (my_fingerprint and my_fingerprint in [fp for fp, _ in event.relays]): - stats = [] + if bw_rate and bw_burst: + bw_rate_label = _size_label(bw_rate) + bw_burst_label = _size_label(bw_burst) - bw_rate = controller.get_effective_rate(None) - bw_burst = controller.get_effective_rate(None, burst = True) + # if both are using rounded values then strip off the '.0' decimal - if bw_rate and bw_burst: - bw_rate_label = _size_label(bw_rate) - bw_burst_label = _size_label(bw_burst) + if '.0' in bw_rate_label and '.0' in bw_burst_label: + bw_rate_label = bw_rate_label.split('.', 1)[0] + bw_burst_label = bw_burst_label.split('.', 1)[0] - # if both are using rounded values then strip off the '.0' decimal + stats.append('limit: %s/s' % bw_rate_label) + stats.append('burst: %s/s' % bw_burst_label) - if '.0' in bw_rate_label and '.0' in bw_burst_label: - bw_rate_label = bw_rate_label.split('.', 1)[0] - bw_burst_label = bw_burst_label.split('.', 1)[0] + my_router_status_entry = controller.get_network_status(default = None) + measured_bw = getattr(my_router_status_entry, 'bandwidth', None) - stats.append('limit: %s/s' % bw_rate_label) - stats.append('burst: %s/s' % bw_burst_label) - - my_router_status_entry = controller.get_network_status(default = None) - measured_bw = getattr(my_router_status_entry, 'bandwidth', None) - - if measured_bw: - stats.append('measured: %s/s' % _size_label(measured_bw)) - else: - my_server_descriptor = controller.get_server_descriptor(default = None) - observed_bw = getattr(my_server_descriptor, 'observed_bandwidth', None) + if measured_bw: + stats.append('measured: %s/s' % _size_label(measured_bw)) + else: + my_server_descriptor = controller.get_server_descriptor(default = None) + observed_bw = getattr(my_server_descriptor, 'observed_bandwidth', None) - if observed_bw: - stats.append('observed: %s/s' % _size_label(observed_bw)) + if observed_bw: + stats.append('observed: %s/s' % _size_label(observed_bw)) - self.title_stats = stats + self.title_stats = stats class ConnectionStats(GraphCategory):

1 0

[arm/master] Making graph headers attributes
by atagar＠torproject.org 26 Oct '14

26 Oct '14

commit 3816603d2276a6ced116caad774b0306ac931bc8 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Oct 26 13:39:33 2014 -0700 Making graph headers attributes As with the title, making the graph headers a couple attributes: the name and stats we want to render. This loses the 'collapsing' functionality for the bandwidth stat's header. I'll probably re-introduce this as a general feature for all stats. --- arm/graph_panel.py | 100 ++++++++++++++++++++++------------------------------ 1 file changed, 42 insertions(+), 58 deletions(-) diff --git a/arm/graph_panel.py b/arm/graph_panel.py index 36967c2..04e14a8 100644 --- a/arm/graph_panel.py +++ b/arm/graph_panel.py @@ -136,28 +136,30 @@ class GraphCategory(object): :var Stat primary: first subgraph :var Stat secondary: second subgraph :var list title_stats: additional information to include in the graph title + :var list primary_header_stats: additional information for the primary header + :var list secondary_header_stats: additional information for the secondary header """ TITLE = '' + PRIMARY_HEADER = '' + SECONDARY_HEADER = '' def __init__(self, clone = None): if clone: self.primary = Stat(clone.primary) self.secondary = Stat(clone.secondary) self.title_stats = list(clone.title_stats) + self.primary_header_stats = list(clone.primary_header_stats) + self.secondary_header_stats = list(clone.secondary_header_stats) else: self.primary = Stat() self.secondary = Stat() self.title_stats = [] + self.primary_header_stats = [] + self.secondary_header_stats = [] tor_controller().add_event_listener(self.bandwidth_event, stem.control.EventType.BW) - def primary_header(self, width): - return '' - - def secondary_header(self, width): - return '' - def bandwidth_event(self, event): """ Called when it's time to process another event. All graphs use tor BW @@ -173,6 +175,8 @@ class BandwidthStats(GraphCategory): """ TITLE = 'Bandwidth' + PRIMARY_HEADER = 'Download' + SECONDARY_HEADER = 'Upload' def __init__(self, clone = None): GraphCategory.__init__(self, clone) @@ -264,39 +268,17 @@ class BandwidthStats(GraphCategory): self.primary.update(event.read / 1024.0) self.secondary.update(event.written / 1024.0) - def primary_header(self, width): - stats = ['%-14s' % ('%s/sec' % _size_label(self.primary.latest_value * 1024))] - - # if wide then avg and total are part of the header, otherwise they're on - # the x-axis - - if width * 2 > COLLAPSE_WIDTH: - stats.append('- avg: %s/sec' % _size_label(self.primary.total / (time.time() - self.start_time) * 1024)) - stats.append(', total: %s' % _size_label(self.primary.total * 1024)) - - stats_label = str_tools.join(stats, '', width - 12) - - if stats_label: - return 'Download (%s):' % stats_label - else: - return 'Download:' - - def secondary_header(self, width): - stats = ['%-14s' % ('%s/sec' % _size_label(self.secondary.latest_value * 1024))] - - # if wide then avg and total are part of the header, otherwise they're on - # the x-axis - - if width * 2 > COLLAPSE_WIDTH: - stats.append('- avg: %s/sec' % _size_label(self.secondary.total / (time.time() - self.start_time) * 1024)) - stats.append(', total: %s' % _size_label(self.secondary.total * 1024)) - - stats_label = str_tools.join(stats, '', width - 10) + self.primary_header_stats = [ + '%-14s' % ('%s/sec' % _size_label(self.primary.latest_value * 1024)), + '- avg: %s/sec' % _size_label(self.primary.total / (time.time() - self.start_time) * 1024), + ', total: %s' % _size_label(self.primary.total * 1024), + ] - if stats_label: - return 'Upload (%s):' % stats_label - else: - return 'Upload:' + self.secondary_header_stats = [ + '%-14s' % ('%s/sec' % _size_label(self.secondary.latest_value * 1024)), + '- avg: %s/sec' % _size_label(self.secondary.total / (time.time() - self.start_time) * 1024), + ', total: %s' % _size_label(self.secondary.total * 1024), + ] def new_desc_event(self, event): controller = tor_controller() @@ -346,14 +328,8 @@ class ConnectionStats(GraphCategory): """ TITLE = 'Connection Count' - - def primary_header(self, width): - avg = self.primary.total / max(1, self.primary.tick) - return 'Inbound (%s, avg: %s):' % (self.primary.latest_value, avg) - - def secondary_header(self, width): - avg = self.secondary.total / max(1, self.secondary.tick) - return 'Outbound (%s, avg: %s):' % (self.secondary.latest_value, avg) + PRIMARY_HEADER = 'Inbound' + SECONDARY_HEADER = 'Outbound' def bandwidth_event(self, event): inbound_count, outbound_count = 0, 0 @@ -374,6 +350,12 @@ class ConnectionStats(GraphCategory): self.primary.update(inbound_count) self.secondary.update(outbound_count) + avg = self.primary.total / max(1, self.primary.tick) + self.primary_header_stats = [str(self.primary.latest_value), ', avg: %s' % avg] + + avg = self.secondary.total / max(1, self.secondary.tick) + self.secondary_header_stats = [str(self.secondary.latest_value), ', avg: %s' % avg] + class ResourceStats(GraphCategory): """ @@ -381,25 +363,23 @@ class ResourceStats(GraphCategory): """ TITLE = 'System Resources' + PRIMARY_HEADER = 'CPU' + SECONDARY_HEADER = 'Memory' + + def bandwidth_event(self, event): + resources = arm.util.tracker.get_resource_tracker().get_value() + self.primary.update(resources.cpu_sample * 100) # decimal percentage to whole numbers + self.secondary.update(resources.memory_bytes / 1048576) # translate size to MB so axis labels are short - def primary_header(self, width): avg = self.primary.total / max(1, self.primary.tick) - return 'CPU (%0.1f%%, avg: %0.1f%%):' % (self.primary.latest_value, avg) + self.primary_header_stats = ['%0.1f%%' % self.primary.latest_value, ', avg: %0.1f%%' % avg] - def secondary_header(self, width): # memory sizes are converted from MB to B before generating labels usage_label = str_tools.size_label(self.secondary.latest_value * 1048576, 1) avg = self.secondary.total / max(1, self.secondary.tick) - avg_label = str_tools.size_label(avg * 1048576, 1) - - return 'Memory (%s, avg: %s):' % (usage_label, avg_label) - - def bandwidth_event(self, event): - resources = arm.util.tracker.get_resource_tracker().get_value() - self.primary.update(resources.cpu_sample * 100) # decimal percentage to whole numbers - self.secondary.update(resources.memory_bytes / 1048576) # translate size to MB so axis labels are short + self.secondary_header_stats = [usage_label, ', avg: %s' % str_tools.size_label(avg * 1048576, 1)] class GraphPanel(panel.Panel): @@ -646,7 +626,11 @@ class GraphPanel(panel.Panel): # top labels - left, right = param.primary_header(width / 2), param.secondary_header(width / 2) + primary_header_stats = str_tools.join(param.primary_header_stats, '', (width / 2) - len(param.PRIMARY_HEADER) - 4) + left = '%s (%s):' % (param.PRIMARY_HEADER, primary_header_stats) if primary_header_stats else '%s:' % param.PRIMARY_HEADER + + secondary_header_stats = str_tools.join(param.secondary_header_stats, '', (width / 2) - len(param.SECONDARY_HEADER) - 4) + right = '%s (%s):' % (param.SECONDARY_HEADER, secondary_header_stats) if secondary_header_stats else '%s:' % param.SECONDARY_HEADER if left: self.addstr(1, 0, left, curses.A_BOLD, PRIMARY_COLOR)

1 0

[arm/master] Moving start time into Stat class
by atagar＠torproject.org 26 Oct '14

26 Oct '14

commit e3611097e2b6f742ef95ec359469c4c75c3998f4 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Oct 26 14:00:43 2014 -0700 Moving start time into Stat class This is only used by the bandwidth stats, but it's the last attribute in those classes. Moving this will enable us to do away with a lotta crap. :) --- arm/graph_panel.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/arm/graph_panel.py b/arm/graph_panel.py index 4bb0939..a15a212 100644 --- a/arm/graph_panel.py +++ b/arm/graph_panel.py @@ -101,6 +101,7 @@ class Stat(object): self.latest_value = clone.latest_value self.total = clone.total self.tick = clone.tick + self.start_time = clone.start_time self.values = copy.deepcopy(clone.values) self.max_value = dict(clone.max_value) self._in_process_value = dict(clone._in_process_value) @@ -108,6 +109,7 @@ class Stat(object): self.latest_value = 0 self.total = 0 self.tick = 0 + self.start_time = time.time() self.values = dict([(i, CONFIG['features.graph.max_width'] * [0]) for i in CONFIG['attr.graph.intervals']]) self.max_value = dict([(i, 0) for i in CONFIG['attr.graph.intervals']]) self._in_process_value = dict([(i, 0) for i in CONFIG['attr.graph.intervals']]) @@ -181,9 +183,7 @@ class BandwidthStats(GraphCategory): def __init__(self, clone = None): GraphCategory.__init__(self, clone) - if clone: - self.start_time = clone.start_time - else: + if not clone: # listens for tor reload (sighup) events which can reset the bandwidth # rate/burst @@ -202,9 +202,7 @@ class BandwidthStats(GraphCategory): if read_total and write_total and start_time: self.primary.total = int(read_total) / 1024 # Bytes -> KB self.secondary.total = int(write_total) / 1024 # Bytes -> KB - self.start_time = start_time - else: - self.start_time = time.time() + self.primary.start_time = self.secondary.start_time = start_time def prepopulate_from_state(self): """ @@ -262,13 +260,13 @@ class BandwidthStats(GraphCategory): self.primary_header_stats = [ '%-14s' % ('%s/sec' % _size_label(self.primary.latest_value * 1024)), - '- avg: %s/sec' % _size_label(self.primary.total / (time.time() - self.start_time) * 1024), + '- avg: %s/sec' % _size_label(self.primary.total / (time.time() - self.primary.start_time) * 1024), ', total: %s' % _size_label(self.primary.total * 1024), ] self.secondary_header_stats = [ '%-14s' % ('%s/sec' % _size_label(self.secondary.latest_value * 1024)), - '- avg: %s/sec' % _size_label(self.secondary.total / (time.time() - self.start_time) * 1024), + '- avg: %s/sec' % _size_label(self.secondary.total / (time.time() - self.secondary.start_time) * 1024), ', total: %s' % _size_label(self.secondary.total * 1024), ]

1 0

[arm/master] Moving graph stat constants to config
by atagar＠torproject.org 26 Oct '14

26 Oct '14

commit 307829656986d48ceb9c5d9da5bd4c16a1ab6ca2 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Oct 26 14:17:59 2014 -0700 Moving graph stat constants to config Moving the string constants to the config. That's what it's there for. --- arm/config/attributes.cfg | 13 +++++++++++++ arm/graph_panel.py | 44 +++++++++++++++----------------------------- 2 files changed, 28 insertions(+), 29 deletions(-) diff --git a/arm/config/attributes.cfg b/arm/config/attributes.cfg index 5b49a37..7452a71 100644 --- a/arm/config/attributes.cfg +++ b/arm/config/attributes.cfg @@ -35,3 +35,16 @@ attr.graph.intervals 15 minute => 900 attr.graph.intervals 30 minute => 1800 attr.graph.intervals hourly => 3600 attr.graph.intervals daily => 86400 + +attr.graph.title bandwidth => Bandwidth +attr.graph.title connections => Connection Count +attr.graph.title resources => System Resources + +attr.graph.header.primary bandwidth => Download +attr.graph.header.primary connections => Inbound +attr.graph.header.primary resources => CPU + +attr.graph.header.secondary bandwidth => Upload +attr.graph.header.secondary connections => Outbound +attr.graph.header.secondary resources => Memory + diff --git a/arm/graph_panel.py b/arm/graph_panel.py index a15a212..f0a1ee7 100644 --- a/arm/graph_panel.py +++ b/arm/graph_panel.py @@ -31,7 +31,7 @@ from arm.util import bandwidth_from_state, msg, panel, tor_controller from stem.control import Listener from stem.util import conf, enum, log, str_tools, system -GraphStat = enum.Enum('BANDWIDTH', 'CONNECTIONS', 'SYSTEM_RESOURCES') +GraphStat = enum.Enum(('BANDWIDTH', 'bandwidth'), ('CONNECTIONS', 'connections'), ('SYSTEM_RESOURCES', 'resources')) # maps 'features.graph.type' config values to the initial types @@ -67,6 +67,9 @@ def conf_handler(key, value): CONFIG = conf.config_dict('arm', { 'attr.hibernate_color': {}, 'attr.graph.intervals': {}, + 'attr.graph.title': {}, + 'attr.graph.header.primary': {}, + 'attr.graph.header.secondary': {}, 'features.graph.height': 7, 'features.graph.interval': 'each second', 'features.graph.bound': 1, @@ -142,10 +145,6 @@ class GraphCategory(object): :var list secondary_header_stats: additional information for the secondary header """ - TITLE = '' - PRIMARY_HEADER = '' - SECONDARY_HEADER = '' - def __init__(self, clone = None): if clone: self.primary = Stat(clone.primary) @@ -176,10 +175,6 @@ class BandwidthStats(GraphCategory): Uses tor BW events to generate bandwidth usage graph. """ - TITLE = 'Bandwidth' - PRIMARY_HEADER = 'Download' - SECONDARY_HEADER = 'Upload' - def __init__(self, clone = None): GraphCategory.__init__(self, clone) @@ -309,10 +304,6 @@ class ConnectionStats(GraphCategory): Tracks number of inbound and outbound connections. """ - TITLE = 'Connection Count' - PRIMARY_HEADER = 'Inbound' - SECONDARY_HEADER = 'Outbound' - def bandwidth_event(self, event): inbound_count, outbound_count = 0, 0 @@ -344,10 +335,6 @@ class ResourceStats(GraphCategory): Tracks cpu and memory usage of the tor process. """ - TITLE = 'System Resources' - PRIMARY_HEADER = 'CPU' - SECONDARY_HEADER = 'Memory' - def bandwidth_event(self, event): resources = arm.util.tracker.get_resource_tracker().get_value() self.primary.update(resources.cpu_sample * 100) # decimal percentage to whole numbers @@ -602,23 +589,22 @@ class GraphPanel(panel.Panel): graph_column = min((width - 10) / 2, CONFIG['features.graph.max_width']) if self.is_title_visible(): - title_stats = str_tools.join(param.title_stats, ', ', width - len(param.TITLE) - 4) - title = '%s (%s):' % (param.TITLE, title_stats) if title_stats else '%s:' % param.TITLE + title = CONFIG['attr.graph.title'].get(self.current_display, '') + title_stats = str_tools.join(param.title_stats, ', ', width - len(title) - 4) + title = '%s (%s):' % (title, title_stats) if title_stats else '%s:' % title self.addstr(0, 0, title, curses.A_STANDOUT) # top labels - primary_header_stats = str_tools.join(param.primary_header_stats, '', (width / 2) - len(param.PRIMARY_HEADER) - 4) - left = '%s (%s):' % (param.PRIMARY_HEADER, primary_header_stats) if primary_header_stats else '%s:' % param.PRIMARY_HEADER - - secondary_header_stats = str_tools.join(param.secondary_header_stats, '', (width / 2) - len(param.SECONDARY_HEADER) - 4) - right = '%s (%s):' % (param.SECONDARY_HEADER, secondary_header_stats) if secondary_header_stats else '%s:' % param.SECONDARY_HEADER - - if left: - self.addstr(1, 0, left, curses.A_BOLD, PRIMARY_COLOR) + primary_header = CONFIG['attr.graph.header.primary'].get(self.current_display, '') + primary_header_stats = str_tools.join(param.primary_header_stats, '', (width / 2) - len(primary_header) - 4) + left = '%s (%s):' % (primary_header, primary_header_stats) if primary_header_stats else '%s:' % primary_header + self.addstr(1, 0, left, curses.A_BOLD, PRIMARY_COLOR) - if right: - self.addstr(1, graph_column + 5, right, curses.A_BOLD, SECONDARY_COLOR) + secondary_header = CONFIG['attr.graph.header.secondary'].get(self.current_display, '') + secondary_header_stats = str_tools.join(param.secondary_header_stats, '', (width / 2) - len(secondary_header) - 4) + right = '%s (%s):' % (secondary_header, secondary_header_stats) if secondary_header_stats else '%s:' % secondary_header + self.addstr(1, graph_column + 5, right, curses.A_BOLD, SECONDARY_COLOR) # determines max/min value on the graph

1 0

[arm/master] Select graph stats by name in the config
by atagar＠torproject.org 26 Oct '14

26 Oct '14

commit 5303010a3d7c86d0663bb4da3df233fd425b8e81 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Oct 26 14:36:57 2014 -0700 Select graph stats by name in the config No reason to make the user provide an int for this. They have names. --- arm/graph_panel.py | 17 +++++++---------- armrc.sample | 4 ++-- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/arm/graph_panel.py b/arm/graph_panel.py index f0a1ee7..5b2beb6 100644 --- a/arm/graph_panel.py +++ b/arm/graph_panel.py @@ -33,10 +33,6 @@ from stem.util import conf, enum, log, str_tools, system GraphStat = enum.Enum(('BANDWIDTH', 'bandwidth'), ('CONNECTIONS', 'connections'), ('SYSTEM_RESOURCES', 'resources')) -# maps 'features.graph.type' config values to the initial types - -GRAPH_INIT_STATS = {1: GraphStat.BANDWIDTH, 2: GraphStat.CONNECTIONS, 3: GraphStat.SYSTEM_RESOURCES} - DEFAULT_CONTENT_HEIGHT = 4 # space needed for labeling above and below the graph PRIMARY_COLOR, SECONDARY_COLOR = 'green', 'cyan' MIN_GRAPH_HEIGHT = 1 @@ -75,7 +71,7 @@ CONFIG = conf.config_dict('arm', { 'features.graph.bound': 1, 'features.graph.max_width': 150, 'features.graph.showIntermediateBounds': True, - 'features.graph.type': 1, + 'features.graph.type': 'bandwidth', 'features.panels.show.connection': True, 'features.graph.bw.prepopulate': True, 'features.graph.bw.transferInBytes': False, @@ -382,11 +378,12 @@ class GraphPanel(panel.Panel): self.set_pause_attr('stats') self.set_pause_attr('_accounting_stats') - try: - initial_stats = GRAPH_INIT_STATS.get(CONFIG['features.graph.type']) - self.set_stats(initial_stats) - except ValueError: - pass # invalid stats, maybe connections when lookups are disabled + if CONFIG['features.graph.type'] == 'none': + self.set_stats(None) + elif CONFIG['features.graph.type'] in GraphStat: + self.set_stats(CONFIG['features.graph.type']) + else: + log.warn("'%s' isn't a graph type." % CONFIG['features.graph.type']) # prepopulates bandwidth values from state file diff --git a/armrc.sample b/armrc.sample index 40025be..c878bee 100644 --- a/armrc.sample +++ b/armrc.sample @@ -158,7 +158,7 @@ features.config.descriptions.persist true # bound # 0 -> global maxima, 1 -> local maxima, 2 -> tight # type -# 0 -> None, 1 -> Bandwidth, 2 -> Connections, 3 -> System Resources +# none, bandwidth, connections, resources # showIntermediateBounds # shows y-axis increments between the top/bottom bounds @@ -166,7 +166,7 @@ features.graph.height 7 features.graph.maxWidth 150 features.graph.interval each second features.graph.bound 1 -features.graph.type 1 +features.graph.type bandwidth features.graph.showIntermediateBounds true # Parameters for graphing bandwidth stats

1 0

[arm/master] Making graph bounds be configurable by name rather than int
by atagar＠torproject.org 26 Oct '14

26 Oct '14

commit b0150a561267ceb8fe2188a61f9e36cd35b65649 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Oct 26 15:10:04 2014 -0700 Making graph bounds be configurable by name rather than int --- arm/graph_panel.py | 47 +++++++++++++++-------------------------------- armrc.sample | 6 ++++-- 2 files changed, 19 insertions(+), 34 deletions(-) diff --git a/arm/graph_panel.py b/arm/graph_panel.py index 1b704ae..a7c403c 100644 --- a/arm/graph_panel.py +++ b/arm/graph_panel.py @@ -1,11 +1,6 @@ """ -Flexible panel for presenting bar graphs for a variety of stats. This panel is -just concerned with the rendering of information, which is actually collected -and stored by implementations of the GraphCategory interface. Panels are made -up of a title, followed by headers and graphs for two sets of stats. For -instance... +Graphs of tor related statistics. For example... -Bandwidth (cap: 5 MB, burst: 10 MB): Downloaded (0.0 B/sec): Uploaded (0.0 B/sec): 34 30 * * @@ -32,33 +27,22 @@ from stem.control import Listener from stem.util import conf, enum, log, str_tools, system GraphStat = enum.Enum(('BANDWIDTH', 'bandwidth'), ('CONNECTIONS', 'connections'), ('SYSTEM_RESOURCES', 'resources')) +Bounds = enum.Enum(('GLOBAL_MAX', 'global_max'), ('LOCAL_MAX', 'local_max'), ('TIGHT', 'tight')) -DEFAULT_CONTENT_HEIGHT = 4 # space needed for labeling above and below the graph PRIMARY_COLOR, SECONDARY_COLOR = 'green', 'cyan' -MIN_GRAPH_HEIGHT = 1 - -# enums for graph bounds: -# Bounds.GLOBAL_MAX - global maximum (highest value ever seen) -# Bounds.LOCAL_MAX - local maximum (highest value currently on the graph) -# Bounds.TIGHT - local maximum and minimum - -Bounds = enum.Enum('GLOBAL_MAX', 'LOCAL_MAX', 'TIGHT') - -WIDE_LABELING_GRAPH_COL = 50 # minimum graph columns to use wide spacing for x-axis labels ACCOUNTING_RATE = 5 +DEFAULT_CONTENT_HEIGHT = 4 # space needed for labeling above and below the graph +WIDE_LABELING_GRAPH_COL = 50 # minimum graph columns to use wide spacing for x-axis labels +COLLAPSE_WIDTH = 135 # width at which to move optional stats from the title to x-axis label def conf_handler(key, value): if key == 'features.graph.height': - return max(MIN_GRAPH_HEIGHT, value) + return max(1, value) elif key == 'features.graph.max_width': return max(1, value) - elif key == 'features.graph.bound': - return max(0, min(2, value)) - -# used for setting defaults when initializing GraphCategory and GraphPanel instances CONFIG = conf.config_dict('arm', { 'attr.hibernate_color': {}, @@ -68,7 +52,7 @@ CONFIG = conf.config_dict('arm', { 'attr.graph.header.secondary': {}, 'features.graph.height': 7, 'features.graph.interval': 'each second', - 'features.graph.bound': 1, + 'features.graph.bound': Bounds.LOCAL_MAX, 'features.graph.max_width': 150, 'features.graph.showIntermediateBounds': True, 'features.graph.type': 'bandwidth', @@ -79,11 +63,6 @@ CONFIG = conf.config_dict('arm', { 'tor.chroot': '', }, conf_handler) -# width at which panel abandons placing optional stats (avg and total) with -# header in favor of replacing the x-axis label - -COLLAPSE_WIDTH = 135 - class Stat(object): """ @@ -310,7 +289,12 @@ class GraphPanel(panel.Panel): self.update_interval = 'each second' log.warn("'%s' isn't a valid graphing interval, options are: %s" % (CONFIG['features.graph.interval'], ', '.join(CONFIG['attr.graph.intervals']))) - self.bounds = list(Bounds)[CONFIG['features.graph.bound']] + if CONFIG['features.graph.bound'] in Bounds: + self.bounds = CONFIG['features.graph.bound'] + else: + log.warn("'%s' isn't a valid type of graph bound." % CONFIG['features.graph.bound']) + self.bounds = Bounds.LOCAL_MAX + self.graph_height = CONFIG['features.graph.height'] self.current_display = None # label of the stats currently being displayed self._accounting_stats = None @@ -425,14 +409,13 @@ class GraphPanel(panel.Panel): def set_graph_height(self, new_graph_height): """ - Sets the preferred height used for the graph (restricted to the - MIN_GRAPH_HEIGHT minimum). + Sets the preferred height used for the graph. Arguments: new_graph_height - new height for the graph """ - self.graph_height = max(MIN_GRAPH_HEIGHT, new_graph_height) + self.graph_height = max(1, new_graph_height) def resize_graph(self): """ diff --git a/armrc.sample b/armrc.sample index c878bee..3dbc7de 100644 --- a/armrc.sample +++ b/armrc.sample @@ -156,7 +156,9 @@ features.config.descriptions.persist true # each second, 5 seconds, 30 seconds, minutely, # 15 minute, 30 minute, hourly, daily # bound -# 0 -> global maxima, 1 -> local maxima, 2 -> tight +# global_max - global maximum (highest value ever seen) +# local_max - local maximum (highest value currently on the graph) +# tight - local maximum and minimum # type # none, bandwidth, connections, resources # showIntermediateBounds @@ -165,7 +167,7 @@ features.config.descriptions.persist true features.graph.height 7 features.graph.maxWidth 150 features.graph.interval each second -features.graph.bound 1 +features.graph.bound local_max features.graph.type bandwidth features.graph.showIntermediateBounds true

1 0

[arm/master] Moving prepopulate_from_state() to be a function
by atagar＠torproject.org 26 Oct '14

26 Oct '14

commit 47c7aa3ebe56feafcc79d3b0f3ebe19403ed7de1 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Oct 26 14:44:54 2014 -0700 Moving prepopulate_from_state() to be a function Shifting prepopulate_from_state() from being a method of the bandwidth stats to a standalone function. With this none of the stats have unique methods. --- arm/graph_panel.py | 108 ++++++++++++++++++++++++++-------------------------- 1 file changed, 53 insertions(+), 55 deletions(-) diff --git a/arm/graph_panel.py b/arm/graph_panel.py index 5b2beb6..1b704ae 100644 --- a/arm/graph_panel.py +++ b/arm/graph_panel.py @@ -168,24 +168,21 @@ class GraphCategory(object): class BandwidthStats(GraphCategory): """ - Uses tor BW events to generate bandwidth usage graph. + Tracks tor's bandwidth usage. """ def __init__(self, clone = None): GraphCategory.__init__(self, clone) if not clone: - # listens for tor reload (sighup) events which can reset the bandwidth - # rate/burst - - controller = tor_controller() - # We both show our 'total' attributes and use it to determine our average. # # If we can get *both* our start time and the totals from tor (via 'GETINFO # traffic/*') then that's ideal, but if not then just track the total for # the time arm is run. + controller = tor_controller() + read_total = controller.get_info('traffic/read', None) write_total = controller.get_info('traffic/written', None) start_time = system.start_time(controller.get_pid(None)) @@ -195,54 +192,6 @@ class BandwidthStats(GraphCategory): self.secondary.total = int(write_total) / 1024 # Bytes -> KB self.primary.start_time = self.secondary.start_time = start_time - def prepopulate_from_state(self): - """ - Attempts to use tor's state file to prepopulate values for the 15 minute - interval via the BWHistoryReadValues/BWHistoryWriteValues values. This - returns True if successful and False otherwise. - """ - - stats = bandwidth_from_state() - - missing_read_entries = int((time.time() - stats.last_read_time) / 900) - missing_write_entries = int((time.time() - stats.last_write_time) / 900) - - # fills missing entries with the last value - - bw_read_entries = stats.read_entries + [stats.read_entries[-1]] * missing_read_entries - bw_write_entries = stats.write_entries + [stats.write_entries[-1]] * missing_write_entries - - # crops starting entries so they're the same size - - entry_count = min(len(bw_read_entries), len(bw_write_entries), CONFIG['features.graph.max_width']) - bw_read_entries = bw_read_entries[len(bw_read_entries) - entry_count:] - bw_write_entries = bw_write_entries[len(bw_write_entries) - entry_count:] - - # gets index for 15-minute interval - - interval_index = 0 - - for interval_rate in CONFIG['attr.graph.intervals'].values(): - if int(interval_rate) == 900: - break - else: - interval_index += 1 - - # fills the graphing parameters with state information - - for i in range(entry_count): - read_value, write_value = bw_read_entries[i], bw_write_entries[i] - - self.primary.latest_value, self.secondary.latest_value = read_value / 900, write_value / 900 - - self.primary.values['15 minute'] = [read_value] + self.primary.values['15 minute'][:-1] - self.secondary.values['15 minute'] = [write_value] + self.secondary.values['15 minute'][:-1] - - self.primary.max_value['15 minute'] = max(self.primary.values) - self.secondary.max_value['15 minute'] = max(self.secondary.values) - - return time.time() - min(stats.last_read_time, stats.last_write_time) - def bandwidth_event(self, event): # scales units from B to KB for graphing @@ -389,7 +338,7 @@ class GraphPanel(panel.Panel): if CONFIG["features.graph.bw.prepopulate"] and tor_controller().is_alive(): try: - missing_seconds = self.stats[GraphStat.BANDWIDTH].prepopulate_from_state() + missing_seconds = prepopulate_from_state(self.stats[GraphStat.BANDWIDTH]) if missing_seconds: log.notice(msg('panel.graphing.prepopulation_successful', duration = str_tools.time_label(missing_seconds, 0, True))) @@ -769,3 +718,52 @@ class GraphPanel(panel.Panel): def _size_label(byte_count): return str_tools.size_label(byte_count, 1, is_bytes = CONFIG['features.graph.bw.transferInBytes']) + + +def prepopulate_from_state(stat): + """ + Attempts to use tor's state file to prepopulate values for the 15 minute + interval via the BWHistoryReadValues/BWHistoryWriteValues values. This + returns True if successful and False otherwise. + """ + + stats = bandwidth_from_state() + + missing_read_entries = int((time.time() - stats.last_read_time) / 900) + missing_write_entries = int((time.time() - stats.last_write_time) / 900) + + # fills missing entries with the last value + + bw_read_entries = stats.read_entries + [stats.read_entries[-1]] * missing_read_entries + bw_write_entries = stats.write_entries + [stats.write_entries[-1]] * missing_write_entries + + # crops starting entries so they're the same size + + entry_count = min(len(bw_read_entries), len(bw_write_entries), CONFIG['features.graph.max_width']) + bw_read_entries = bw_read_entries[len(bw_read_entries) - entry_count:] + bw_write_entries = bw_write_entries[len(bw_write_entries) - entry_count:] + + # gets index for 15-minute interval + + interval_index = 0 + + for interval_rate in CONFIG['attr.graph.intervals'].values(): + if int(interval_rate) == 900: + break + else: + interval_index += 1 + + # fills the graphing parameters with state information + + for i in range(entry_count): + read_value, write_value = bw_read_entries[i], bw_write_entries[i] + + stat.primary.latest_value, stat.secondary.latest_value = read_value / 900, write_value / 900 + + stat.primary.values['15 minute'] = [read_value] + stat.primary.values['15 minute'][:-1] + stat.secondary.values['15 minute'] = [write_value] + stat.secondary.values['15 minute'][:-1] + + stat.primary.max_value['15 minute'] = max(stat.primary.values) + stat.secondary.max_value['15 minute'] = max(stat.secondary.values) + + return time.time() - min(stats.last_read_time, stats.last_write_time)

1 0

[stem/master] Adding 'BeagleBone for Secret Agents' to examples
by atagar＠torproject.org 26 Oct '14

26 Oct '14

commit f05472242c71f411555bde812ec700e9138b3d95 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Oct 26 15:18:22 2014 -0700 Adding 'BeagleBone for Secret Agents' to examples Second chapter has a neat example for making a bridge with a bandwidth monitor on a BeagleBoard. --- docs/tutorials/double_double_toil_and_trouble.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/tutorials/double_double_toil_and_trouble.rst b/docs/tutorials/double_double_toil_and_trouble.rst index 06a6c08..19ff0c5 100644 --- a/docs/tutorials/double_double_toil_and_trouble.rst +++ b/docs/tutorials/double_double_toil_and_trouble.rst @@ -57,6 +57,7 @@ Applications research paper. =========================================================================================================== ========== +`BeagleBone for Secret Agents <https://github.com/jbdatko/beagle-bone-for-secret-agents>`_ Bridge with a `bandwidth monitor <https://github.com/jbdatko/beagle-bone-for-secret-agents/blob/master/ch2/be…>`_ on a BeagleBoard. `RTT Prober <https://bitbucket.org/ra_/tor-rtt/>`_ Measures round-trip times for Tor circuits. `TorPS <https://www.torproject.org/getinvolved/volunteer.html.en#project-torps>`_ Tor path simulator. `Metrics Tasks <https://gitweb.torproject.org/metrics-tasks.git/tree>`_ One-off tasks related to Tor metrics. These mostly involve using descriptor information to answer a particular question. Tasks that involve Stem are: `1854 <https://gitweb.torproject.org/metrics-tasks.git/blob/HEAD:/task-1854/pylinf…>`_, `6232 <https://gitweb.torproject.org/metrics-tasks.git/blob/HEAD:/task-6232/pyentr…>`_, and `7241 <https://gitweb.torproject.org/metrics-tasks.git/blob/HEAD:/task-7241/first_…>`_.

1 0

[tor/master] Fix a crash bug introduced in 223d354e3.
by nickm＠torproject.org 26 Oct '14

26 Oct '14

commit f5fc7e3306f03c8a304dad89ada2280466d54c9a Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Oct 26 14:09:03 2014 -0400 Fix a crash bug introduced in 223d354e3. Arma found this and commented on #11243. Bug not in any released version of Tor. --- src/or/routerlist.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 5748dfd..4d117cb 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -2960,7 +2960,8 @@ extrainfo_insert,(routerlist_t *rl, extrainfo_t *ei)) goto done; } if (routerinfo_incompatible_with_extrainfo(ri, ei, sd, NULL)) { - r = (sd->extrainfo_is_bogus) ? ROUTER_BAD_EI : ROUTER_NOT_IN_CONSENSUS; + r = (ri->cache_info.extrainfo_is_bogus) ? + ROUTER_BAD_EI : ROUTER_NOT_IN_CONSENSUS; goto done; }

1 0

[meek/master] --url and --front are not required.
by dcf＠torproject.org 26 Oct '14

26 Oct '14

commit ee86bfc367502837ee0ee4f05842cadedc2ec4b2 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Oct 25 22:25:48 2014 -0700 --url and --front are not required. --- doc/meek-client.1.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/meek-client.1.txt b/doc/meek-client.1.txt index cc5036a..6ac5b99 100644 --- a/doc/meek-client.1.txt +++ b/doc/meek-client.1.txt @@ -11,7 +11,7 @@ meek-client - The meek client transport plugin SYNOPSIS -------- -**meek-client** **--url**=__URL__ **--front**=__DOMAIN__ [__OPTIONS__] +**meek-client** [__OPTIONS__] DESCRIPTION -----------

1 0