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

[arm/master] Adding a run_counter() method to the Daemon
by atagar＠torproject.org 21 Oct '13

21 Oct '13

commit 332e9de098ab17e4d8a359e96df40970d9e59e81 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Oct 18 14:29:00 2013 -0700 Adding a run_counter() method to the Daemon Both our connection and resource usage trackers provided a counter for the number of runs we've made so far (useful to determine if results are fresh or not). Moving this to their common parent. --- arm/connections/connPanel.py | 2 +- arm/headerPanel.py | 4 ++-- arm/util/sysTools.py | 24 ++++++------------------ arm/util/tracker.py | 37 +++++++++++++++++++++++++------------ 4 files changed, 34 insertions(+), 33 deletions(-) diff --git a/arm/connections/connPanel.py b/arm/connections/connPanel.py index 1086fae..7db0e8e 100644 --- a/arm/connections/connPanel.py +++ b/arm/connections/connPanel.py @@ -430,7 +430,7 @@ class ConnectionPanel(panel.Panel, threading.Thread): if not arm.util.tracker.get_connection_resolver().is_alive(): return connResolver = arm.util.tracker.get_connection_resolver() - currentResolutionCount = connResolver.get_resolution_count() + currentResolutionCount = connResolver.run_counter() self.valsLock.acquire() diff --git a/arm/headerPanel.py b/arm/headerPanel.py index 55f1727..bf8a98e 100644 --- a/arm/headerPanel.py +++ b/arm/headerPanel.py @@ -415,7 +415,7 @@ class HeaderPanel(panel.Panel, threading.Thread): isChanged = False if self.vals["tor/pid"]: resourceTracker = sysTools.getResourceTracker(self.vals["tor/pid"]) - isChanged = self._lastResourceFetch != resourceTracker.getRunCount() + isChanged = self._lastResourceFetch != resourceTracker.run_counter() if isChanged or currentTime - self._lastUpdate >= 20: self._update() @@ -568,7 +568,7 @@ class HeaderPanel(panel.Panel, threading.Thread): self.vals["stat/%mem"] = "0" else: cpuUsage, _, memUsage, memUsagePercent = resourceTracker.getResourceUsage() - self._lastResourceFetch = resourceTracker.getRunCount() + self._lastResourceFetch = resourceTracker.run_counter() self.vals["stat/%torCpu"] = "%0.1f" % (100 * cpuUsage) self.vals["stat/rss"] = str(memUsage) self.vals["stat/%mem"] = "%0.1f" % (100 * memUsagePercent) diff --git a/arm/util/sysTools.py b/arm/util/sysTools.py index e8a9e49..573b233 100644 --- a/arm/util/sysTools.py +++ b/arm/util/sysTools.py @@ -57,7 +57,7 @@ def getResourceTracker(pid, noSpawn = False): else: del RESOURCE_TRACKERS[pid] if noSpawn: return None - tracker = ResourceTracker(pid, CONFIG["queries.resourceUsage.rate"]) + tracker = ResourceTracker(pid) RESOURCE_TRACKERS[pid] = tracker tracker.start() return tracker @@ -68,21 +68,18 @@ class ResourceTracker(arm.util.tracker.Daemon): process. """ - def __init__(self, processPid, resolveRate): + def __init__(self, processPid): """ Initializes a new resolver daemon. When no longer needed it's suggested that this is stopped. Arguments: processPid - pid of the process being tracked - resolveRate - time between resolving resource usage, resolution is - disabled if zero """ - arm.util.tracker.Daemon.__init__(self, resolveRate) + arm.util.tracker.Daemon.__init__(self, CONFIG["queries.resourceUsage.rate"]) self.processPid = processPid - self.resolveRate = resolveRate self.cpuSampling = 0.0 # latest cpu usage sampling self.cpuAvg = 0.0 # total average cpu usage @@ -98,9 +95,6 @@ class ResourceTracker(arm.util.tracker.Daemon): self.lastLookup = -1 self._valLock = threading.RLock() - # number of successful calls we've made - self._runCount = 0 - # sequential times we've failed with this method of resolution self._failureCount = 0 @@ -116,14 +110,6 @@ class ResourceTracker(arm.util.tracker.Daemon): return results - def getRunCount(self): - """ - Provides the number of times we've successfully fetched the resource - usages. - """ - - return self._runCount - def lastQueryFailed(self): """ Provides true if, since we fetched the currently cached results, we've @@ -217,6 +203,8 @@ class ResourceTracker(arm.util.tracker.Daemon): self.memUsagePercentage = newValues["memUsagePercentage"] self._lastCpuTotal = newValues["_lastCpuTotal"] self.lastLookup = time.time() - self._runCount += 1 self._failureCount = 0 self._valLock.release() + return True + else: + return False diff --git a/arm/util/tracker.py b/arm/util/tracker.py index d9bfef0..b75e5ff 100644 --- a/arm/util/tracker.py +++ b/arm/util/tracker.py @@ -5,6 +5,13 @@ Background tasks for gathering informatino about the tor process. get_connection_resolver - provides a ConnectionResolver for our tor process + Daemon - common parent for resolvers + |- run_counter - number of successful runs + |- get_rate - provides the rate at which we run + |- set_rate - sets the rate at which we run + |- set_paused - pauses or continues work + +- stop - stops further work by the daemon + ConnectionResolver - periodically queries tor's connection information |- set_process - set the pid and process name used for lookups |- get_custom_resolver - provide the custom conntion resolver we're using @@ -49,6 +56,7 @@ class Daemon(threading.Thread): self._rate = rate self._last_ran = -1 # time when we last ran + self._run_counter = 0 # counter for the number of successful runs self._is_paused = False self._halt = False # terminates thread if true @@ -68,7 +76,11 @@ class Daemon(threading.Thread): continue # done waiting, try again - self.task() + is_successful = self.task() + + if is_successful: + self._run_counter += 1 + self._last_ran = time.time() def task(self): @@ -79,6 +91,14 @@ class Daemon(threading.Thread): pass + def run_counter(self): + """ + Provides the number of successful runs so far. This can be used to + determine if the daemon's results are new for the caller or not. + """ + + return self._run_counter + def get_rate(self): """ Provides the rate at which we perform our given task. @@ -128,7 +148,6 @@ class ConnectionResolver(Daemon): self._resolvers = connection.get_system_resolvers() self._connections = [] self._custom_resolver = None - self._resolution_counter = 0 # number of successful connection resolutions self._process_pid = None self._process_name = None @@ -160,8 +179,6 @@ class ConnectionResolver(Daemon): runtime = time.time() - start_time - self._resolution_counter += 1 - if is_default_resolver: self._failure_count = 0 @@ -180,6 +197,8 @@ class ConnectionResolver(Daemon): log.debug("connection lookup time increasing to %0.1f seconds per call" % min_rate) else: self._rate_too_low_count = 0 + + return True except IOError as exc: log.info(exc) @@ -201,6 +220,8 @@ class ConnectionResolver(Daemon): else: log.notice(CONFIG['msg.unable_to_use_all_resolvers']) + return False + def set_process(self, pid, name): """ Sets the process we retrieve connections for. @@ -244,11 +265,3 @@ class ConnectionResolver(Daemon): return [] else: return list(self._connections) - - def get_resolution_count(self): - """ - Provides the number of successful resolutions so far. This can be used to - determine if the connection results are new for the caller or not. - """ - - return self._resolution_counter

