- tor-commits - lists.torproject.org

[arm/master] Dropping remaining addfstr usage
by atagar＠torproject.org 17 Jun '11

17 Jun '11

commit 6144d50da64fe94bf8ab30c30f5044453cefde01 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jun 16 10:11:50 2011 -0700 Dropping remaining addfstr usage Long ago, in the dawn of arm, I added a helper function "addfstr" that allowed for adding strings with formatting tags similar to html. All usage of it with arbitrary input was dropped due to the possability of tag injection screwing up the display, and this change drops its last remaining usage. This hurts the code's readability a bit and at I'd like to figure out a nicer, general purpose pattern for multi-format line rendering but tags aren't the solution. Back to the drawing board... This leaves the panel utility for now. --- src/cli/graphing/bandwidthStats.py | 8 +++- src/cli/headerPanel.py | 79 +++++++++++++++++++++++------------- 2 files changed, 57 insertions(+), 30 deletions(-) diff --git a/src/cli/graphing/bandwidthStats.py b/src/cli/graphing/bandwidthStats.py index 4e033f6..b92a58c 100644 --- a/src/cli/graphing/bandwidthStats.py +++ b/src/cli/graphing/bandwidthStats.py @@ -4,6 +4,7 @@ stats if they're set. """ import time +import curses from cli.graphing import graphPanel from util import log, sysTools, torTools, uiTools @@ -254,7 +255,9 @@ class BandwidthStats(graphPanel.GraphStats): # failed to be queried status, hibernateColor = "unknown", "red" - panel.addfstr(labelingLine + 2, 0, "Accounting (<%s>%s</%s>)" % (hibernateColor, status, hibernateColor)) + panel.addstr(labelingLine + 2, 0, "Accounting (", curses.A_BOLD) + panel.addstr(labelingLine + 2, 12, status, curses.A_BOLD | uiTools.getColor(hibernateColor)) + panel.addstr(labelingLine + 2, 12 + len(status), ")", curses.A_BOLD) resetTime = self.accountingInfo["resetTime"] if not resetTime: resetTime = "unknown" @@ -268,7 +271,8 @@ class BandwidthStats(graphPanel.GraphStats): if used and total: panel.addstr(labelingLine + 3, 37, "%s / %s" % (used, total), uiTools.getColor(self.getColor(False))) else: - panel.addfstr(labelingLine + 2, 0, "Accounting: Connection Closed...") + panel.addstr(labelingLine + 2, 0, "Accounting:", curses.A_BOLD) + panel.addstr(labelingLine + 2, 12, "Connection Closed...") def getTitle(self, width): stats = list(self._titleStats) diff --git a/src/cli/headerPanel.py b/src/cli/headerPanel.py index 93930b1..d367b98 100644 --- a/src/cli/headerPanel.py +++ b/src/cli/headerPanel.py @@ -161,39 +161,44 @@ class HeaderPanel(panel.Panel, threading.Thread): if 7 + len(self.vals["tor/version"]) + len(self.vals["tor/versionStatus"]) <= contentSpace: versionColor = VERSION_STATUS_COLORS[self.vals["tor/versionStatus"]] if \ self.vals["tor/versionStatus"] in VERSION_STATUS_COLORS else "white" - versionStatusMsg = "<%s>%s</%s>" % (versionColor, self.vals["tor/versionStatus"], versionColor) - self.addfstr(0, 43, "Tor %s (%s)" % (self.vals["tor/version"], versionStatusMsg)) + labelPrefix = "Tor %s (" % self.vals["tor/version"] + self.addstr(0, 43, labelPrefix) + self.addstr(0, 43 + len(labelPrefix), self.vals["tor/versionStatus"], uiTools.getColor(versionColor)) + self.addstr(0, 43 + len(labelPrefix) + len(self.vals["tor/versionStatus"]), ")") elif 11 <= contentSpace: self.addstr(0, 43, uiTools.cropStr("Tor %s" % self.vals["tor/version"], contentSpace, 4)) # Line 2 / Line 2 Left (tor ip/port information) + x = 0 if self.vals["tor/orPort"]: myAddress = "Unknown" if self.vals["tor/orListenAddr"]: myAddress = self.vals["tor/orListenAddr"] elif self.vals["tor/address"]: myAddress = self.vals["tor/address"] # acting as a relay (we can assume certain parameters are set - entry = "" dirPortLabel = ", Dir Port: %s" % self.vals["tor/dirPort"] if self.vals["tor/dirPort"] != "0" else "" for label in (self.vals["tor/nickname"], " - " + myAddress, ":" + self.vals["tor/orPort"], dirPortLabel): - if len(entry) + len(label) <= leftWidth: entry += label + if x + len(label) <= leftWidth: + self.addstr(1, x, label) + x += len(label) else: break else: # non-relay (client only) # TODO: not sure what sort of stats to provide... - entry = "<red>Relaying Disabled</red>" + self.addstr(1, x, "Relaying Disabled", curses.A_BOLD | uiTools.getColor("red")) + x += 17 if self.vals["tor/isAuthPassword"]: authType = "password" elif self.vals["tor/isAuthCookie"]: authType = "cookie" else: authType = "open" - if len(entry) + 19 + len(self.vals["tor/controlPort"]) + len(authType) <= leftWidth: + if x + 19 + len(self.vals["tor/controlPort"]) + len(authType) <= leftWidth: authColor = "red" if authType == "open" else "green" - authLabel = "<%s>%s</%s>" % (authColor, authType, authColor) - self.addfstr(1, 0, "%s, Control Port (%s): %s" % (entry, authLabel, self.vals["tor/controlPort"])) - elif len(entry) + 16 + len(self.vals["tor/controlPort"]) <= leftWidth: - self.addstr(1, 0, "%s, Control Port: %s" % (entry, self.vals["tor/controlPort"])) - else: self.addstr(1, 0, entry) + self.addstr(1, x, ", Control Port (") + self.addstr(1, x + 16, authType, uiTools.getColor(authColor)) + self.addstr(1, x + 16 + len(authType), "): %s" % self.vals["tor/controlPort"]) + elif x + 16 + len(self.vals["tor/controlPort"]) <= leftWidth: + self.addstr(1, 0, ", Control Port: %s" % self.vals["tor/controlPort"]) # Line 3 / Line 1 Right (system usage info) y, x = (0, leftWidth) if isWide else (2, 0) @@ -250,20 +255,29 @@ class HeaderPanel(panel.Panel, threading.Thread): # Line 5 / Line 3 Left (flags) if self._isTorConnected: - flagLine = "flags: " - for flag in self.vals["tor/flags"]: - flagColor = FLAG_COLORS[flag] if flag in FLAG_COLORS.keys() else "white" - flagLine += "<%s>%s</%s>, " % (flagColor, flag, flagColor) + y, x = (2 if isWide else 4, 0) + self.addstr(y, x, "flags: ") + x += 7 - if len(self.vals["tor/flags"]) > 0: flagLine = flagLine[:-2] - else: flagLine += "<cyan>none</cyan>" - - self.addfstr(2 if isWide else 4, 0, flagLine) + if len(self.vals["tor/flags"]) > 0: + for i in range(len(self.vals["tor/flags"])): + flag = self.vals["tor/flags"][i] + flagColor = FLAG_COLORS[flag] if flag in FLAG_COLORS.keys() else "white" + + self.addstr(y, x, flag, curses.A_BOLD | uiTools.getColor(flagColor)) + x += len(flag) + + if i < len(self.vals["tor/flags"]) - 1: + self.addstr(y, x, ", ") + x += 2 + else: + self.addstr(y, x, "none", curses.A_BOLD | uiTools.getColor("cyan")) else: + y = 2 if isWide else 4 statusTime = torTools.getConn().getStatus()[1] statusTimeLabel = time.strftime("%H:%M %m/%d/%Y", time.localtime(statusTime)) - msg = "<red>Tor Disconnected</red> (%s) - press r to reconnect" % statusTimeLabel - self.addfstr(2 if isWide else 4, 0, msg) + self.addstr(y, 0, "Tor Disconnected", curses.A_BOLD | uiTools.getColor("red")) + self.addstr(y, 16, " (%s) - press r to reconnect" % statusTimeLabel) # Undisplayed / Line 3 Right (exit policy) if isWide: @@ -273,18 +287,27 @@ class HeaderPanel(panel.Panel, threading.Thread): if exitPolicy == "": exitPolicy = "<default>" elif not exitPolicy.endswith((" *:*", " *")): exitPolicy += ", <default>" + self.addstr(2, leftWidth, "exit policy: ") + x = leftWidth + 13 + # color codes accepts to be green, rejects to be red, and default marker to be cyan isSimple = len(exitPolicy) > rightWidth - 13 policies = exitPolicy.split(", ") for i in range(len(policies)): policy = policies[i].strip() - displayedPolicy = policy.replace("accept", "").replace("reject", "").strip() if isSimple else policy - if policy.startswith("accept"): policy = "<green>%s</green>" % displayedPolicy - elif policy.startswith("reject"): policy = "<red>%s</red>" % displayedPolicy - elif policy.startswith("<default>"): policy = "<cyan>%s</cyan>" % displayedPolicy - policies[i] = policy - - self.addfstr(2, leftWidth, "exit policy: %s" % ", ".join(policies)) + policyLabel = policy.replace("accept", "").replace("reject", "").strip() if isSimple else policy + + policyColor = "white" + if policy.startswith("accept"): policyColor = "green" + elif policy.startswith("reject"): policyColor = "red" + elif policy.startswith("<default>"): policyColor = "cyan" + + self.addstr(2, x, policyLabel, curses.A_BOLD | uiTools.getColor(policyColor)) + x += len(policyLabel) + + if i < len(policies) - 1: + self.addstr(2, x, ", ") + x += 2 else: # Client only # TODO: not sure what information to provide here...

1 0

[arm/master] Adding a "New Identity" option
by atagar＠torproject.org 17 Jun '11

17 Jun '11

commit 1a31910080c81f01bf07aeccbaed8ff3d861ec49 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jun 16 20:53:45 2011 -0700 Adding a "New Identity" option Providing an option for sending newnym signals to tor. This is both provided via a menu option and a 'n' hotkey. There's also an indicator in the header panel if we're both on a wide screen and running as a non-relay. This was requested on 'https://trac.torproject.org/projects/tor/ticket/3394'. --- src/cli/headerPanel.py | 30 ++++++++++++++++++++++++++---- src/cli/menu/actions.py | 3 +++ src/util/torTools.py | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 63 insertions(+), 4 deletions(-) diff --git a/src/cli/headerPanel.py b/src/cli/headerPanel.py index d367b98..b5b3826 100644 --- a/src/cli/headerPanel.py +++ b/src/cli/headerPanel.py @@ -113,10 +113,24 @@ class HeaderPanel(panel.Panel, threading.Thread): if self.vals["tor/orPort"]: return 4 if isWide else 6 else: return 3 if isWide else 4 + def sendNewnym(self): + """ + Requests a new identity and provides a visual queue. + """ + + torTools.getConn().sendNewnym() + + # If we're wide then the newnym label in this panel will give an + # indication that the signal was sent. Otherwise use a msg. + isWide = self.getParent().getmaxyx()[1] >= MIN_DUAL_COL_WIDTH + if not isWide: cli.popups.showMsg("Requesting a new identity", 1) + def handleKey(self, key): isKeystrokeConsumed = True - if key in (ord('r'), ord('R')) and not self._isTorConnected: + if key in (ord('n'), ord('N')) and torTools.getConn().isNewnymAvailable(): + self.sendNewnym() + elif key in (ord('r'), ord('R')) and not self._isTorConnected: try: ctlAddr, ctlPort = self._config["startup.interface.ipAddress"], self._config["startup.interface.port"] tmpConn, authType, authValue = TorCtl.TorCtl.connectionComp(ctlAddr, ctlPort) @@ -309,9 +323,17 @@ class HeaderPanel(panel.Panel, threading.Thread): self.addstr(2, x, ", ") x += 2 else: - # Client only - # TODO: not sure what information to provide here... - pass + # (Client only) Undisplayed / Line 2 Right (new identity option) + if isWide: + conn = torTools.getConn() + newnymWait = conn.getNewnymWait() + + msg = "press 'n' for a new identity" + if newnymWait > 0: + pluralLabel = "s" if newnymWait > 1 else "" + msg = "building circuits, available again in %i second%s" % (newnymWait, pluralLabel) + + self.addstr(1, leftWidth, msg) self.valsLock.release() diff --git a/src/cli/menu/actions.py b/src/cli/menu/actions.py index b8b59e1..c571bd8 100644 --- a/src/cli/menu/actions.py +++ b/src/cli/menu/actions.py @@ -42,14 +42,17 @@ def makeActionsMenu(): """ Submenu consisting of... Close Menu + New Identity Pause / Unpause Reset Tor Exit """ control = cli.controller.getController() + headerPanel = control.getPanel("header") actionsMenu = cli.menu.item.Submenu("Actions") actionsMenu.add(cli.menu.item.MenuItem("Close Menu", None)) + actionsMenu.add(cli.menu.item.MenuItem("New Identity", headerPanel.sendNewnym)) if control.isPaused(): label, arg = "Unpause", False else: label, arg = "Pause", True diff --git a/src/util/torTools.py b/src/util/torTools.py index d0d658a..17c54f0 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -6,6 +6,7 @@ accessing TorCtl and notifications of state changes to subscribers. import os import pwd import time +import math import socket import thread import threading @@ -411,6 +412,9 @@ class Controller(TorCtl.PostEventListener): self._status = State.INIT self._statusTime = time.time() + # time that we sent our last newnym signal + self._lastNewnym = 0 + # notifies listeners that a new controller is available if not NO_SPAWN: self._notificationQueue.put(State.INIT) @@ -714,6 +718,36 @@ class Controller(TorCtl.PostEventListener): if raisedExc: raise raisedExc + def sendNewnym(self): + """ + Sends a newnym request to Tor. These are rate limited so if it occures + more than once within a ten second window then the second is delayed. + """ + + self.connLock.acquire() + + if self.isAlive(): + self._lastNewnym = time.time() + self.conn.send_signal("NEWNYM") + + self.connLock.release() + + def isNewnymAvailable(self): + """ + True if Tor will immediately respect a newnym request, false otherwise. + """ + + return self.getNewnymWait() == 0 + + def getNewnymWait(self): + """ + Provides the number of seconds until a newnym signal would be respected. + """ + + # newnym signals can occure at the rate of one every ten seconds + # TODO: this can't take other controllers into account :( + return max(0, math.ceil(self._lastNewnym + 10 - time.time())) + def getCircuits(self, default = []): """ This provides a list with tuples of the form:

