tor-commits May 2013

tor-commits@lists.torproject.org

20 participants
1497 discussions

[stem/master] Controller cache thread safety
by atagar＠torproject.org 12 May '13

12 May '13

commit c4b47fc89582dc96b75c90d8eb7629d88304b06d Merge: 76f82d7 e96440e Author: Damian Johnson <atagar(a)torproject.org> Date: Sat May 11 19:37:48 2013 -0700 Controller cache thread safety Making our caching operations thread safe. Patch thanks to Akshit... https://trac.torproject.org/8607 stem/control.py | 157 ++++++++++++++++++++++++++++++++++++++++--------------- 1 files changed, 115 insertions(+), 42 deletions(-)

1 0

[stem/master] Revisions for cache thread safety
by atagar＠torproject.org 12 May '13

12 May '13

commit e96440eda20e1bbd89ed542654b4f080b8ecb064 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat May 11 18:36:44 2013 -0700 Revisions for cache thread safety Handful of changes for the prior couple commits. Most are stylistic, but there's a couple funcitonal ones: * _set_cache() could accidently remove 'exit_policy' * _confchanged_listener didn't use the new thread safe operations --- stem/control.py | 83 ++++++++++++++++++++++++++---------------------------- 1 files changed, 40 insertions(+), 43 deletions(-) diff --git a/stem/control.py b/stem/control.py index 71f790e..08ce196 100644 --- a/stem/control.py +++ b/stem/control.py @@ -679,14 +679,10 @@ class Controller(BaseController): def _confchanged_listener(event): if self.is_caching_enabled(): - for param, value in event.config.items(): - cache_key = "getconf.%s" % param.lower() + self._set_cache(dict((k, None) for k in event.config), "getconf") - if cache_key in self._request_cache: - del self._request_cache[cache_key] - - if param.lower() == "exitpolicy" and "exit_policy" in self._request_cache: - del self._request_cache["exit_policy"] + if "exitpolicy" in event.config.keys(): + self._set_cache({"exitpolicy": None}) self.add_event_listener(_confchanged_listener, EventType.CONF_CHANGED) @@ -755,12 +751,12 @@ class Controller(BaseController): params = set(params) # check for cached results + from_cache = [param.lower() for param in params] cached_results = self._get_cache_map(from_cache, "getinfo") - reply = {} - for key in cached_results.keys(): - user_expected_key = _case_insensitive_lookup(params, key, key) + for key in cached_results: + user_expected_key = _case_insensitive_lookup(params, key) reply[user_expected_key] = cached_results[key] params.remove(user_expected_key) @@ -789,6 +785,7 @@ class Controller(BaseController): if self.is_caching_enabled(): to_cache = {} + for key, value in response.entries.items(): key = key.lower() # make case insensitive @@ -881,6 +878,7 @@ class Controller(BaseController): with self._msg_lock: try: config_policy = self._get_cache("exit_policy") + if not config_policy: policy = [] @@ -896,6 +894,7 @@ class Controller(BaseController): policy += policy_line.split(",") policy += self.get_info("exit-policy/default").split(",") + config_policy = stem.exit_policy.get_config_policy(policy) self._set_cache({"exit_policy": config_policy}) @@ -1328,12 +1327,12 @@ class Controller(BaseController): lookup_params = set([MAPPED_CONFIG_KEYS.get(entry, entry) for entry in params]) # check for cached results + from_cache = [param.lower() for param in lookup_params] cached_results = self._get_cache_map(from_cache, "getconf") - reply = {} - for key in cached_results.keys(): - user_expected_key = _case_insensitive_lookup(lookup_params, key, key) + for key in cached_results: + user_expected_key = _case_insensitive_lookup(lookup_params, key) reply[user_expected_key] = cached_results[key] lookup_params.remove(user_expected_key) @@ -1348,15 +1347,9 @@ class Controller(BaseController): reply.update(response.entries) if self.is_caching_enabled(): - to_cache = {} - for param, value in response.entries.items(): - param = param.lower() - - if isinstance(value, (bytes, unicode)): - value = [value] - to_cache[param] = value - + to_cache = dict((k.lower(), v) for k, v in response.entries.items()) self._set_cache(to_cache, "getconf") + # Maps the entries back to the parameters that the user requested so the # capitalization matches (ie, if they request "exitpolicy" then that # should be the key rather than "ExitPolicy"). When the same @@ -1502,10 +1495,17 @@ class Controller(BaseController): if self.is_caching_enabled(): to_cache = {} + for param, value in params: + param = param.lower() + if isinstance(value, (bytes, unicode)): value = [value] - to_cache[param.lower()] = value + + to_cache[param] = value + + if param == "exitpolicy": + self._set_cache({"exitpolicy": None}) self._set_cache(to_cache, "getconf") else: @@ -1596,25 +1596,24 @@ class Controller(BaseController): if not response.is_ok(): raise stem.ProtocolError("SETEVENTS received unexpected response\n%s" % response) - def _get_cache(self, param, func=None): + def _get_cache(self, param, namespace = None): """ - Queries cache for a configuration option. + Queries our request cache for the given key. - :param str param: key to be queried in cache - :param str func: function prefix to keys + :param str param: key to be queried + :param str namespace: namespace in which to check for the key - :returns: cached value corresponding to key or None if key wasn't found + :returns: cached value corresponding to key or **None** if the key wasn't found """ - return self._get_cache_map([param], func).get(param, None) + return self._get_cache_map([param], namespace).get(param, None) - def _get_cache_map(self, params, func=None): + def _get_cache_map(self, params, namespace = None): """ - Queries multiple configuration options in cache atomically, returning a - mapping of those options to their values. + Queries our request cache for multiple entries. - :param list params: keys to be queried in cache - :param str func: function prefix to keys + :param list params: keys to be queried + :param str namespace: namespace in which to check for the keys :returns: **dict** of 'param => cached value' pairs of keys present in cache """ @@ -1623,8 +1622,8 @@ class Controller(BaseController): cached_values = {} for param in params: - if func: - cache_key = "%s.%s" % (func, param) + if namespace: + cache_key = "%s.%s" % (namespace, param) else: cache_key = param @@ -1633,18 +1632,19 @@ class Controller(BaseController): return cached_values - def _set_cache(self, params, func=None): + def _set_cache(self, params, namespace = None): """ - Changes the value of tor configuration options in cache atomically. + Sets the given request cache entries. If the new cache value is **None** + then it is removed from our cache. :param dict params: **dict** of 'cache_key => value' pairs to be cached - :param str func: function prefix to keys + :param str namespace: namespace for the keys """ with self._cache_lock: for key, value in params.items(): - if func: - cache_key = "%s.%s" % (func, key) + if namespace: + cache_key = "%s.%s" % (namespace, key) else: cache_key = key @@ -1654,9 +1654,6 @@ class Controller(BaseController): else: self._request_cache[cache_key] = value - if key.lower() == "exitpolicy" and "exit_policy" in self._request_cache: - del self._request_cache["exit_policy"] - def is_caching_enabled(self): """ **True** if caching has been enabled, **False** otherwise.