1 0

[arm/master] Adding set_process() to the resource usage tracker
by atagar＠torproject.org 21 Oct '13

21 Oct '13

commit 961d9c2f830b9893ee2d915b390debe404d0da1b Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Oct 20 19:12:42 2013 -0700 Adding set_process() to the resource usage tracker We'll be swapping to a singleton for the tor process, so allowing our resource usage tracker to be customize the process we track (like the ConnectionResolver). --- arm/util/sysTools.py | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/arm/util/sysTools.py b/arm/util/sysTools.py index 51d41ba..d6baef0 100644 --- a/arm/util/sysTools.py +++ b/arm/util/sysTools.py @@ -71,7 +71,8 @@ def getResourceTracker(pid, noSpawn = False): else: del RESOURCE_TRACKERS[pid] if noSpawn: return None - tracker = ResourceTracker(pid) + tracker = ResourceTracker() + tracker.set_process(pid) RESOURCE_TRACKERS[pid] = tracker tracker.start() return tracker @@ -82,19 +83,15 @@ class ResourceTracker(arm.util.tracker.Daemon): process. """ - def __init__(self, processPid): + def __init__(self): """ Initializes a new resolver daemon. When no longer needed it's suggested that this is stopped. - - Arguments: - processPid - pid of the process being tracked """ arm.util.tracker.Daemon.__init__(self, CONFIG["queries.resourceUsage.rate"]) - self.processPid = processPid - + self._procss_pid = None self._last_sample = None # resolves usage via proc results if true, ps otherwise @@ -109,6 +106,15 @@ class ResourceTracker(arm.util.tracker.Daemon): # sequential times we've failed with this method of resolution self._failureCount = 0 + def set_process(self, pid): + """ + Sets the process we retrieve resources for. + + :param int pid: process id + """ + + self._process_pid = pid + def getResourceUsage(self): """ Provides the last cached resource usage as a named tuple of the form: @@ -139,14 +145,14 @@ class ResourceTracker(arm.util.tracker.Daemon): newValues = {} try: if self._useProc: - utime, stime, startTime = proc.get_stats(self.processPid, proc.Stat.CPU_UTIME, proc.Stat.CPU_STIME, proc.Stat.START_TIME) + utime, stime, startTime = proc.get_stats(self._procss_pid, proc.Stat.CPU_UTIME, proc.Stat.CPU_STIME, proc.Stat.START_TIME) totalCpuTime = float(utime) + float(stime) cpuDelta = totalCpuTime - self._lastCpuTotal newValues["cpuSampling"] = cpuDelta / timeSinceReset newValues["cpuAvg"] = totalCpuTime / (time.time() - float(startTime)) newValues["_lastCpuTotal"] = totalCpuTime - memUsage = int(proc.get_memory_usage(self.processPid)[0]) + memUsage = int(proc.get_memory_usage(self._procss_pid)[0]) totalMemory = proc.get_physical_memory() newValues["memUsage"] = memUsage newValues["memUsagePercentage"] = float(memUsage) / totalMemory @@ -161,7 +167,7 @@ class ResourceTracker(arm.util.tracker.Daemon): # TIME ELAPSED RSS %MEM # 0:04.40 37:57 18772 0.9 - psCall = system.call("ps -p %s -o cputime,etime,rss,%%mem" % self.processPid) + psCall = system.call("ps -p %s -o cputime,etime,rss,%%mem" % self._procss_pid) isSuccessful = False if psCall and len(psCall) >= 2:

1 0

[arm/master] Using a named tuple for tracked resource usage
by atagar＠torproject.org 21 Oct '13

21 Oct '13

commit e1ac26ec80eda75d16f2d936edaa01b38f7e4439 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Oct 20 19:07:58 2013 -0700 Using a named tuple for tracked resource usage Swapping us over to a named tuple so we can change our callers from tuple expansion to using a named tuple's attributes. --- arm/util/sysTools.py | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/arm/util/sysTools.py b/arm/util/sysTools.py index 573b233..51d41ba 100644 --- a/arm/util/sysTools.py +++ b/arm/util/sysTools.py @@ -2,7 +2,7 @@ Helper functions for working with the underlying system. """ -import os +import collections import time import threading @@ -18,6 +18,20 @@ RESOURCE_TRACKERS = {} # mapping of pids to their resource tracker instances RUNTIMES = [] SAMPLING_PERIOD = 5 # time of the sampling period +# Process resources we poll... +# +# cpu_sample - average cpu usage since we last checked +# cpu_average - average cpu usage since we first started tracking the process +# memory_bytes - memory usage of the process in bytes +# memory_precent - percentage of our memory used by this process + +Resources = collections.namedtuple('Resources', [ + 'cpu_sample', + 'cpu_average', + 'memory_bytes', + 'memory_percent', +]) + CONFIG = conf.config_dict("arm", { "queries.resourceUsage.rate": 5, }) @@ -81,10 +95,7 @@ class ResourceTracker(arm.util.tracker.Daemon): self.processPid = processPid - self.cpuSampling = 0.0 # latest cpu usage sampling - self.cpuAvg = 0.0 # total average cpu usage - self.memUsage = 0 # last sampled memory usage in bytes - self.memUsagePercentage = 0.0 # percentage cpu usage + self._last_sample = None # resolves usage via proc results if true, ps otherwise self._useProc = proc.is_available() @@ -100,15 +111,19 @@ class ResourceTracker(arm.util.tracker.Daemon): def getResourceUsage(self): """ - Provides the last cached resource usage as a tuple of the form: + Provides the last cached resource usage as a named tuple of the form: (cpuUsage_sampling, cpuUsage_avg, memUsage_bytes, memUsage_percent) """ self._valLock.acquire() - results = (self.cpuSampling, self.cpuAvg, self.memUsage, self.memUsagePercentage) + + if self._last_sample is None: + result = Resources(0.0, 0.0, 0, 0.0) + else: + result = self._last_sample self._valLock.release() - return results + return result def lastQueryFailed(self): """ @@ -197,10 +212,7 @@ class ResourceTracker(arm.util.tracker.Daemon): newValues["cpuSampling"] = newValues["cpuAvg"] self._valLock.acquire() - self.cpuSampling = newValues["cpuSampling"] - self.cpuAvg = newValues["cpuAvg"] - self.memUsage = newValues["memUsage"] - self.memUsagePercentage = newValues["memUsagePercentage"] + self._last_sample = Resources(newValues["cpuSampling"], newValues["cpuAvg"], newValues["memUsage"], newValues["memUsagePercentage"]) self._lastCpuTotal = newValues["_lastCpuTotal"] self.lastLookup = time.time() self._failureCount = 0