1 0

[pytorctl/master] Removing socket timeout for thread wakeup
by mikeperry＠torproject.org 17 Jun '11

17 Jun '11

commit 42b5f0e536089a0a509bac0403155466881b7c2f Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jun 16 18:45:57 2011 -0700 Removing socket timeout for thread wakeup The shutdown added in this branch wakes the socket so there's no need for the loop we previously had. --- TorUtil.py | 10 +--------- 1 files changed, 1 insertions(+), 9 deletions(-) diff --git a/TorUtil.py b/TorUtil.py index 60d2b2f..82c2a12 100644 --- a/TorUtil.py +++ b/TorUtil.py @@ -188,10 +188,6 @@ def unescape_dots(s, translate_nl=1): # XXX: Exception handling class BufSock: def __init__(self, s): - # sets a timeout on our recv operations - s.settimeout(0.02) - self._isDone = False - self._s = s self._buf = [] @@ -204,10 +200,7 @@ class BufSock: return result while 1: - try: - s = self._s.recv(128) - except socket.timeout: - if not self._isDone: continue + s = self._s.recv(128) if not s: return None # XXX: This really does need an exception @@ -229,7 +222,6 @@ class BufSock: self._s.send(s) def close(self): - self._isDone = True self._s.shutdown(socket.SHUT_RDWR) self._s.close()