1 0

[translation/gettor_completed] Update translations for gettor_completed
by translation＠torproject.org 12 May '13

12 May '13

commit 0836cd38a69fb25904bb40f6bb6fe9376d380010 Author: Translation commit bot <translation(a)torproject.org> Date: Sun May 12 02:45:10 2013 +0000 Update translations for gettor_completed --- zh_CN/gettor.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/zh_CN/gettor.po b/zh_CN/gettor.po index d845071..2233f0f 100644 --- a/zh_CN/gettor.po +++ b/zh_CN/gettor.po @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2013-05-12 01:35+0000\n" +"PO-Revision-Date: 2013-05-12 02:39+0000\n" "Last-Translator: simabull tsai\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -328,7 +328,7 @@ msgid "" "your computer yet, you can download it here:\n" "\n" " http://www.7-zip.org/" -msgstr "对于接收到的文件，最简易的解压方式是使用 7-Zip，\n一款免费的文件压缩/解压工具。如果你的计算机尚未\n安装该软件，请从以下地址下载：\n\n http://www.7-zip.org/" +msgstr "对于接收到的文件，使用 7-Zip 解压是最简单的方法。\n7-Zip 是一款免费的文件压缩/解压工具。如果你的计算机尚未\n安装该软件，请从以下地址下载：\n\n http://www.7-zip.org/" #: lib/gettor/i18n.py:211 msgid ""

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 12 May '13

12 May '13

commit 04379dc5b59477b740817e32dfdfb38a6ed157ba Author: Translation commit bot <translation(a)torproject.org> Date: Sun May 12 02:45:06 2013 +0000 Update translations for gettor --- zh_CN/gettor.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/zh_CN/gettor.po b/zh_CN/gettor.po index d845071..2233f0f 100644 --- a/zh_CN/gettor.po +++ b/zh_CN/gettor.po @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2013-05-12 01:35+0000\n" +"PO-Revision-Date: 2013-05-12 02:39+0000\n" "Last-Translator: simabull tsai\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -328,7 +328,7 @@ msgid "" "your computer yet, you can download it here:\n" "\n" " http://www.7-zip.org/" -msgstr "对于接收到的文件，最简易的解压方式是使用 7-Zip，\n一款免费的文件压缩/解压工具。如果你的计算机尚未\n安装该软件，请从以下地址下载：\n\n http://www.7-zip.org/" +msgstr "对于接收到的文件，使用 7-Zip 解压是最简单的方法。\n7-Zip 是一款免费的文件压缩/解压工具。如果你的计算机尚未\n安装该软件，请从以下地址下载：\n\n http://www.7-zip.org/" #: lib/gettor/i18n.py:211 msgid ""

