- tor-commits - lists.torproject.org

[arm/release] Added support for multiple menu levels.
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 46a1023c71f395c62a37a30c13e14db7b851640a Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Tue May 31 02:31:23 2011 +0500 Added support for multiple menu levels. Once the menus have "dropped-down", handling of subsequent "levels" followed the same logical steps. Therefore *SecondLevel() methods have been replaced by *NLevel() equivalents. If a parent item is selected using any of the selection keys, its children are brought up instead of doing nothing. --- src/cli/menu.py | 192 +++++++++++++++++++++++++++++++++++--------------- src/util/menuItem.py | 6 +-- 2 files changed, 136 insertions(+), 62 deletions(-) diff --git a/src/cli/menu.py b/src/cli/menu.py index 69538e0..8ce97c4 100644 --- a/src/cli/menu.py +++ b/src/cli/menu.py @@ -8,7 +8,7 @@ import cli.controller import popups from util import log, panel, uiTools, menuItem -TOPLEVEL, SECONDLEVEL = range(2) +PARENTLEVEL, TOPLEVEL = (-1, 0) class Menu(): """Displays a popup menu and sends keys to appropriate panels""" @@ -22,23 +22,61 @@ class Menu(): menuItem.MenuItem(label="Clear" , callback=self._callbackDefault), menuItem.MenuItem(label="Save" , callback=self._callbackDefault), menuItem.MenuItem(label="Filter" , callback=self._callbackDefault), - menuItem.MenuItem(label="Duplicates" , callback=self._callbackDefault),)), + menuItem.MenuItem(label="Duplicates" , children=( + menuItem.MenuItem(label="Hidden" , callback=self._callbackDefault), + menuItem.MenuItem(label="Visible" , callback=self._callbackDefault),)) + )), menuItem.MenuItem(label="View" , children=( menuItem.MenuItem(label="Graph" , callback=self._callbackDefault), menuItem.MenuItem(label="Connections" , callback=self._callbackDefault), menuItem.MenuItem(label="Configuration" , callback=self._callbackDefault), menuItem.MenuItem(label="Configuration File" , callback=self._callbackDefault),)), menuItem.MenuItem(label="Graph" , children=( - menuItem.MenuItem(label="Stats" , callback=self._callbackDefault), - menuItem.MenuItem(label="Size" , callback=self._callbackDefault), - menuItem.MenuItem(label="Update Interval" , callback=self._callbackDefault), - menuItem.MenuItem(label="Bounds" , callback=self._callbackDefault),)), + menuItem.MenuItem(label="Stats" , children=( + menuItem.MenuItem(label="Bandwidth" , callback=self._callbackDefault), + menuItem.MenuItem(label="Connections" , callback=self._callbackDefault), + menuItem.MenuItem(label="Resources" , callback=self._callbackDefault), + )), + menuItem.MenuItem(label="Size" , children=( + menuItem.MenuItem(label="Increase" , callback=self._callbackDefault), + menuItem.MenuItem(label="Decrease" , callback=self._callbackDefault), + )), + menuItem.MenuItem(label="Update Interval" , children=( + menuItem.MenuItem(label="Each second" , callback=self._callbackDefault), + menuItem.MenuItem(label="5 seconds" , callback=self._callbackDefault), + menuItem.MenuItem(label="30 seconds" , callback=self._callbackDefault), + menuItem.MenuItem(label="1 minute" , callback=self._callbackDefault), + menuItem.MenuItem(label="30 minutes" , callback=self._callbackDefault), + menuItem.MenuItem(label="Hourly" , callback=self._callbackDefault), + menuItem.MenuItem(label="Daily" , callback=self._callbackDefault), + )), + menuItem.MenuItem(label="Bounds" , children=( + menuItem.MenuItem(label="Local Max" , callback=self._callbackDefault), + menuItem.MenuItem(label="Global Max" , callback=self._callbackDefault), + menuItem.MenuItem(label="Tight" , callback=self._callbackDefault), + )),)), menuItem.MenuItem(label="Connections" , children=( - menuItem.MenuItem(label="Identity" , callback=self._callbackDefault), - menuItem.MenuItem(label="Resolver" , callback=self._callbackDefault), + menuItem.MenuItem(label="Identity" , children=( + menuItem.MenuItem(label="IP" , callback=self._callbackDefault), + menuItem.MenuItem(label="Fingerprints" , callback=self._callbackDefault), + menuItem.MenuItem(label="Nicknames" , callback=self._callbackDefault), + )), + menuItem.MenuItem(label="Resolver" , children=( + menuItem.MenuItem(label="auto" , callback=self._callbackDefault), + menuItem.MenuItem(label="proc" , callback=self._callbackDefault), + menuItem.MenuItem(label="netstat" , callback=self._callbackDefault), + menuItem.MenuItem(label="ss" , callback=self._callbackDefault), + menuItem.MenuItem(label="lsof" , callback=self._callbackDefault), + menuItem.MenuItem(label="sockstat" , callback=self._callbackDefault), + menuItem.MenuItem(label="sockstat (bsd)" , callback=self._callbackDefault), + menuItem.MenuItem(label="procstat (bsd)" , callback=self._callbackDefault), + )), menuItem.MenuItem(label="Sort Order" , callback=self._callbackDefault),)), menuItem.MenuItem(label="Configuration" , children=( - menuItem.MenuItem(label="Comments" , callback=self._callbackDefault), + menuItem.MenuItem(label="Comments" , children=( + menuItem.MenuItem(label="Hidden" , callback=self._callbackDefault), + menuItem.MenuItem(label="Visible" , callback=self._callbackDefault), + )), menuItem.MenuItem(label="Reload" , callback=self._callbackDefault), menuItem.MenuItem(label="Reset Tor" , callback=self._callbackDefault),)) )) @@ -67,15 +105,12 @@ class Menu(): key = control.getScreen().getch() if key == curses.KEY_RIGHT: - if len(self._selection) == 1: - self._moveTopLevelRight(width) + self._moveTopLevelRight(width) elif key == curses.KEY_LEFT: - if len(self._selection) == 1: - self._moveTopLevelLeft(width) + self._moveTopLevelLeft(width) elif key == curses.KEY_DOWN: - if len(self._selection) == 1: - self._dropSecondLevel() - break + self._showNLevel() + break elif uiTools.isSelectionKey(key): self._handleEvent() break @@ -87,6 +122,21 @@ class Menu(): index = self._first[TOPLEVEL] + self._selection[TOPLEVEL] return self._rootItem.getChildren()[index] + def _getCurrentItem(self, level=0): + item = self._rootItem + if level == 0: + sums = [sum(values) for values in zip(self._first, self._selection)] + else: + sums = [sum(values) for values in zip(self._first[:level], self._selection[:level])] + + for index in sums: + if item.isParent(): + item = item.getChildren()[index] + else: + break + + return item + def _calculateTopLevelWidths(self, width=0): labels = [menuItem.getLabel() for menuItem in self._rootItem.getChildren()] @@ -119,6 +169,33 @@ class Menu(): return printable if printable else parent.getChildrenCount() + def _calculateNLevelWidths(self, level=0): + parent = self._getCurrentItem(level) + + if parent.isLeaf(): + return 0 + + labels = [menuItem.getLabel() for menuItem in parent.getChildren()] + + labelwidth = max(map(len, labels)) + + return labelwidth + + def _calculateNLevelHeights(self, height=0, level=0): + control = cli.controller.getController() + height, _ = control.getScreen().getmaxyx() + topSize = sum(stickyPanel.getHeight() for stickyPanel in control.getStickyPanels()) + height = height - topSize + + parent = self._getCurrentItem(level) + + if parent.isLeaf(): + return 0 + + printable = min(height - 4, parent.getChildrenCount()) + + return printable if printable else parent.getChildrenCount() + def _moveTopLevelRight(self, width): _, printable = self._calculateTopLevelWidths(width) @@ -165,12 +242,17 @@ class Menu(): popup.addch(top, left, curses.ACS_VLINE) left = left + 1 - def _dropSecondLevel(self): + def _showNLevel(self): self._first.append(0) self._selection.append(0) - labelwidth = self._calculateSecondLevelWidths() - printable = self._calculateSecondLevelHeights() + parent = self._getCurrentItem(level=PARENTLEVEL) + + if parent.isLeaf(): + return + + labelwidth = self._calculateNLevelWidths(level=PARENTLEVEL) + printable = self._calculateNLevelHeights(level=PARENTLEVEL) toplabelwidth, _ = self._calculateTopLevelWidths() left = (toplabelwidth + 2) * self._selection[TOPLEVEL] @@ -183,7 +265,7 @@ class Menu(): popup.win.erase() popup.win.box() - self._drawSecondLevel(popup, width, height) + self._drawNLevel(popup, width, height) popup.win.refresh() @@ -191,9 +273,12 @@ class Menu(): key = control.getScreen().getch() if key == curses.KEY_DOWN: - self._moveSecondLevelDown(height) + self._moveNLevelDown(height) elif key == curses.KEY_UP: - self._moveSecondLevelUp(height) + self._moveNLevelUp(height) + elif key == curses.KEY_RIGHT: + self._showNLevel() + break elif uiTools.isSelectionKey(key): self._handleEvent() self._first.pop() @@ -203,64 +288,57 @@ class Menu(): finally: popups.finalize() - def _drawSecondLevel(self, popup, width, height): - printable = self._calculateSecondLevelHeights() - parent = self._getCurrentTopLevelItem() - children = parent.getChildren()[self._first[SECONDLEVEL]:self._first[SECONDLEVEL] + printable] - - toplabelwidth, _ = self._calculateTopLevelWidths(width) + def _drawNLevel(self, popup, width, height): + printable = self._calculateNLevelHeights(level=PARENTLEVEL) + parent = self._getCurrentItem(level=PARENTLEVEL) + children = parent.getChildren()[self._first[PARENTLEVEL]:self._first[PARENTLEVEL] + printable] top = 1 left = 1 for (index, item) in enumerate(children): - labelformat = curses.A_STANDOUT if index == self._selection[SECONDLEVEL] else curses.A_NORMAL + labelformat = curses.A_STANDOUT if index == self._selection[PARENTLEVEL] else curses.A_NORMAL popup.addstr(top, left, item.getLabel(), labelformat) top = top + 1 - def _moveSecondLevelDown(self, height): - printable = self._calculateSecondLevelHeights() - parent = self._getCurrentTopLevelItem() + def _moveNLevelDown(self, height): + printable = self._calculateNLevelHeights(level=PARENTLEVEL) + parent = self._getCurrentItem(level=PARENTLEVEL) - if self._selection[SECONDLEVEL] < printable - 1: - self._selection[SECONDLEVEL] = self._selection[SECONDLEVEL] + 1 + if self._selection[PARENTLEVEL] < printable - 1: + self._selection[PARENTLEVEL] = self._selection[PARENTLEVEL] + 1 else: - self._selection[SECONDLEVEL] = 0 + self._selection[PARENTLEVEL] = 0 if printable < parent.getChildrenCount(): - self._first[SECONDLEVEL] = (self._first[SECONDLEVEL] + printable) % parent.getChildrenCount() + self._first[PARENTLEVEL] = (self._first[PARENTLEVEL] + printable) % parent.getChildrenCount() - if self._first[SECONDLEVEL] + self._selection[SECONDLEVEL] == parent.getChildrenCount(): - self._first[SECONDLEVEL] = 0 - self._selection[SECONDLEVEL] = 0 + if self._first[PARENTLEVEL] + self._selection[PARENTLEVEL] == parent.getChildrenCount(): + self._first[PARENTLEVEL] = 0 + self._selection[PARENTLEVEL] = 0 - def _moveSecondLevelUp(self, height): + def _moveNLevelUp(self, height): printable = self._calculateSecondLevelHeights() - parent = self._getCurrentTopLevelItem() + parent = self._getCurrentItem(level=PARENTLEVEL) - if self._selection[SECONDLEVEL] > 0: - self._selection[SECONDLEVEL] = self._selection[SECONDLEVEL] - 1 + if self._selection[PARENTLEVEL] > 0: + self._selection[PARENTLEVEL] = self._selection[PARENTLEVEL] - 1 else: - if self._first[SECONDLEVEL] == 0: - self._first[SECONDLEVEL] = ((parent.getChildrenCount() / printable) * printable) % parent.getChildrenCount() + if self._first[PARENTLEVEL] == 0: + self._first[PARENTLEVEL] = ((parent.getChildrenCount() / printable) * printable) % parent.getChildrenCount() else: - self._first[SECONDLEVEL] = abs(self._first[SECONDLEVEL] - printable) % parent.getChildrenCount() - self._selection[SECONDLEVEL] = parent.getChildrenCount() - self._first[SECONDLEVEL] - 1 + self._first[PARENTLEVEL] = abs(self._first[PARENTLEVEL] - printable) % parent.getChildrenCount() + self._selection[PARENTLEVEL] = parent.getChildrenCount() - self._first[PARENTLEVEL] - 1 - if self._selection[SECONDLEVEL] > printable: - self._selection[SECONDLEVEL] = printable - 1 + if self._selection[PARENTLEVEL] > printable: + self._selection[PARENTLEVEL] = printable - 1 def _handleEvent(self): - item = self._rootItem - sums = [sum(values) for values in zip(self._first, self._selection)] - - for index in sums: - if item.isParent(): - item = item.getChildren()[index] - else: - break + item = self._getCurrentItem() if item.isLeaf(): item.select() + else: + self._showNLevel() def _callbackDefault(self, item): log.log(log.NOTICE, "%s selected" % item.getLabel()) diff --git a/src/util/menuItem.py b/src/util/menuItem.py index 4800a0f..3dbf922 100644 --- a/src/util/menuItem.py +++ b/src/util/menuItem.py @@ -5,11 +5,10 @@ Menu Item class, used by the drop-down menus class MenuItem(): """Contains title, callback handler and possible children""" - def __init__(self, label=None, callback=None, children=[], parent=None): + def __init__(self, label=None, callback=None, children=[]): self._label = label self._callback = callback self._children = children - self._parent = parent def getLabel(self): return self._label @@ -23,9 +22,6 @@ class MenuItem(): def getChildren(self): return self._children - def getParent(self): - return self._parent - def getChildrenCount(self): return len(self._children)