1 0

[pytorctl/master] Merge branch 'bug2812'
by mikeperry＠torproject.org 17 Jun '11

17 Jun '11

commit 8554340f34309af293ced771be9634887cef2568 Merge: 257fedb 42b5f0e Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Thu Jun 16 18:50:56 2011 -0700 Merge branch 'bug2812' TorUtil.py | 10 +--------- 1 files changed, 1 insertions(+), 9 deletions(-)

1 0

[pytorctl/master] Removing indefinite blocking on socket recv
by mikeperry＠torproject.org 17 Jun '11

17 Jun '11

commit 4824d623487e0d305029ea46326eba94b4e4b738 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jun 12 20:40:49 2011 -0700 Removing indefinite blocking on socket recv When shutting down we can't join on _thread unless the socket receives data because we didn't have a timeout. This issues a 20 ms timeout on socket reads and cleans up _thread when we close. --- TorCtl.py | 5 +---- TorUtil.py | 11 ++++++++++- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/TorCtl.py b/TorCtl.py index 5403a95..b87f5f2 100755 --- a/TorCtl.py +++ b/TorCtl.py @@ -642,11 +642,8 @@ class Connection: self._queue.put("CLOSE") self._eventQueue.put((time.time(), "CLOSE")) self._closed = 1 - # XXX: For some reason, this does not cause the readline in - # self._read_reply() to return immediately. The _loop() thread - # thus tends to stick around until some event causes data to come - # back... self._s.close() + self._thread.join() self._eventThread.join() finally: self._sendLock.release() diff --git a/TorUtil.py b/TorUtil.py index 9e28779..c1bebf9 100644 --- a/TorUtil.py +++ b/TorUtil.py @@ -188,6 +188,10 @@ def unescape_dots(s, translate_nl=1): # XXX: Exception handling class BufSock: def __init__(self, s): + # sets a timeout on our recv operations + s.settimeout(0.02) + self._isDone = False + self._s = s self._buf = [] @@ -200,7 +204,11 @@ class BufSock: return result while 1: - s = self._s.recv(128) + try: + s = self._s.recv(128) + except socket.timeout: + if not self._isDone: continue + if not s: return None # XXX: This really does need an exception # raise ConnectionClosed() @@ -221,6 +229,7 @@ class BufSock: self._s.send(s) def close(self): + self._isDone = True self._s.close() # SocketServer.TCPServer is nuts..