1 0

[translation/gettor_completed] Update translations for gettor_completed
by translation＠torproject.org 12 May '13

12 May '13

commit 8cf21fa946e8dccc9d9427a6f744b8a827c0b989 Author: Translation commit bot <translation(a)torproject.org> Date: Sun May 12 01:45:12 2013 +0000 Update translations for gettor_completed --- zh_CN/gettor.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/zh_CN/gettor.po b/zh_CN/gettor.po index cf86e1f..d845071 100644 --- a/zh_CN/gettor.po +++ b/zh_CN/gettor.po @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2013-05-12 01:13+0000\n" +"PO-Revision-Date: 2013-05-12 01:35+0000\n" "Last-Translator: simabull tsai\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -226,7 +226,7 @@ msgid "" "The output should look somewhat like this:\n" "\n" " gpg: Good signature from 'Erinn Clark <...>'" -msgstr "输出结果应类似于以下内容：\n\n gpg: Good signature from 'Erinn Clark <...>'" +msgstr "输出应类似于以下内容：\n\n gpg: Good signature from 'Erinn Clark <...>'" #: lib/gettor/i18n.py:152 msgid "" @@ -234,7 +234,7 @@ msgid "" "a graphical user interface for GnuPG on this website:\n" "\n" " http://www.gnupg.org/related_software/frontends.html" -msgstr "如果不熟悉命令行工具，请尝试使用 GnuPG 网站上的图形界面程序：\n\nhttp://www.gnupg.org/related_software/frontends.html" +msgstr "如果不熟悉命令行工具，请使用 GnuPG 网站提供的图形界面程序：\n\nhttp://www.gnupg.org/related_software/frontends.html" #: lib/gettor/i18n.py:157 msgid ""

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 12 May '13

12 May '13

commit 209db9e364184616ac3a3880ad42c63706faaeac Author: Translation commit bot <translation(a)torproject.org> Date: Sun May 12 01:45:08 2013 +0000 Update translations for gettor --- zh_CN/gettor.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/zh_CN/gettor.po b/zh_CN/gettor.po index cf86e1f..d845071 100644 --- a/zh_CN/gettor.po +++ b/zh_CN/gettor.po @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2013-05-12 01:13+0000\n" +"PO-Revision-Date: 2013-05-12 01:35+0000\n" "Last-Translator: simabull tsai\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -226,7 +226,7 @@ msgid "" "The output should look somewhat like this:\n" "\n" " gpg: Good signature from 'Erinn Clark <...>'" -msgstr "输出结果应类似于以下内容：\n\n gpg: Good signature from 'Erinn Clark <...>'" +msgstr "输出应类似于以下内容：\n\n gpg: Good signature from 'Erinn Clark <...>'" #: lib/gettor/i18n.py:152 msgid "" @@ -234,7 +234,7 @@ msgid "" "a graphical user interface for GnuPG on this website:\n" "\n" " http://www.gnupg.org/related_software/frontends.html" -msgstr "如果不熟悉命令行工具，请尝试使用 GnuPG 网站上的图形界面程序：\n\nhttp://www.gnupg.org/related_software/frontends.html" +msgstr "如果不熟悉命令行工具，请使用 GnuPG 网站提供的图形界面程序：\n\nhttp://www.gnupg.org/related_software/frontends.html" #: lib/gettor/i18n.py:157 msgid ""

1 0

[translation/gettor_completed] Update translations for gettor_completed
by translation＠torproject.org 12 May '13

12 May '13

commit be3650d3c71db8fc7435b6cf76877ca7454dcdbd Author: Translation commit bot <translation(a)torproject.org> Date: Sun May 12 01:15:13 2013 +0000 Update translations for gettor_completed --- zh_CN/gettor.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/zh_CN/gettor.po b/zh_CN/gettor.po index cdf33b3..cf86e1f 100644 --- a/zh_CN/gettor.po +++ b/zh_CN/gettor.po @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2013-05-12 00:08+0000\n" +"PO-Revision-Date: 2013-05-12 01:13+0000\n" "Last-Translator: simabull tsai\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n"

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 12 May '13

12 May '13

commit 2d649e5f0edfc30d977ce8996e1b3ac0fb31da5a Author: Translation commit bot <translation(a)torproject.org> Date: Sun May 12 01:15:08 2013 +0000 Update translations for gettor --- zh_CN/gettor.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/zh_CN/gettor.po b/zh_CN/gettor.po index cdf33b3..cf86e1f 100644 --- a/zh_CN/gettor.po +++ b/zh_CN/gettor.po @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2013-05-12 00:08+0000\n" +"PO-Revision-Date: 2013-05-12 01:13+0000\n" "Last-Translator: simabull tsai\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n"