1 0

[arm/master] Moving resource usage tracker to tracker module
by atagar＠torproject.org 21 Oct '13

21 Oct '13

commit 56cd312f9a2dac933f9db7e09d88f4dc8fed0613 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Oct 20 19:48:14 2013 -0700 Moving resource usage tracker to tracker module Little renaming for PEP8 compliance but otherwise pretty much a bulk move of the resource usage tracker. More refactoring needed, but the sysTools module is now close to being droppable. --- arm/connections/connPanel.py | 8 +- arm/controller.py | 8 +- arm/graphing/connStats.py | 2 +- arm/graphing/resourceStats.py | 11 ++- arm/headerPanel.py | 10 +- arm/menu/actions.py | 2 +- arm/starter.py | 4 +- arm/util/sysTools.py | 193 -------------------------------------- arm/util/tracker.py | 205 ++++++++++++++++++++++++++++++++++++++--- 9 files changed, 215 insertions(+), 228 deletions(-) diff --git a/arm/connections/connPanel.py b/arm/connections/connPanel.py index 7db0e8e..4abc068 100644 --- a/arm/connections/connPanel.py +++ b/arm/connections/connPanel.py @@ -242,7 +242,7 @@ class ConnectionPanel(panel.Panel, threading.Thread): # provides a menu to pick the connection resolver title = "Resolver Util:" options = ["auto"] + list(connections.Resolver) - connResolver = arm.util.tracker.get_connection_resolver() + connResolver = arm.util.tracker.get_connection_tracker() currentOverwrite = connResolver.get_custom_resolver() if currentOverwrite == None: oldSelection = 0 @@ -313,7 +313,7 @@ class ConnectionPanel(panel.Panel, threading.Thread): lastDraw += CONFIG["features.connection.refreshRate"] * drawTicks def getHelp(self): - resolverUtil = arm.util.tracker.get_connection_resolver().get_custom_resolver() + resolverUtil = arm.util.tracker.get_connection_tracker().get_custom_resolver() if resolverUtil == None: resolverUtil = "auto" options = [] @@ -427,9 +427,9 @@ class ConnectionPanel(panel.Panel, threading.Thread): self.appResolveSinceUpdate = False # if we don't have an initialized resolver then this is a no-op - if not arm.util.tracker.get_connection_resolver().is_alive(): return + if not arm.util.tracker.get_connection_tracker().is_alive(): return - connResolver = arm.util.tracker.get_connection_resolver() + connResolver = arm.util.tracker.get_connection_tracker() currentResolutionCount = connResolver.run_counter() self.valsLock.acquire() diff --git a/arm/controller.py b/arm/controller.py index ad3ef75..69e52ce 100644 --- a/arm/controller.py +++ b/arm/controller.py @@ -101,7 +101,7 @@ def initController(stdscr, startTime): if controller.get_conf("DisableDebuggerAttachment", None) == "1": log.notice("Tor is preventing system utilities like netstat and lsof from working. This means that arm can't provide you with connection information. You can change this by adding 'DisableDebuggerAttachment 0' to your torrc and restarting tor. For more information see...\nhttps://trac.torproject.org/3313") - arm.util.tracker.get_connection_resolver().set_paused(True) + arm.util.tracker.get_connection_tracker().set_paused(True) else: # Configures connection resoultions. This is paused/unpaused according to # if Tor's connected or not. @@ -117,14 +117,14 @@ def initController(stdscr, startTime): if tor_cmd is None: tor_cmd = "tor" - resolver = arm.util.tracker.get_connection_resolver() + resolver = arm.util.tracker.get_connection_tracker() resolver.set_process(tor_pid, tor_cmd) log.info("Operating System: %s, Connection Resolvers: %s" % (os.uname()[0], ", ".join(resolver._resolvers))) resolver.start() else: # constructs singleton resolver and, if tor isn't connected, initizes # it to be paused - arm.util.tracker.get_connection_resolver().set_paused(not controller.is_alive()) + arm.util.tracker.get_connection_tracker().set_paused(not controller.is_alive()) # third page: config if CONFIG["features.panels.show.config"]: @@ -497,7 +497,7 @@ def connResetListener(controller, eventType, _): pid if started again. """ - resolver = arm.util.tracker.get_connection_resolver() + resolver = arm.util.tracker.get_connection_tracker() if resolver.is_alive(): resolver.set_paused(eventType == State.CLOSED) diff --git a/arm/graphing/connStats.py b/arm/graphing/connStats.py index d3fe6a5..3f23b33 100644 --- a/arm/graphing/connStats.py +++ b/arm/graphing/connStats.py @@ -41,7 +41,7 @@ class ConnStats(graphPanel.GraphStats): inboundCount, outboundCount = 0, 0 - for entry in arm.util.tracker.get_connection_resolver().get_connections(): + for entry in arm.util.tracker.get_connection_tracker().get_connections(): localPort = entry.local_port if localPort in (self.orPort, self.dirPort): inboundCount += 1 elif localPort == self.controlPort: pass # control connection diff --git a/arm/graphing/resourceStats.py b/arm/graphing/resourceStats.py index 843ef41..03a8654 100644 --- a/arm/graphing/resourceStats.py +++ b/arm/graphing/resourceStats.py @@ -2,8 +2,10 @@ Tracks the system resource usage (cpu and memory) of the tor process. """ +import arm.util.tracker + from arm.graphing import graphPanel -from arm.util import sysTools, torTools +from arm.util import torTools from stem.util import str_tools @@ -42,12 +44,13 @@ class ResourceStats(graphPanel.GraphStats): primary, secondary = 0, 0 if self.queryPid: - resourceTracker = sysTools.getResourceTracker() + resourceTracker = arm.util.tracker.get_resource_tracker() - if resourceTracker and not resourceTracker.lastQueryFailed(): - primary, _, secondary, _ = resourceTracker.getResourceUsage() + if resourceTracker and not resourceTracker.last_query_failed(): + primary, _, secondary, _ = resourceTracker.get_resource_usage() primary *= 100 # decimal percentage to whole numbers secondary /= 1048576 # translate size to MB so axis labels are short + self.runCount = resourceTracker.run_counter() self._processEvent(primary, secondary) diff --git a/arm/headerPanel.py b/arm/headerPanel.py index b27a858..b559ec8 100644 --- a/arm/headerPanel.py +++ b/arm/headerPanel.py @@ -19,6 +19,8 @@ import time import curses import threading +import arm.util.tracker + import stem import stem.connection @@ -414,7 +416,7 @@ class HeaderPanel(panel.Panel, threading.Thread): isChanged = False if self.vals["tor/pid"]: - resourceTracker = sysTools.getResourceTracker() + resourceTracker = arm.util.tracker.get_resource_tracker() resourceTracker.set_process(self.vals["tor/pid"]) isChanged = self._lastResourceFetch != resourceTracker.run_counter() @@ -561,15 +563,15 @@ class HeaderPanel(panel.Panel, threading.Thread): # ps or proc derived resource usage stats if self.vals["tor/pid"]: - resourceTracker = sysTools.getResourceTracker() + resourceTracker = arm.util.tracker.get_resource_tracker() resourceTracker.set_process(self.vals["tor/pid"]) - if resourceTracker.lastQueryFailed(): + if resourceTracker.last_query_failed(): self.vals["stat/%torCpu"] = "0" self.vals["stat/rss"] = "0" self.vals["stat/%mem"] = "0" else: - cpuUsage, _, memUsage, memUsagePercent = resourceTracker.getResourceUsage() + cpuUsage, _, memUsage, memUsagePercent = resourceTracker.get_resource_usage() self._lastResourceFetch = resourceTracker.run_counter() self.vals["stat/%torCpu"] = "%0.1f" % (100 * cpuUsage) self.vals["stat/rss"] = str(memUsage) diff --git a/arm/menu/actions.py b/arm/menu/actions.py index a98ea19..6602b6b 100644 --- a/arm/menu/actions.py +++ b/arm/menu/actions.py @@ -239,7 +239,7 @@ def makeConnectionsMenu(connPanel): connectionsMenu.add(arm.menu.item.MenuItem("Sorting...", connPanel.showSortDialog)) # resolver submenu - connResolver = arm.util.tracker.get_connection_resolver() + connResolver = arm.util.tracker.get_connection_tracker() resolverMenu = arm.menu.item.Submenu("Resolver") resolverGroup = arm.menu.item.SelectionGroup(connResolver.set_custom_resolver, connResolver.get_custom_resolver()) diff --git a/arm/starter.py b/arm/starter.py index e728bfb..035fa70 100644 --- a/arm/starter.py +++ b/arm/starter.py @@ -286,8 +286,8 @@ def _shutdown_daemons(): # joins on utility daemon threads - this might take a moment since the # internal threadpools being joined might be sleeping - resource_tracker = arm.util.sysTools.getResourceTracker() if arm.util.sysTools.getResourceTracker().is_alive() else None - connection_resolver = arm.util.tracker.get_connection_resolver() if arm.util.tracker.get_connection_resolver().is_alive() else None + resource_tracker = arm.util.tracker.get_resource_tracker() if arm.util.tracker.get_resource_tracker().is_alive() else None + connection_resolver = arm.util.tracker.get_connection_tracker() if arm.util.tracker.get_connection_tracker().is_alive() else None if resource_tracker: resource_tracker.stop() diff --git a/arm/util/sysTools.py b/arm/util/sysTools.py index e2ec45e..668a56a 100644 --- a/arm/util/sysTools.py +++ b/arm/util/sysTools.py @@ -2,15 +2,7 @@ Helper functions for working with the underlying system. """ -import collections import time -import threading - -import arm.util.tracker - -from stem.util import conf, log, proc, str_tools, system - -RESOURCE_TRACKER = None # Runtimes for system calls, used to estimate cpu usage. Entries are tuples of # the form: @@ -18,27 +10,6 @@ RESOURCE_TRACKER = None RUNTIMES = [] SAMPLING_PERIOD = 5 # time of the sampling period -# Process resources we poll... -# -# cpu_sample - average cpu usage since we last checked -# cpu_average - average cpu usage since we first started tracking the process -# memory_bytes - memory usage of the process in bytes -# memory_precent - percentage of our memory used by this process - -Resources = collections.namedtuple('Resources', [ - 'cpu_sample', - 'cpu_average', - 'memory_bytes', - 'memory_percent', -]) - -CONFIG = conf.config_dict("arm", { - "queries.resourceUsage.rate": 5, -}) - -# TODO: This was a bit of a hack, and one that won't work now that we lack our -# call() method to populate RUNTIMES. - def getSysCpuUsage(): """ Provides an estimate of the cpu usage for system calls made through this @@ -56,167 +27,3 @@ def getSysCpuUsage(): runtimeSum = sum([entry[1] for entry in RUNTIMES]) return runtimeSum / SAMPLING_PERIOD -def getResourceTracker(): - """ - Singleton for tracking the resource usage of our tor process. - """ - - global RESOURCE_TRACKER - - if RESOURCE_TRACKER is None: - RESOURCE_TRACKER = ResourceTracker() - - return RESOURCE_TRACKER - -class ResourceTracker(arm.util.tracker.Daemon): - """ - Periodically fetches the resource usage (cpu and memory usage) for a given - process. - """ - - def __init__(self): - """ - Initializes a new resolver daemon. When no longer needed it's suggested - that this is stopped. - """ - - arm.util.tracker.Daemon.__init__(self, CONFIG["queries.resourceUsage.rate"]) - - self._procss_pid = None - self._last_sample = None - - # resolves usage via proc results if true, ps otherwise - self._useProc = proc.is_available() - - # used to get the deltas when querying cpu time - self._lastCpuTotal = 0 - - self.lastLookup = -1 - self._valLock = threading.RLock() - - # sequential times we've failed with this method of resolution - self._failureCount = 0 - - def set_process(self, pid): - """ - Sets the process we retrieve resources for. - - :param int pid: process id - """ - - self._process_pid = pid - - def getResourceUsage(self): - """ - Provides the last cached resource usage as a named tuple of the form: - (cpuUsage_sampling, cpuUsage_avg, memUsage_bytes, memUsage_percent) - """ - - self._valLock.acquire() - - if self._last_sample is None: - result = Resources(0.0, 0.0, 0, 0.0) - else: - result = self._last_sample - self._valLock.release() - - return result - - def lastQueryFailed(self): - """ - Provides true if, since we fetched the currently cached results, we've - failed to get new results. False otherwise. - """ - - return self._failureCount != 0 - - def task(self): - if self._procss_pid is None: - return - - timeSinceReset = time.time() - self.lastLookup - - newValues = {} - try: - if self._useProc: - utime, stime, startTime = proc.get_stats(self._procss_pid, proc.Stat.CPU_UTIME, proc.Stat.CPU_STIME, proc.Stat.START_TIME) - totalCpuTime = float(utime) + float(stime) - cpuDelta = totalCpuTime - self._lastCpuTotal - newValues["cpuSampling"] = cpuDelta / timeSinceReset - newValues["cpuAvg"] = totalCpuTime / (time.time() - float(startTime)) - newValues["_lastCpuTotal"] = totalCpuTime - - memUsage = int(proc.get_memory_usage(self._procss_pid)[0]) - totalMemory = proc.get_physical_memory() - newValues["memUsage"] = memUsage - newValues["memUsagePercentage"] = float(memUsage) / totalMemory - else: - # the ps call formats results as: - # - # TIME ELAPSED RSS %MEM - # 3-08:06:32 21-00:00:12 121844 23.5 - # - # or if Tor has only recently been started: - # - # TIME ELAPSED RSS %MEM - # 0:04.40 37:57 18772 0.9 - - psCall = system.call("ps -p %s -o cputime,etime,rss,%%mem" % self._procss_pid) - - isSuccessful = False - if psCall and len(psCall) >= 2: - stats = psCall[1].strip().split() - - if len(stats) == 4: - try: - totalCpuTime = str_tools.parse_short_time_label(stats[0]) - uptime = str_tools.parse_short_time_label(stats[1]) - cpuDelta = totalCpuTime - self._lastCpuTotal - newValues["cpuSampling"] = cpuDelta / timeSinceReset - newValues["cpuAvg"] = totalCpuTime / uptime - newValues["_lastCpuTotal"] = totalCpuTime - - newValues["memUsage"] = int(stats[2]) * 1024 # ps size is in kb - newValues["memUsagePercentage"] = float(stats[3]) / 100.0 - isSuccessful = True - except ValueError, exc: pass - - if not isSuccessful: - raise IOError("unrecognized output from ps: %s" % psCall) - except IOError, exc: - newValues = {} - self._failureCount += 1 - - if self._useProc: - if self._failureCount >= 3: - # We've failed three times resolving via proc. Warn, and fall back - # to ps resolutions. - log.info("Failed three attempts to get process resource usage from proc, falling back to ps (%s)" % exc) - - self._useProc = False - self._failureCount = 1 # prevents lastQueryFailed() from thinking that we succeeded - else: - # wait a bit and try again - log.debug("Unable to query process resource usage from proc (%s)" % exc) - else: - # exponential backoff on making failed ps calls - sleepTime = 0.01 * (2 ** self._failureCount) + self._failureCount - log.debug("Unable to query process resource usage from ps, waiting %0.2f seconds (%s)" % (sleepTime, exc)) - - # sets the new values - if newValues: - # If this is the first run then the cpuSampling stat is meaningless - # (there isn't a previous tick to sample from so it's zero at this - # point). Setting it to the average, which is a fairer estimate. - if self.lastLookup == -1: - newValues["cpuSampling"] = newValues["cpuAvg"] - - self._valLock.acquire() - self._last_sample = Resources(newValues["cpuSampling"], newValues["cpuAvg"], newValues["memUsage"], newValues["memUsagePercentage"]) - self._lastCpuTotal = newValues["_lastCpuTotal"] - self.lastLookup = time.time() - self._failureCount = 0 - self._valLock.release() - return True - else: - return False diff --git a/arm/util/tracker.py b/arm/util/tracker.py index b75e5ff..c027975 100644 --- a/arm/util/tracker.py +++ b/arm/util/tracker.py @@ -3,7 +3,8 @@ Background tasks for gathering informatino about the tor process. :: - get_connection_resolver - provides a ConnectionResolver for our tor process + get_connection_tracker - provides a ConnectionResolver for our tor process + get_resource_tracker - provides a ResourceTracker for our tor process Daemon - common parent for resolvers |- run_counter - number of successful runs @@ -12,38 +13,73 @@ Background tasks for gathering informatino about the tor process. |- set_paused - pauses or continues work +- stop - stops further work by the daemon - ConnectionResolver - periodically queries tor's connection information + ConnectionResolver - periodically checks the connections established by tor |- set_process - set the pid and process name used for lookups |- get_custom_resolver - provide the custom conntion resolver we're using |- set_custom_resolver - overwrites automatic resolver selecion with a custom resolver - |- get_connections - provides our latest connection results - +- get_resolution_count - number of times we've fetched connection information + +- get_connections - provides our latest connection results + + ResourceTracker - periodically checks the resource usage of tor + |- set_process - set the pid used for lookups + |- get_resource_usage - provides our latest resource usage results + +- last_query_failed - checks if we failed to fetch newer results """ +import collections import time import threading -from stem.util import conf, connection, log - -CONNECTION_RESOLVER = None +from stem.util import conf, connection, log, proc, str_tools, system -CONFIG = conf.config_dict('arm', { +CONFIG = conf.config_dict("arm", { + "queries.resourceUsage.rate": 5, 'queries.connections.minRate': 5, 'msg.unable_to_use_resolver': '', 'msg.unable_to_use_all_resolvers': '', }) -def get_connection_resolver(): +CONNECTION_TRACKER = None +RESOURCE_TRACKER = None + +# Process resources we poll... +# +# cpu_sample - average cpu usage since we last checked +# cpu_average - average cpu usage since we first started tracking the process +# memory_bytes - memory usage of the process in bytes +# memory_precent - percentage of our memory used by this process + +Resources = collections.namedtuple('Resources', [ + 'cpu_sample', + 'cpu_average', + 'memory_bytes', + 'memory_percent', +]) + +def get_connection_tracker(): """ - Singleton constructor for a connection resolver for tor's process. + Singleton for tracking the connections established by tor. """ - global CONNECTION_RESOLVER + global CONNECTION_TRACKER + + if CONNECTION_TRACKER is None: + CONNECTION_TRACKER = ConnectionResolver() + + return CONNECTION_TRACKER + + +def get_resource_tracker(): + """ + Singleton for tracking the resource usage of our tor process. + """ + + global RESOURCE_TRACKER + + if RESOURCE_TRACKER is None: + RESOURCE_TRACKER = ResourceTracker() - if CONNECTION_RESOLVER is None: - CONNECTION_RESOLVER = ConnectionResolver() + return RESOURCE_TRACKER - return CONNECTION_RESOLVER class Daemon(threading.Thread): """ @@ -139,7 +175,7 @@ class Daemon(threading.Thread): class ConnectionResolver(Daemon): """ - Daemon that periodically retrieves the connections made by a process. + Periodically retrieves the connections established by tor. """ def __init__(self): @@ -265,3 +301,142 @@ class ConnectionResolver(Daemon): return [] else: return list(self._connections) + +class ResourceTracker(Daemon): + """ + Periodically retrieves the resource usage of tor. + """ + + def __init__(self): + Daemon.__init__(self, CONFIG["queries.resourceUsage.rate"]) + + self._procss_pid = None + self._last_sample = None + + # resolves usage via proc results if true, ps otherwise + self._use_proc = proc.is_available() + + # used to get the deltas when querying cpu time + self._last_cpu_total = 0 + + self.last_lookup = -1 + self._val_lock = threading.RLock() + + # sequential times we've failed with this method of resolution + self._failure_count = 0 + + def set_process(self, pid): + """ + Sets the process we retrieve resources for. + + :param int pid: process id + """ + + self._process_pid = pid + + def get_resource_usage(self): + """ + Provides the last cached resource usage as a named tuple of the form: + (cpuUsage_sampling, cpuUsage_avg, memUsage_bytes, memUsage_percent) + """ + + with self._val_lock: + return self._last_sample if self._last_sample else Resources(0.0, 0.0, 0, 0.0) + + def last_query_failed(self): + """ + Provides true if, since we fetched the currently cached results, we've + failed to get new results. False otherwise. + """ + + return self._failure_count != 0 + + def task(self): + if self._procss_pid is None: + return + + time_since_reset = time.time() - self.last_lookup + new_values = {} + + try: + if self._use_proc: + utime, stime, start_time = proc.get_stats(self._procss_pid, proc.Stat.CPU_UTIME, proc.Stat.CPU_STIME, proc.Stat.START_TIME) + total_cpu_time = float(utime) + float(stime) + cpu_delta = total_cpu_time - self._last_cpu_total + new_values["cpuSampling"] = cpu_delta / time_since_reset + new_values["cpuAvg"] = total_cpu_time / (time.time() - float(start_time)) + new_values["_lastCpuTotal"] = total_cpu_time + + mem_usage = int(proc.get_memory_usage(self._procss_pid)[0]) + total_memory = proc.get_physical_memory() + new_values["memUsage"] = mem_usage + new_values["memUsagePercentage"] = float(mem_usage) / total_memory + else: + # the ps call formats results as: + # + # TIME ELAPSED RSS %MEM + # 3-08:06:32 21-00:00:12 121844 23.5 + # + # or if Tor has only recently been started: + # + # TIME ELAPSED RSS %MEM + # 0:04.40 37:57 18772 0.9 + + ps_call = system.call("ps -p %s -o cputime,etime,rss,%%mem" % self._procss_pid) + + is_successful = False + if ps_call and len(ps_call) >= 2: + stats = ps_call[1].strip().split() + + if len(stats) == 4: + try: + total_cpu_time = str_tools.parse_short_time_label(stats[0]) + uptime = str_tools.parse_short_time_label(stats[1]) + cpu_delta = total_cpu_time - self._last_cpu_total + new_values["cpuSampling"] = cpu_delta / time_since_reset + new_values["cpuAvg"] = total_cpu_time / uptime + new_values["_lastCpuTotal"] = total_cpu_time + + new_values["memUsage"] = int(stats[2]) * 1024 # ps size is in kb + new_values["memUsagePercentage"] = float(stats[3]) / 100.0 + is_successful = True + except ValueError, exc: pass + + if not is_successful: + raise IOError("unrecognized output from ps: %s" % ps_call) + except IOError, exc: + new_values = {} + self._failure_count += 1 + + if self._use_proc: + if self._failure_count >= 3: + # We've failed three times resolving via proc. Warn, and fall back + # to ps resolutions. + log.info("Failed three attempts to get process resource usage from proc, falling back to ps (%s)" % exc) + + self._use_proc = False + self._failure_count = 1 # prevents last_query_failed() from thinking that we succeeded + else: + # wait a bit and try again + log.debug("Unable to query process resource usage from proc (%s)" % exc) + else: + # exponential backoff on making failed ps calls + sleep_time = 0.01 * (2 ** self._failure_count) + self._failure_count + log.debug("Unable to query process resource usage from ps, waiting %0.2f seconds (%s)" % (sleep_time, exc)) + + # sets the new values + if new_values: + # If this is the first run then the cpuSampling stat is meaningless + # (there isn't a previous tick to sample from so it's zero at this + # point). Setting it to the average, which is a fairer estimate. + if self.last_lookup == -1: + new_values["cpuSampling"] = new_values["cpuAvg"] + + with self.val_lock: + self._last_sample = Resources(new_values["cpuSampling"], new_values["cpuAvg"], new_values["memUsage"], new_values["memUsagePercentage"]) + self._last_cpu_total = new_values["_lastCpuTotal"] + self.last_lookup = time.time() + self._failure_count = 0 + return True + else: + return False