1 0

[pytorctl/master] Shutting down sockets when closed
by mikeperry＠torproject.org 17 Jun '11

17 Jun '11

commit 477c1bcde44e92243bf061f565d9403fa8e31276 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jun 12 21:41:09 2011 -0700 Shutting down sockets when closed Each TorCtl instance spawned a socket that would continue to live for the life of the python process. For more information see ticket 2812. --- TorCtl.py | 4 ++++ TorUtil.py | 1 + 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/TorCtl.py b/TorCtl.py index b87f5f2..8fac3df 100755 --- a/TorCtl.py +++ b/TorCtl.py @@ -109,6 +109,7 @@ def connect(controlAddr="127.0.0.1", controlPort=9051, passphrase=None): than prompting the user) """ + conn = None try: s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) s.connect((controlAddr, controlPort)) @@ -132,8 +133,11 @@ def connect(controlAddr="127.0.0.1", controlPort=9051, passphrase=None): print "Connection refused. Is the ControlPort enabled?" else: print "Failed to establish socket: %s" % exc + if conn: conn.close() return None except Exception, exc: + if conn: conn.close() + if passphrase and str(exc) == "Unable to authenticate: password incorrect": # provide a warning that the provided password didn't work, then try # again prompting for the user to enter it diff --git a/TorUtil.py b/TorUtil.py index c1bebf9..60d2b2f 100644 --- a/TorUtil.py +++ b/TorUtil.py @@ -230,6 +230,7 @@ class BufSock: def close(self): self._isDone = True + self._s.shutdown(socket.SHUT_RDWR) self._s.close() # SocketServer.TCPServer is nuts..

1 0

[pytorctl/master] Replacing old TorCtl example with a BW listener
by mikeperry＠torproject.org 17 Jun '11

17 Jun '11

commit 257fedbbe7b4e8f066ba570773bb2f2afbca6dc4 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jun 12 22:02:14 2011 -0700 Replacing old TorCtl example with a BW listener Event listening, particularly BW events, is a common request on irc so using it as the TorCtl example. For more information see bug 2065. --- TorCtl.py | 56 ++------------------------------------------------------ example.py | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 54 deletions(-) diff --git a/TorCtl.py b/TorCtl.py index 8fac3df..2758033 100755 --- a/TorCtl.py +++ b/TorCtl.py @@ -9,8 +9,8 @@ Library to control Tor processes. This library handles sending commands, parsing responses, and delivering events to and from the control port. The basic usage is to create a socket, wrap that in a TorCtl.Connection, and then add an EventHandler -to that connection. A simple example with a DebugEventHandler (that just -echoes the events back to stdout) is present in run_example(). +to that connection. For a simple example that prints our BW events (events +that provide the amount of traffic going over tor) see 'example.py'. Note that the TorCtl.Connection is fully compatible with the more advanced EventHandlers in TorCtl.PathSupport (and of course any other @@ -1837,55 +1837,3 @@ def parseHostAndPort(h): return host, port -def run_example(host,port): - """ Example of basic TorCtl usage. See PathSupport for more advanced - usage. - """ - print "host is %s:%d"%(host,port) - s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - s.connect((host,port)) - c = Connection(s) - c.set_event_handler(DebugEventHandler()) - th = c.launch_thread() - c.authenticate() - print "nick",`c.get_option("nickname")` - print `c.get_info("version")` - #print `c.get_info("desc/name/moria1")` - print `c.get_info("network-status")` - print `c.get_info("addr-mappings/all")` - print `c.get_info("addr-mappings/config")` - print `c.get_info("addr-mappings/cache")` - print `c.get_info("addr-mappings/control")` - - print `c.extend_circuit(0,["moria1"])` - try: - print `c.extend_circuit(0,[""])` - except ErrorReply: # wtf? - print "got error. good." - except: - print "Strange error", sys.exc_info()[0] - - #send_signal(s,1) - #save_conf(s) - - #set_option(s,"1") - #set_option(s,"bandwidthburstbytes 100000") - #set_option(s,"runasdaemon 1") - #set_events(s,[EVENT_TYPE.WARN]) -# c.set_events([EVENT_TYPE.ORCONN], True) - c.set_events([EVENT_TYPE.STREAM, EVENT_TYPE.CIRC, - EVENT_TYPE.NEWCONSENSUS, EVENT_TYPE.NEWDESC, - EVENT_TYPE.ORCONN, EVENT_TYPE.BW], True) - - th.join() - return - -if __name__ == '__main__': - if len(sys.argv) > 2: - print "Syntax: TorControl.py torhost:torport" - sys.exit(0) - else: - sys.argv.append("localhost:9051") - sh,sp = parseHostAndPort(sys.argv[1]) - run_example(sh,sp) - diff --git a/example.py b/example.py new file mode 100644 index 0000000..fdb1a99 --- /dev/null +++ b/example.py @@ -0,0 +1,34 @@ +""" +The following is a simple example of TorCtl usage. This attaches a listener +that prints the amount of traffic going over tor each second. +""" + +import time +import TorCtl + +class BandwidthListener(TorCtl.PostEventListener): + def __init__(self): + TorCtl.PostEventListener.__init__(self) + + def bandwidth_event(self, event): + print "tor read %i bytes and wrote %i bytes" % (event.read, event.written) + +# constructs a listener that prints BW events +myListener = BandwidthListener() + +# initiates a TorCtl connection, returning None if it was unsuccessful +conn = TorCtl.connect() + +if conn: + # tells tor to send us BW events + conn.set_events(["BW"]) + + # attaches the listener so it'll receive BW events + conn.add_event_listener(myListener) + + # run until we get a keyboard interrupt + try: + while True: + time.sleep(10) + except KeyboardInterrupt: pass +

1 0

[arm/master] fix: disabling resource usage checks if zero
by atagar＠torproject.org 16 Jun '11

16 Jun '11

commit cb5e1d40c1fe60dbb980a70efc9bf252a53f2597 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jun 15 08:20:46 2011 -0700 fix: disabling resource usage checks if zero When the "queries.resourceUsage.rate" is set to zero I'm disabling system resource usage queries rather than peging the cpu. --- src/util/sysTools.py | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/util/sysTools.py b/src/util/sysTools.py index 2775194..98361e5 100644 --- a/src/util/sysTools.py +++ b/src/util/sysTools.py @@ -380,7 +380,8 @@ class ResourceTracker(threading.Thread): Arguments: processPid - pid of the process being tracked - resolveRate - time between resolving resource usage + resolveRate - time between resolving resource usage, resolution is + disabled if zero """ threading.Thread.__init__(self) @@ -443,7 +444,13 @@ class ResourceTracker(threading.Thread): while not self._halt: timeSinceReset = time.time() - self.lastLookup - if timeSinceReset < self.resolveRate: + if self.resolveRate == 0: + self._cond.acquire() + if not self._halt: self._cond.wait(0.2) + self._cond.release() + + continue + elif timeSinceReset < self.resolveRate: sleepTime = max(0.2, self.resolveRate - timeSinceReset) self._cond.acquire()