1 0

[translation/gettor_completed] Update translations for gettor_completed
by translation＠torproject.org 12 May '13

12 May '13

commit 5dc3f3cdcbccc2f124aeab7c5731d939a4cac0b2 Author: Translation commit bot <translation(a)torproject.org> Date: Sun May 12 00:15:12 2013 +0000 Update translations for gettor_completed --- zh_CN/gettor.po | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/zh_CN/gettor.po b/zh_CN/gettor.po index 1e4a59a..cdf33b3 100644 --- a/zh_CN/gettor.po +++ b/zh_CN/gettor.po @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2013-05-11 18:37+0000\n" +"PO-Revision-Date: 2013-05-12 00:08+0000\n" "Last-Translator: simabull tsai\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -36,7 +36,7 @@ msgid "" "Unfortunately, we won't answer you at this address. You should make\n" "an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n" "one of those." -msgstr "抱歉，我们不会将请求回复发送至你所用的这个邮箱地址。请使用 GMAIL.COM、YAHOO.COM 或 YAHOO.CN 账户，并通过这些邮箱发送请求邮件。" +msgstr "抱歉，我们不会将请求回复发送至你所用的这个邮箱地址。请使用 \nGMAIL.COM、YAHOO.COM 或 YAHOO.CN 账户，并通过这些邮箱\n发送请求邮件。" #: lib/gettor/i18n.py:35 msgid "" @@ -80,7 +80,7 @@ msgstr "请告知需要哪种版本，我将通过电子邮件发送相应的 To msgid "" "Please reply to this mail, and tell me a single package name anywhere \n" "in the body of your email." -msgstr "请回复本邮件，并在邮件正文的任意位置输入软件包的名称。 " +msgstr "请回复本邮件，并在邮件正文的任意位置写上软件包的名称。 " #: lib/gettor/i18n.py:64 msgid "" @@ -141,7 +141,7 @@ msgid "" "If your bandwith is low or your provider doesn't allow you to\n" "receive large attachments in your email, GetTor can send you several\n" "small packages instead of one big one." -msgstr "如果网络宽带较低或者无法接收较大的附件，GetTor 可将较大的\n软件包分为数个小的压缩包发送。" +msgstr "如果网络宽带较慢或者无法接收较大的附件，GetTor 可将较大的\n软件包分为数个小的压缩包发送。" #: lib/gettor/i18n.py:101 msgid ""

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 12 May '13

12 May '13

commit d651c3a4e3b4f94204808c1d7475a7341a2921a4 Author: Translation commit bot <translation(a)torproject.org> Date: Sun May 12 00:15:06 2013 +0000 Update translations for gettor --- zh_CN/gettor.po | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/zh_CN/gettor.po b/zh_CN/gettor.po index 1e4a59a..cdf33b3 100644 --- a/zh_CN/gettor.po +++ b/zh_CN/gettor.po @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2013-05-11 18:37+0000\n" +"PO-Revision-Date: 2013-05-12 00:08+0000\n" "Last-Translator: simabull tsai\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -36,7 +36,7 @@ msgid "" "Unfortunately, we won't answer you at this address. You should make\n" "an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n" "one of those." -msgstr "抱歉，我们不会将请求回复发送至你所用的这个邮箱地址。请使用 GMAIL.COM、YAHOO.COM 或 YAHOO.CN 账户，并通过这些邮箱发送请求邮件。" +msgstr "抱歉，我们不会将请求回复发送至你所用的这个邮箱地址。请使用 \nGMAIL.COM、YAHOO.COM 或 YAHOO.CN 账户，并通过这些邮箱\n发送请求邮件。" #: lib/gettor/i18n.py:35 msgid "" @@ -80,7 +80,7 @@ msgstr "请告知需要哪种版本，我将通过电子邮件发送相应的 To msgid "" "Please reply to this mail, and tell me a single package name anywhere \n" "in the body of your email." -msgstr "请回复本邮件，并在邮件正文的任意位置输入软件包的名称。 " +msgstr "请回复本邮件，并在邮件正文的任意位置写上软件包的名称。 " #: lib/gettor/i18n.py:64 msgid "" @@ -141,7 +141,7 @@ msgid "" "If your bandwith is low or your provider doesn't allow you to\n" "receive large attachments in your email, GetTor can send you several\n" "small packages instead of one big one." -msgstr "如果网络宽带较低或者无法接收较大的附件，GetTor 可将较大的\n软件包分为数个小的压缩包发送。" +msgstr "如果网络宽带较慢或者无法接收较大的附件，GetTor 可将较大的\n软件包分为数个小的压缩包发送。" #: lib/gettor/i18n.py:101 msgid ""

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits May 2013