1 0

[arm/release] Fixed calculation of maximum printable menu items.
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 8941c87182b6050b6dc713cc7c920ae2e755648f Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Fri May 27 18:06:00 2011 +0500 Fixed calculation of maximum printable menu items. --- src/cli/menu.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/cli/menu.py b/src/cli/menu.py index 315d349..0395abb 100644 --- a/src/cli/menu.py +++ b/src/cli/menu.py @@ -64,7 +64,7 @@ class Menu(): titlewidth = max(map(lambda title: len(title), titles)) + 2 # total number of titles that can be printed in current width - printable = (width - 2) / titlewidth + printable = width / titlewidth - 1 top = 1 left = 1

1 0

[arm/release] fix: minor tweaks to the readme summary wording
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 32c6f177144f634cd19ae1fb12ebbe268466470d Author: Damian Johnson <atagar(a)torproject.org> Date: Mon May 30 09:25:58 2011 -0700 fix: minor tweaks to the readme summary wording --- README | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README b/README index 456aba1..b20ec1c 100644 --- a/README +++ b/README @@ -4,13 +4,13 @@ All code under the GPL v3 (http://www.gnu.org/licenses/gpl.html) Project page: www.atagar.com/arm Description: -Command line application for monitoring Tor relays, providing real time status +Command line application for monitoring Tor, providing real time status information such as the current configuration, bandwidth usage, message log, connections, etc. This uses a curses interface much like 'top' does for system usage. The application is intended for command-line aficionados, ssh -connections, and anyone stuck with a tty terminal for checking their relay's -status. Releases should be stable so if you manage to make it crash (or have a -feature request) then please let me know! +connections, and anyone with a tty terminal for checking their relay's status. +Releases should be stable so if you manage to make it crash (or have a feature +request) then please let me know! The project was originally proposed in 2008 by Jacob and Karsten: http://archives.seul.org/or/dev/Jan-2008/msg00005.html

1 0

[arm/release] Replacing quit confirmation to use the popup util
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 9ddfb9127a41991428736d98ef075cd77817eda4 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu May 12 21:13:01 2011 -0700 Replacing quit confirmation to use the popup util --- src/cli/controller.py | 21 +++------------------ 1 files changed, 3 insertions(+), 18 deletions(-) diff --git a/src/cli/controller.py b/src/cli/controller.py index 1189781..6c26d81 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -686,24 +686,9 @@ def drawTorMonitor(stdscr, startTime, loggedEvents, isBlindMode): # provides prompt to confirm that arm should exit if CONFIRM_QUIT: - panel.CURSES_LOCK.acquire() - try: - setPauseState(panels, isPaused, page, True) - - # provides prompt - panels["control"].setMsg("Are you sure (q again to confirm)?", curses.A_BOLD) - panels["control"].redraw(True) - - curses.cbreak() - confirmationKey = stdscr.getch() - quitConfirmed = confirmationKey in (ord('q'), ord('Q')) - curses.halfdelay(REFRESH_RATE * 10) - - if not quitConfirmed: - panels["control"].setMsg(CTL_PAUSED if isPaused else CTL_HELP) - setPauseState(panels, isPaused, page) - finally: - panel.CURSES_LOCK.release() + msg = "Are you sure (q again to confirm)?" + confirmationKey = popups.showMsg(msg, attr = curses.A_BOLD) + quitConfirmed = confirmationKey in (ord('q'), ord('Q')) if quitConfirmed: # quits arm

1 0

[arm/release] Removing last references to the old style popups
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit fc16a755e7140e8d5aa6d502053e5109078cacc9 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu May 12 21:17:39 2011 -0700 Removing last references to the old style popups Dropping the ancient Popup class and removing the static panel reference that was previously used for all popups. All of its actual uses have been removed in the previous set of commits to use the new popup utils. --- src/cli/controller.py | 61 ++++--------------------------------------------- 1 files changed, 5 insertions(+), 56 deletions(-) diff --git a/src/cli/controller.py b/src/cli/controller.py index 6c26d81..51b64c7 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -89,7 +89,7 @@ REFRESH_RATE = 5 # seconds between redrawing screen CTL_HELP, CTL_PAUSED = range(2) # panel order per page -PAGE_S = ["header", "control", "popup"] # sticky (ie, always available) page +PAGE_S = ["header", "control"] # sticky (ie, always available) page PAGES = [ ["graph", "log"], ["conn"], @@ -182,46 +182,6 @@ class ControlPanel(panel.Panel): self.addstr(0, xLoc + 1, " " * barProgress, curses.A_STANDOUT | uiTools.getColor("red")) self.addstr(0, xLoc + barWidth + 1, "]", curses.A_BOLD) -class Popup(panel.Panel): - """ - Temporarily providing old panel methods until permanent workaround for popup - can be derrived (this passive drawing method is horrible - I'll need to - provide a version using the more active repaint design later in the - revision). - """ - - def __init__(self, stdscr, height): - panel.Panel.__init__(self, stdscr, "popup", 0, height) - - def setPaused(self, isPause): - panel.Panel.setPaused(self, isPause, True) - - # The following methods are to emulate old panel functionality (this was the - # only implementations to use these methods and will require a complete - # rewrite when refactoring gets here) - def clear(self): - if self.win: - self.isDisplaced = self.top > self.win.getparyx()[0] - if not self.isDisplaced: self.win.erase() - - def refresh(self): - if self.win and not self.isDisplaced: self.win.refresh() - - def recreate(self, stdscr, newWidth=-1, newTop=None): - self.setParent(stdscr) - self.setWidth(newWidth) - if newTop != None: self.setTop(newTop) - - newHeight, newWidth = self.getPreferredSize() - if newHeight > 0: - self.win = self.parent.subwin(newHeight, newWidth, self.top, 0) - elif self.win == None: - # don't want to leave the window as none (in very edge cases could cause - # problems) - rather, create a displaced instance - self.win = self.parent.subwin(1, newWidth, 0, 0) - - self.maxY, self.maxX = self.win.getmaxyx() - def addstr_wrap(panel, y, x, text, formatting, startX = 0, endX = -1, maxY = -1): """ Writes text with word wrapping, returning the ending y/x coordinate. @@ -435,7 +395,6 @@ def drawTorMonitor(stdscr, startTime, loggedEvents, isBlindMode): panels = { "header": headerPanel.HeaderPanel(stdscr, startTime, config), - "popup": Popup(stdscr, 9), "graph": graphing.graphPanel.GraphPanel(stdscr), "log": logPanel.LogPanel(stdscr, loggedEvents, config)} @@ -516,7 +475,6 @@ def drawTorMonitor(stdscr, startTime, loggedEvents, isBlindMode): isPaused = False # if true updates are frozen overrideKey = None # immediately runs with this input rather than waiting for the user if set page = 0 - panels["popup"].redraw(True) # hack to make sure popup has a window instance (not entirely sure why...) PAGE = page @@ -599,8 +557,6 @@ def drawTorMonitor(stdscr, startTime, loggedEvents, isBlindMode): panels[panelKey].setTop(startY) startY += panels[panelKey].getHeight() - panels["popup"].recreate(stdscr, 80, startY) - for panelSet in PAGES: tmpStartY = startY @@ -627,17 +583,10 @@ def drawTorMonitor(stdscr, startTime, loggedEvents, isBlindMode): # I haven't the foggiest why, but doesn't work if redrawn out of order... for panelKey in (PAGE_S + PAGES[page]): - # redrawing popup can result in display flicker when it should be hidden - if panelKey != "popup": - newSize = stdscr.getmaxyx() - isResize = lastSize != newSize - lastSize = newSize - - if panelKey in ("header", "graph", "log", "config", "torrc", "conn2"): - # revised panel (manages its own content refreshing) - panels[panelKey].redraw(isResize) - else: - panels[panelKey].redraw(True) + newSize = stdscr.getmaxyx() + isResize = lastSize != newSize + lastSize = newSize + panels[panelKey].redraw(isResize) stdscr.refresh()

1 0

[arm/release] fix: Control message lagging being state
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 6a22d0c090846fe2ffb3dbb5a971cd6831d79bfb Author: Damian Johnson <atagar(a)torproject.org> Date: Fri May 13 07:35:13 2011 -0700 fix: Control message lagging being state The control panel is the last of the old-style panels and doesn't yet support non-forced redraws. --- src/cli/controller.py | 6 +++++- src/util/procName.py | 22 ++++++++++++---------- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/src/cli/controller.py b/src/cli/controller.py index 51b64c7..5927e17 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -586,7 +586,11 @@ def drawTorMonitor(stdscr, startTime, loggedEvents, isBlindMode): newSize = stdscr.getmaxyx() isResize = lastSize != newSize lastSize = newSize - panels[panelKey].redraw(isResize) + + if panelKey != "control": + panels[panelKey].redraw(isResize) + else: + panels[panelKey].redraw(True) stdscr.refresh() diff --git a/src/util/procName.py b/src/util/procName.py index 97dc707..fab0b1e 100644 --- a/src/util/procName.py +++ b/src/util/procName.py @@ -1,13 +1,15 @@ -# Module to allow for arbitrary renaming of our python process. This is mostly -# based on: -# http://www.rhinocerus.net/forum/lang-python/569677-setting-program-name-lik… -# and an adaptation by Jake: https://github.com/ioerror/chameleon -# -# A cleaner implementation is available at: -# https://github.com/cream/libs/blob/b38970e2a6f6d2620724c828808235be0445b799… -# but I'm not quite clear on their implementation, and it only does targeted -# argument replacement (ie, replace argv[0], argv[1], etc but with a string -# the same size). +""" +Module to allow for arbitrary renaming of our python process. This is mostly +based on: +http://www.rhinocerus.net/forum/lang-python/569677-setting-program-name-like-0-perl.html#post2272369 +and an adaptation by Jake: https://github.com/ioerror/chameleon + +A cleaner implementation is available at: +https://github.com/cream/libs/blob/b38970e2a6f6d2620724c828808235be0445b799/cream/util/procname.py +but I'm not quite clear on their implementation, and it only does targeted +argument replacement (ie, replace argv[0], argv[1], etc but with a string +the same size). +""" import sys import ctypes

1 0

[arm/release] Moving torrc log load warnings to the torrc class
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 072fcb45439099e61716bb3edfee8cbc81f6887a Author: Damian Johnson <atagar(a)torproject.org> Date: Fri May 13 19:04:51 2011 -0700 Moving torrc log load warnings to the torrc class Minor refactoring change so warnings are an option of the load method. --- src/cli/controller.py | 16 +++++----------- src/util/torConfig.py | 15 ++++++++++++++- 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/src/cli/controller.py b/src/cli/controller.py index eb1df4f..d44b811 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -96,8 +96,7 @@ PAGES = [ ["config"], ["torrc"]] -CONFIG = {"log.torrc.readFailed": log.WARN, - "features.graph.type": 1, +CONFIG = {"features.graph.type": 1, "queries.refreshRate.rate": 5, "log.torEventTypeUnrecognized": log.NOTICE, "features.graph.bw.prepopulate": True, @@ -286,11 +285,8 @@ def drawTorMonitor(stdscr, startTime, loggedEvents, isBlindMode): loadedTorrc = torConfig.getTorrc() loadedTorrc.getLock().acquire() - try: - loadedTorrc.load() - except IOError, exc: - msg = "Unable to load torrc (%s)" % sysTools.getFileErrorMsg(exc) - log.log(CONFIG["log.torrc.readFailed"], msg) + try: loadedTorrc.load(True) + except: pass if loadedTorrc.isLoaded(): corrections = loadedTorrc.getCorrections() @@ -504,11 +500,9 @@ def drawTorMonitor(stdscr, startTime, loggedEvents, isBlindMode): # reload the torrc if it's previously been loaded if loadedTorrc.isLoaded(): try: - loadedTorrc.load() + loadedTorrc.load(True) if page == 3: panels["torrc"].redraw(True) - except IOError, exc: - msg = "Unable to load torrc (%s)" % sysTools.getFileErrorMsg(exc) - log.log(CONFIG["log.torrc.readFailed"], msg) + except: pass sighupTracker.isReset = False diff --git a/src/util/torConfig.py b/src/util/torConfig.py index 4a25f0f..a083099 100644 --- a/src/util/torConfig.py +++ b/src/util/torConfig.py @@ -22,6 +22,7 @@ CONFIG = {"features.torrc.validate": True, "torrc.label.time.hour": [], "torrc.label.time.day": [], "torrc.label.time.week": [], + "log.torrc.readFailed": log.WARN, "log.configDescriptions.unrecognizedCategory": log.NOTICE} # enums and values for numeric torrc entries @@ -616,11 +617,18 @@ class Torrc(): self.displayableContents = None self.strippedContents = None self.corrections = None + + # flag to indicate if we've given a load failure warning before + self.isLoadFailWarned = False - def load(self): + def load(self, logFailure = False): """ Loads or reloads the torrc contents, raising an IOError if there's a problem. + + Arguments: + logFailure - if the torrc fails to load and we've never provided a + warning for this before then logs a warning """ self.valsLock.acquire() @@ -637,6 +645,11 @@ class Torrc(): self.contents = configFile.readlines() configFile.close() except IOError, exc: + if logFailure and not self.isLoadFailWarned: + msg = "Unable to load torrc (%s)" % sysTools.getFileErrorMsg(exc) + log.log(CONFIG["log.torrc.readFailed"], msg) + self.isLoadFailWarned = True + self.valsLock.release() raise exc

1 0

[arm/release] Banishing addstr_wrap from the controller
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit e1c3ca099effe77b00c7ad86872598e54f66aa51 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri May 13 18:29:16 2011 -0700 Banishing addstr_wrap from the controller The descriptorPopup is destined to be dropped from the codebase once I write the controller prompt, and this is also the last usage of the deprecated addstr_wrap function. Rather than rewriting the popup to use an alternative I'm just puting all the soon-to-be-dead code to one place. --- src/cli/controller.py | 29 ----------------------------- src/cli/descriptorPopup.py | 33 +++++++++++++++++++++++++++++++-- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/src/cli/controller.py b/src/cli/controller.py index 5927e17..eb1df4f 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -182,35 +182,6 @@ class ControlPanel(panel.Panel): self.addstr(0, xLoc + 1, " " * barProgress, curses.A_STANDOUT | uiTools.getColor("red")) self.addstr(0, xLoc + barWidth + 1, "]", curses.A_BOLD) -def addstr_wrap(panel, y, x, text, formatting, startX = 0, endX = -1, maxY = -1): - """ - Writes text with word wrapping, returning the ending y/x coordinate. - y: starting write line - x: column offset from startX - text / formatting: content to be written - startX / endX: column bounds in which text may be written - """ - - # moved out of panel (trying not to polute new code!) - # TODO: unpleaseantly complex usage - replace with something else when - # rewriting confPanel and descriptorPopup (the only places this is used) - if not text: return (y, x) # nothing to write - if endX == -1: endX = panel.maxX # defaults to writing to end of panel - if maxY == -1: maxY = panel.maxY + 1 # defaults to writing to bottom of panel - lineWidth = endX - startX # room for text - while True: - if len(text) > lineWidth - x - 1: - chunkSize = text.rfind(" ", 0, lineWidth - x) - writeText = text[:chunkSize] - text = text[chunkSize:].strip() - - panel.addstr(y, x + startX, writeText, formatting) - y, x = y + 1, 0 - if y >= maxY: return (y, x) - else: - panel.addstr(y, x + startX, text, formatting) - return (y, x + len(text)) - class sighupListener(TorCtl.PostEventListener): """ Listens for reload signal (hup), which is produced by: diff --git a/src/cli/descriptorPopup.py b/src/cli/descriptorPopup.py index 920f2bc..2a51905 100644 --- a/src/cli/descriptorPopup.py +++ b/src/cli/descriptorPopup.py @@ -22,6 +22,35 @@ SIG_END_KEYS = ["-----END RSA PUBLIC KEY-----", "-----END SIGNATURE-----"] UNRESOLVED_MSG = "No consensus data available" ERROR_MSG = "Unable to retrieve data" +def addstr_wrap(panel, y, x, text, formatting, startX = 0, endX = -1, maxY = -1): + """ + Writes text with word wrapping, returning the ending y/x coordinate. + y: starting write line + x: column offset from startX + text / formatting: content to be written + startX / endX: column bounds in which text may be written + """ + + # moved out of panel (trying not to polute new code!) + # TODO: unpleaseantly complex usage - replace with something else when + # rewriting confPanel and descriptorPopup (the only places this is used) + if not text: return (y, x) # nothing to write + if endX == -1: endX = panel.maxX # defaults to writing to end of panel + if maxY == -1: maxY = panel.maxY + 1 # defaults to writing to bottom of panel + lineWidth = endX - startX # room for text + while True: + if len(text) > lineWidth - x - 1: + chunkSize = text.rfind(" ", 0, lineWidth - x) + writeText = text[:chunkSize] + text = text[chunkSize:].strip() + + panel.addstr(y, x + startX, writeText, formatting) + y, x = y + 1, 0 + if y >= maxY: return (y, x) + else: + panel.addstr(y, x + startX, text, formatting) + return (y, x + len(text)) + class PopupProperties: """ State attributes of popup window for consensus descriptions. @@ -176,8 +205,8 @@ def draw(popup, properties): keyword, remainder = lineText, "" keywordFormat = uiTools.getColor(SIG_COLOR) - lineNum, xLoc = controller.addstr_wrap(popup, lineNum, 0, keyword, keywordFormat, xOffset + numOffset, popup.maxX - 1, popup.maxY - 1) - lineNum, xLoc = controller.addstr_wrap(popup, lineNum, xLoc, remainder, remainderFormat, xOffset + numOffset, popup.maxX - 1, popup.maxY - 1) + lineNum, xLoc = addstr_wrap(popup, lineNum, 0, keyword, keywordFormat, xOffset + numOffset, popup.maxX - 1, popup.maxY - 1) + lineNum, xLoc = addstr_wrap(popup, lineNum, xLoc, remainder, remainderFormat, xOffset + numOffset, popup.maxX - 1, popup.maxY - 1) lineNum += 1 if lineNum > pageHeight: break

1 0

[arm/release] fix: Log panel busy wait during curses lock
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 6f46b55a97e67922d5d6aa1b1ec8340e5085a406 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri May 13 08:17:13 2011 -0700 fix: Log panel busy wait during curses lock If we registered events while the curses lock was held (for instance with a popup or prompt for user input) then arm would peg the cpu. The reason for this was that the log panel was attempting to redraw itself, but not registering any of the attempts since they all failed so it became a busy wait. --- src/cli/logPanel.py | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/src/cli/logPanel.py b/src/cli/logPanel.py index 34bf759..6d54ab4 100644 --- a/src/cli/logPanel.py +++ b/src/cli/logPanel.py @@ -1079,6 +1079,10 @@ class LogPanel(panel.Panel, threading.Thread): else: lastDay = currentDay self.redraw(True) + + # makes sure that we register this as an update, otherwise lacking the + # curses lock can cause a busy wait here + self._lastUpdate = time.time() def stop(self): """

1 0

[arm/release] Expanding connection line selection by a space
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 860511ce71e2ad947014271bd2517624fb38289e Author: Damian Johnson <atagar(a)torproject.org> Date: Fri May 13 18:21:43 2011 -0700 Expanding connection line selection by a space The connection panel looks a little better if selection hilighting stretches all the way to the left window edge. --- src/cli/connections/circEntry.py | 4 +++- src/cli/connections/connEntry.py | 6 ++++-- src/cli/connections/connPanel.py | 4 ++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/cli/connections/circEntry.py b/src/cli/connections/circEntry.py index b15b26a..82ef0ff 100644 --- a/src/cli/connections/circEntry.py +++ b/src/cli/connections/circEntry.py @@ -177,13 +177,14 @@ class CircLine(connEntry.ConnectionLine): lineFormat = uiTools.getColor(connEntry.CATEGORY_COLOR[self.getType()]) # The required widths are the sum of the following: + # initial space (1 character) # bracketing (3 characters) # placementLabel (14 characters) # gap between etc and placement label (5 characters) if self.isLast: bracket = (curses.ACS_LLCORNER, curses.ACS_HLINE, ord(' ')) else: bracket = (curses.ACS_VLINE, ord(' '), ord(' ')) - baselineSpace = len(bracket) + 14 + 5 + baselineSpace = len(bracket) + 14 + 5 + 1 dst, etc = "", "" if listingType == entries.ListingType.IP_ADDRESS: @@ -212,5 +213,6 @@ class CircLine(connEntry.ConnectionLine): drawEntry = uiTools.DrawEntry(" " * (width - baselineSpace - len(dst) - len(etc) + 5), lineFormat, drawEntry) drawEntry = uiTools.DrawEntry(dst + etc, lineFormat, drawEntry) drawEntry = uiTools.DrawEntry(bracket, curses.A_NORMAL, drawEntry, lockFormat = True) + drawEntry = uiTools.DrawEntry(" ", curses.A_NORMAL, drawEntry, lockFormat = True) return drawEntry diff --git a/src/cli/connections/connEntry.py b/src/cli/connections/connEntry.py index ac45656..05e2a45 100644 --- a/src/cli/connections/connEntry.py +++ b/src/cli/connections/connEntry.py @@ -288,7 +288,7 @@ class ConnectionLine(entries.ConnectionPanelLine): timePrefix = "+" if self.isInitialConnection else " " else: timePrefix = "" - timeEntry = myListing.getNext() + timeEntry = myListing.getNext().getNext() timeEntry.text = timePrefix + "%5s" % uiTools.getTimeLabel(currentTime - self.startTime, 1) return myListing @@ -304,6 +304,7 @@ class ConnectionLine(entries.ConnectionPanelLine): entryType = self.getType() # Lines are split into the following components in reverse: + # init gap - " " # content - "<src> --> <dst> <etc> " # time - "<uptime>" # preType - " (" @@ -317,7 +318,8 @@ class ConnectionLine(entries.ConnectionPanelLine): drawEntry = uiTools.DrawEntry(entryType.upper(), lineFormat | curses.A_BOLD, drawEntry) drawEntry = uiTools.DrawEntry(" (", lineFormat, drawEntry) drawEntry = uiTools.DrawEntry(" " * timeWidth, lineFormat, drawEntry) - drawEntry = uiTools.DrawEntry(self._getListingContent(width - (12 + timeWidth), listingType), lineFormat, drawEntry) + drawEntry = uiTools.DrawEntry(self._getListingContent(width - (12 + timeWidth) - 1, listingType), lineFormat, drawEntry) + drawEntry = uiTools.DrawEntry(" ", lineFormat, drawEntry) return drawEntry def _getDetails(self, width): diff --git a/src/cli/connections/connPanel.py b/src/cli/connections/connPanel.py index 7fab33e..45750c3 100644 --- a/src/cli/connections/connPanel.py +++ b/src/cli/connections/connPanel.py @@ -278,9 +278,9 @@ class ConnectionPanel(panel.Panel, threading.Thread): title = "Connection Details:" if self._showDetails else self._title self.addstr(0, 0, title, curses.A_STANDOUT) - scrollOffset = 1 + scrollOffset = 0 if isScrollbarVisible: - scrollOffset = 3 + scrollOffset = 2 self.addScrollBar(scrollLoc, scrollLoc + height - detailPanelOffset - 1, len(self._entryLines), 1 + detailPanelOffset) if self.isPaused() or not self._isTorRunning:

1 0