1 0

[arm/master] Making interface panels optional
by atagar＠torproject.org 16 Jun '11

16 Jun '11

commit b9e004d7b2fff8ecfcf0fbf12bdb4e0e1982764f Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jun 15 08:23:30 2011 -0700 Making interface panels optional Adding "features.panels.show.*" configuration options for including or excluding individual portions of the interface. --- armrc.sample | 7 +++++ src/cli/controller.py | 69 +++++++++++++++++++++++++++++------------------- 2 files changed, 49 insertions(+), 27 deletions(-) diff --git a/armrc.sample b/armrc.sample index 1eafe77..a81c9d8 100644 --- a/armrc.sample +++ b/armrc.sample @@ -11,6 +11,13 @@ queries.resourceUsage.rate 5 queries.connections.minRate 5 queries.refreshRate.rate 5 +# allows individual panels to be included/excluded +features.panels.show.graph true +features.panels.show.log true +features.panels.show.connection true +features.panels.show.config true +features.panels.show.torrc true + # Read the proc contents directly instead of calling ps, netstat, and other # resolvers. This provides very sizable performance benefits (around 90% # faster lookups) but this is only available on Linux. diff --git a/src/cli/controller.py b/src/cli/controller.py index b019f8e..feb7cf0 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -25,6 +25,11 @@ ARM_CONTROLLER = None CONFIG = {"startup.events": "N3", "startup.blindModeEnabled": False, + "features.panels.show.graph": True, + "features.panels.show.log": True, + "features.panels.show.connection": True, + "features.panels.show.config": True, + "features.panels.show.torrc": True, "features.redrawRate": 5, "features.confirmQuit": True, "features.graph.type": 1, @@ -60,22 +65,29 @@ def initController(stdscr, startTime): # initializes the panels stickyPanels = [cli.headerPanel.HeaderPanel(stdscr, startTime, config), LabelPanel(stdscr)] - pagePanels = [] + pagePanels, firstPagePanels = [], [] # first page: graph and log - expandedEvents = cli.logPanel.expandEvents(CONFIG["startup.events"]) - pagePanels.append([cli.graphing.graphPanel.GraphPanel(stdscr), - cli.logPanel.LogPanel(stdscr, expandedEvents, config)]) + if CONFIG["features.panels.show.graph"]: + firstPagePanels.append(cli.graphing.graphPanel.GraphPanel(stdscr)) + + if CONFIG["features.panels.show.log"]: + expandedEvents = cli.logPanel.expandEvents(CONFIG["startup.events"]) + firstPagePanels.append(cli.logPanel.LogPanel(stdscr, expandedEvents, config)) + + if firstPagePanels: pagePanels.append(firstPagePanels) # second page: connections - if not CONFIG["startup.blindModeEnabled"]: + if not CONFIG["startup.blindModeEnabled"] and CONFIG["features.panels.show.connection"]: pagePanels.append([cli.connections.connPanel.ConnectionPanel(stdscr, config)]) # third page: config - pagePanels.append([cli.configPanel.ConfigPanel(stdscr, cli.configPanel.State.TOR, config)]) + if CONFIG["features.panels.show.config"]: + pagePanels.append([cli.configPanel.ConfigPanel(stdscr, cli.configPanel.State.TOR, config)]) # fourth page: torrc - pagePanels.append([cli.torrcPanel.TorrcPanel(stdscr, cli.torrcPanel.Config.TORRC, config)]) + if CONFIG["features.panels.show.torrc"]: + pagePanels.append([cli.torrcPanel.TorrcPanel(stdscr, cli.torrcPanel.Config.TORRC, config)]) # initializes the controller ARM_CONTROLLER = Controller(stdscr, stickyPanels, pagePanels) @@ -83,23 +95,24 @@ def initController(stdscr, startTime): # additional configuration for the graph panel graphPanel = ARM_CONTROLLER.getPanel("graph") - # statistical monitors for graph - bwStats = cli.graphing.bandwidthStats.BandwidthStats(config) - graphPanel.addStats(GraphStat.BANDWIDTH, bwStats) - graphPanel.addStats(GraphStat.SYSTEM_RESOURCES, cli.graphing.resourceStats.ResourceStats()) - if not CONFIG["startup.blindModeEnabled"]: - graphPanel.addStats(GraphStat.CONNECTIONS, cli.graphing.connStats.ConnStats()) - - # sets graph based on config parameter - try: - initialStats = GRAPH_INIT_STATS.get(CONFIG["features.graph.type"]) - graphPanel.setStats(initialStats) - except ValueError: pass # invalid stats, maybe connections when in blind mode - - # prepopulates bandwidth values from state file - if CONFIG["features.graph.bw.prepopulate"]: - isSuccessful = bwStats.prepopulateFromState() - if isSuccessful: graphPanel.updateInterval = 4 + if graphPanel: + # statistical monitors for graph + bwStats = cli.graphing.bandwidthStats.BandwidthStats(config) + graphPanel.addStats(GraphStat.BANDWIDTH, bwStats) + graphPanel.addStats(GraphStat.SYSTEM_RESOURCES, cli.graphing.resourceStats.ResourceStats()) + if not CONFIG["startup.blindModeEnabled"]: + graphPanel.addStats(GraphStat.CONNECTIONS, cli.graphing.connStats.ConnStats()) + + # sets graph based on config parameter + try: + initialStats = GRAPH_INIT_STATS.get(CONFIG["features.graph.type"]) + graphPanel.setStats(initialStats) + except ValueError: pass # invalid stats, maybe connections when in blind mode + + # prepopulates bandwidth values from state file + if CONFIG["features.graph.bw.prepopulate"]: + isSuccessful = bwStats.prepopulateFromState() + if isSuccessful: graphPanel.updateInterval = 4 class LabelPanel(panel.Panel): """ @@ -259,9 +272,11 @@ class Controller: returnPage = self._page if pageNumber == None else pageNumber - if includeSticky: - return self._stickyPanels + self._pagePanels[returnPage] - else: return list(self._pagePanels[returnPage]) + if self._pagePanels: + if includeSticky: + return self._stickyPanels + self._pagePanels[returnPage] + else: return list(self._pagePanels[returnPage]) + else: return self._stickyPanels if includeSticky else [] def getDaemonPanels(self): """