1 0

[tor/master] Make test_cmdline_args.py work with older pythons
by nickm＠torproject.org 21 Oct '13

21 Oct '13

commit 338bcad9e4b287664e6be94cbeb332e41e03a3c0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 21 14:33:52 2013 -0400 Make test_cmdline_args.py work with older pythons I was using the assertIn() function on unit tests, which Python 2.7 introduced. But we'd like to be able to run our unit tests on Pythons from older operating systems. --- src/test/test_cmdline_args.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/test_cmdline_args.py b/src/test/test_cmdline_args.py index 1b0963f..2213bb5 100755 --- a/src/test/test_cmdline_args.py +++ b/src/test/test_cmdline_args.py @@ -163,9 +163,9 @@ class CmdlineTests(unittest.TestCase): out_fl = lines(out_fl) self.assert_(len(out_fl) > 100) - self.assertIn("SocksPort 9999", out_fl) - self.assertIn("SafeLogging 0", out_fl) - self.assertIn("ClientOnly 0", out_fl) + self.assert_("SocksPort 9999" in out_fl) + self.assert_("SafeLogging 0" in out_fl) + self.assert_("ClientOnly 0" in out_fl) self.assert_(out_verif.endswith("Configuration was valid\n"))

1 0

[tor/master] Better detection for certain broken cross-compiling situations.
by nickm＠torproject.org 21 Oct '13