1 0

[arm/master] fix: Lowering get_network_status call memory usage
by atagar＠torproject.org 16 Jun '11

16 Jun '11

commit 40580190efde4a645481da72571f2722c7aa8c8b Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jun 16 07:35:14 2011 -0700 fix: Lowering get_network_status call memory usage When generating the IP -> fingerprint mappings I call the TorCtl get_network_status function which generates a TorCtl.NetworkStatus instance for every relay that exists. Since all of the memory is allocated at once this increases the preceived memory footprint of arm by 3.5 MB. This is because even after the memory's freed the python allocator doesn't actually give the memory back: http://effbot.org/pyfaq/why-doesnt-python-release-the-memory-when-i-delete-… This uses (and relies) on a change in TorCtl to use an iterator instead to avoid this mass allocation: https://gitweb.torproject.org/atagar/pytorctl.git/commit/45d7753b7c947b1412… In practice this lowers arm's baseline memory usage by 2.5 MB (12%). --- src/util/torTools.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/util/torTools.py b/src/util/torTools.py index 8c18a9d..14f24a0 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -1637,7 +1637,7 @@ class Controller(TorCtl.PostEventListener): if self.isAlive(): # fetch the current network status if not provided if not nsList: - try: nsList = self.conn.get_network_status() + try: nsList = self.conn.get_network_status(getIterator=True) except (socket.error, TorCtl.TorCtlClosed, TorCtl.ErrorReply): nsList = [] # construct mappings of ips to relay data

1 0