21 Oct '13

commit b7a17de454c9c2721059393d237f3984bd5aa74f Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 21 13:30:38 2013 -0400 Better detection for certain broken cross-compiling situations. Fixes bug 9869; patch from Benedikt Gollatz. --- changes/bug9869 | 7 +++++++ configure.ac | 17 +++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/changes/bug9869 b/changes/bug9869 new file mode 100644 index 0000000..d67156d --- /dev/null +++ b/changes/bug9869 @@ -0,0 +1,7 @@ + o Minor features (build): + + - Assume that a user using configure --host wants to cross- + compile and error if we cannot find a properly named tool- + chain. Add --disable-tool-name-check to enable the user + to build nevertheless. Addresses ticket 9869. Patch by + Benedikt Gollatz. diff --git a/configure.ac b/configure.ac index f1fa881..8d21661 100644 --- a/configure.ac +++ b/configure.ac @@ -158,12 +158,29 @@ fi]) AC_ARG_ENABLE(bufferevents, AS_HELP_STRING(--enable-bufferevents, use Libevent's buffered IO.)) +AC_ARG_ENABLE(tool-name-check, + AS_HELP_STRING(--disable-tool-name-check, check for sanely named toolchain when cross-compiling)) + dnl check for the correct "ar" when cross-compiling AN_MAKEVAR([AR], [AC_PROG_AR]) AN_PROGRAM([ar], [AC_PROG_AR]) AC_DEFUN([AC_PROG_AR], [AC_CHECK_TOOL([AR], [ar], [ar])]) AC_PROG_AR +dnl Check whether the above macro has settled for a simply named tool even +dnl though we're cross compiling. We must do this before running AC_PROG_CC, +dnl because that will find any cc on the system, not only the cross-compiler, +dnl and then verify that a binary built with this compiler runs on the +dnl build system. It will then come to the false conclusion that we're not +dnl cross-compiling. +if test x$enable_tool_name_check != xno; then + if test x$ac_tool_warned = xyes; then + AC_MSG_ERROR([We are cross compiling but could not find a properly named toolchain. Do you have your cross-compiling toolchain in PATH? (You can --disable-tool-name-check to ignore this.)]) + elif test "x$ac_ct_AR" != x -a x$cross_compiling = xmaybe; then + AC_MSG_ERROR([We think we are cross compiling but could not find a properly named toolchain. Do you have your cross-compiling toolchain in PATH? (You can --disable-tool-name-check to ignore this.)]) + fi +fi + AC_PROG_CC AC_PROG_CPP AC_PROG_MAKE_SET

1 0

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 21 Oct '13

21 Oct '13

commit b2a5f0644e9d01d8b730dc8dee73b98aae27d869 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 21 17:15:47 2013 +0000 Update translations for torcheck_completed --- el/torcheck.po | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/el/torcheck.po b/el/torcheck.po index 751a02f..96e5a7b 100644 --- a/el/torcheck.po +++ b/el/torcheck.po @@ -1,7 +1,8 @@ # TorCheck gettext template -# Copyright (C) 2008-2012 The Tor Project, Inc +# Copyright (C) 2008-2013 The Tor Project, Inc # # Translators: +# anvo <fragos.george(a)hotmail.com>, 2013 # isv31 <ix4svs(a)gmail.com>, 2012 # kotkotkot <kotakota(a)gmail.com>, 2012 # Γιάννης Ανθυμίδης <yannanth(a)gmail.com>, 2011 @@ -10,9 +11,9 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2013-04-29 08:18+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" -"Language-Team: Tor Translation <tor-translation(a)torproject.org>\n" +"PO-Revision-Date: 2013-10-21 17:00+0000\n" +"Last-Translator: anvo <fragos.george(a)hotmail.com>\n" +"Language-Team: Greek (http://www.transifex.com/projects/p/torproject/language/el/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -20,8 +21,8 @@ msgstr "" "Language: el\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -msgid "Congratulations. Your browser is configured to use Tor." -msgstr "Συγχαρητήρια. Ο περιηγητής σας είναι ρυθμισμένος να χρησιμοποιεί το Tor." +msgid "Congratulations. This browser is configured to use Tor." +msgstr "Συγχαρητήρια! Αυτός ο περιηγητής ρυθμίστηκε ώστε να χρησιμοποιεί Tor." msgid "" "Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> " @@ -57,3 +58,12 @@ msgstr "Προσωρινοί τεχνικοί λόγοι δε μας επέτρ msgid "Your IP address appears to be: " msgstr "Η IP διεύθυνσή σας φαίνεται να είναι η:" + +msgid "Are you using Tor?" +msgstr "Χρησιμοποιείτε το Tor;" + +msgid "This page is also available in the following languages:" +msgstr "Η σελίδα αυτή είναι επίσης διαθέσιμη και στις ακόλουθες γλώσσες:" + +msgid "For more information about this exit relay, see:" +msgstr "Για περισσότερες πληροφορίες για αυτόν τον αναμεταδότη εξόδου (exit relay), δείτε:"

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 21 Oct '13

21 Oct '13

commit 4e973e07a4699794dedea70e083156c7cea2f91f Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 21 17:15:44 2013 +0000 Update translations for torcheck --- el/torcheck.po | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/el/torcheck.po b/el/torcheck.po index 5375b64..96e5a7b 100644 --- a/el/torcheck.po +++ b/el/torcheck.po @@ -2,6 +2,7 @@ # Copyright (C) 2008-2013 The Tor Project, Inc # # Translators: +# anvo <fragos.george(a)hotmail.com>, 2013 # isv31 <ix4svs(a)gmail.com>, 2012 # kotkotkot <kotakota(a)gmail.com>, 2012 # Γιάννης Ανθυμίδης <yannanth(a)gmail.com>, 2011 @@ -10,8 +11,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2013-10-03 09:07+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2013-10-21 17:00+0000\n" +"Last-Translator: anvo <fragos.george(a)hotmail.com>\n" "Language-Team: Greek (http://www.transifex.com/projects/p/torproject/language/el/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,7 +22,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" msgid "Congratulations. This browser is configured to use Tor." -msgstr "" +msgstr "Συγχαρητήρια! Αυτός ο περιηγητής ρυθμίστηκε ώστε να χρησιμοποιεί Tor." msgid "" "Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> " @@ -59,10 +60,10 @@ msgid "Your IP address appears to be: " msgstr "Η IP διεύθυνσή σας φαίνεται να είναι η:" msgid "Are you using Tor?" -msgstr "" +msgstr "Χρησιμοποιείτε το Tor;" msgid "This page is also available in the following languages:" -msgstr "" +msgstr "Η σελίδα αυτή είναι επίσης διαθέσιμη και στις ακόλουθες γλώσσες:" msgid "For more information about this exit relay, see:" -msgstr "" +msgstr "Για περισσότερες πληροφορίες για αυτόν τον αναμεταδότη εξόδου (exit relay), δείτε:"

1 0

[tor/master] Give a better warning when stack protection breaks linking.
by nickm＠torproject.org 21 Oct '13

21 Oct '13

commit 21ac292820da5784cf3c87e77df57b7594071d09 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 21 13:07:47 2013 -0400 Give a better warning when stack protection breaks linking. Fix for 9948; patch from Benedikt Gollatz. --- acinclude.m4 | 9 +++++++++ changes/bug9948 | 6 ++++++ configure.ac | 11 ++++++++++- 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/acinclude.m4 b/acinclude.m4 index af15051..2943734 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -43,6 +43,8 @@ AC_DEFUN([TOR_DEFINE_CODEPATH], ]) dnl 1:flags +dnl 2:also try to link (yes: non-empty string) +dnl will set yes or no in $tor_can_link_$1 (as modified by AS_VAR_PUSHDEF) AC_DEFUN([TOR_CHECK_CFLAGS], [ AS_VAR_PUSHDEF([VAR],[tor_cv_cflags_$1]) AC_CACHE_CHECK([whether the compiler accepts $1], VAR, [ @@ -51,6 +53,13 @@ AC_DEFUN([TOR_CHECK_CFLAGS], [ AC_TRY_COMPILE([], [return 0;], [AS_VAR_SET(VAR,yes)], [AS_VAR_SET(VAR,no)]) + if test x$2 != x; then + AS_VAR_PUSHDEF([can_link],[tor_can_link_$1]) + AC_TRY_LINK([], [return 0;], + [AS_VAR_SET(can_link,yes)], + [AS_VAR_SET(can_link,no)]) + AS_VAR_POPDEF([can_link]) + fi CFLAGS="$tor_saved_CFLAGS" ]) if test x$VAR = xyes; then diff --git a/changes/bug9948 b/changes/bug9948 new file mode 100644 index 0000000..6a673c0 --- /dev/null +++ b/changes/bug9948 @@ -0,0 +1,6 @@ + o Minor features (build): + + - Check in configure whether we can link an executable when + stack protection is enabled so we can warn the user about a + potentially missing libssp. Addresses ticket 9948. Patch + from Benedikt Gollatz. diff --git a/configure.ac b/configure.ac index 77767c5..f1fa881 100644 --- a/configure.ac +++ b/configure.ac @@ -589,7 +589,16 @@ if test x$enable_gcc_hardening != xno; then if test x$have_clang = xyes; then TOR_CHECK_CFLAGS(-Qunused-arguments) fi - TOR_CHECK_CFLAGS(-fstack-protector-all) + TOR_CHECK_CFLAGS(-fstack-protector-all, also_link) + AS_VAR_PUSHDEF([can_compile], [tor_cv_cflags_-fstack-protector-all]) + AS_VAR_PUSHDEF([can_link], [tor_can_link_-fstack-protector-all]) + AS_VAR_IF(can_compile, [yes], + AS_VAR_IF(can_link, [yes], + [], + AC_MSG_ERROR([We tried to build with stack protection; it looks like your compiler supports it but your libc does not provide it. Are you missing libssp? (You can --disable-gcc-hardening to ignore this error.)])) + ) + AS_VAR_POPDEF([can_link]) + AS_VAR_POPDEF([can_compile]) TOR_CHECK_CFLAGS(-Wstack-protector) TOR_CHECK_CFLAGS(-fwrapv) TOR_CHECK_CFLAGS(--param ssp-buffer-size=1)

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 20 Oct '13

20 Oct '13

commit 5e347e70150cbf407d650be3dc7a52af921becfb Author: Translation commit bot <translation(a)torproject.org> Date: Sun Oct 20 19:46:11 2013 +0000 Update translations for tor-launcher-network-settings --- fa/network-settings.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fa/network-settings.dtd b/fa/network-settings.dtd index 51511c7..f54a896 100644 --- a/fa/network-settings.dtd +++ b/fa/network-settings.dtd @@ -2,7 +2,7 @@  -<!ENTITY torsettings.prompt ""> +<!ENTITY torsettings.prompt "پیش از آغاز اتصال بسته تور به شبکه تور، نیاز است شما اطلاعاتی درباره اتصال اینترنت این رایانه ارائه کنید"> <!ENTITY torSettings.yes "بله"> <!ENTITY torSettings.no "نه"> @@ -43,11 +43,11 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox ""> <!ENTITY torsettings.firewall.allowedPorts "پورت های مجاز:"> -<!ENTITY torsettings.useBridges.checkbox ""> +<!ENTITY torsettings.useBridges.checkbox "‫سرویس دهنده اینترنت (ISP) من اتصال به شبکه تور را مسدود می‌کند."> <!ENTITY torsettings.useBridges.label ""> <!ENTITY torsettings.useBridges.placeholder ""> -<!ENTITY torsettings.copyLog ""> +<!ENTITY torsettings.copyLog "کپی گزارش وقایع تور"> <!ENTITY torsettings.bridgeHelpTitle ""> <!ENTITY torsettings.bridgeHelp1 ""> <!ENTITY torsettings.bridgeHelp2 "">

1 0