tor-commits April 2016

tor-commits@lists.torproject.org

20 participants
1645 discussions

[translation/torbirdy_completed] Update translations for torbirdy_completed
by translation＠torproject.org 19 Apr '16

19 Apr '16

commit 65406b0524968f3b7de2b7b25d387b49ebf76d23 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 19 07:15:36 2016 +0000 Update translations for torbirdy_completed --- zh_HK/torbirdy.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_HK/torbirdy.dtd b/zh_HK/torbirdy.dtd index b2f8725..00f0143 100644 --- a/zh_HK/torbirdy.dtd +++ b/zh_HK/torbirdy.dtd @@ -41,7 +41,7 @@ <!ENTITY torbirdy.prefs.timezone.key "z"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "唔好將收件者鎖匙ID放入已加密訊息中[預設：加入]"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r"> -<!ENTITY torbirdy.prefs.confirmemail.label "如果Enigmail已啟用，發送電郵前須確定 [預設：唔確認]"> +<!ENTITY torbirdy.prefs.confirmemail.label "如果Enigmail已啟用，寄電郵前須確認 [預設：唔確認]"> <!ENTITY torbirdy.prefs.confirmemail.key "c"> <!ENTITY torbirdy.prefs.emailwizard.label "啟用Thunderbird嘅自動電郵組態嚮導[預設：停用]"> <!ENTITY torbirdy.prefs.emailwizard.key "w">

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 19 Apr '16

19 Apr '16

commit 9b63c60b1883ded48074925ec99a74f79032af7d Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 19 07:15:32 2016 +0000 Update translations for torbirdy --- zh_HK/torbirdy.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_HK/torbirdy.dtd b/zh_HK/torbirdy.dtd index b2f8725..00f0143 100644 --- a/zh_HK/torbirdy.dtd +++ b/zh_HK/torbirdy.dtd @@ -41,7 +41,7 @@ <!ENTITY torbirdy.prefs.timezone.key "z"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "唔好將收件者鎖匙ID放入已加密訊息中[預設：加入]"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r"> -<!ENTITY torbirdy.prefs.confirmemail.label "如果Enigmail已啟用，發送電郵前須確定 [預設：唔確認]"> +<!ENTITY torbirdy.prefs.confirmemail.label "如果Enigmail已啟用，寄電郵前須確認 [預設：唔確認]"> <!ENTITY torbirdy.prefs.confirmemail.key "c"> <!ENTITY torbirdy.prefs.emailwizard.label "啟用Thunderbird嘅自動電郵組態嚮導[預設：停用]"> <!ENTITY torbirdy.prefs.emailwizard.key "w">

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 19 Apr '16

19 Apr '16

commit 8419943c05f794c4e01b179d51d51ade0f6445e1 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 19 07:15:07 2016 +0000 Update translations for bridgedb_completed --- zh_HK/LC_MESSAGES/bridgedb.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/zh_HK/LC_MESSAGES/bridgedb.po b/zh_HK/LC_MESSAGES/bridgedb.po index 052ad76..d09da40 100644 --- a/zh_HK/LC_MESSAGES/bridgedb.po +++ b/zh_HK/LC_MESSAGES/bridgedb.po @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2016-04-18 08:27+0000\n" +"PO-Revision-Date: 2016-04-19 06:53+0000\n" "Last-Translator: 大圈洋蔥\n" "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/otf/torproject/language/zh_HK/)\n" "MIME-Version: 1.0\n" @@ -272,7 +272,7 @@ msgid "" "Another way to get bridges is to send an email to %s. Please note that you must\n" "send the email using an address from one of the following email providers:\n" "%s, %s or %s." -msgstr "另一取得橋接嘅方式係發送電郵到%s。請注意，你須\n使用下列電郵提供者嘅位址嚟發送電郵：\n%s、%s或%s。" +msgstr "另一取得橋接嘅方式係電郵到%s。請注意，你須\n使用下列電郵提供者嘅位址嚟寄電郵：\n%s、%s或%s。" #: bridgedb/strings.py:115 msgid "My bridges don't work! I need help!" @@ -282,7 +282,7 @@ msgstr "橋接器無法正常運作，我需要幫助！" #: bridgedb/strings.py:117 #, python-format msgid "If your Tor doesn't work, you should email %s." -msgstr "如果Tor洋蔥路由無法運作，可發送電郵到%s。" +msgstr "如果Tor洋蔥路由無法運作，可電郵到%s。" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #. TRANSLATORS: Please DO NOT translate "Tor Browser".

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 19 Apr '16

19 Apr '16

commit 4f59ff22d03b5882532c0677ae3b344370473485 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 19 07:15:03 2016 +0000 Update translations for bridgedb --- zh_HK/LC_MESSAGES/bridgedb.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/zh_HK/LC_MESSAGES/bridgedb.po b/zh_HK/LC_MESSAGES/bridgedb.po index 052ad76..d09da40 100644 --- a/zh_HK/LC_MESSAGES/bridgedb.po +++ b/zh_HK/LC_MESSAGES/bridgedb.po @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2016-04-18 08:27+0000\n" +"PO-Revision-Date: 2016-04-19 06:53+0000\n" "Last-Translator: 大圈洋蔥\n" "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/otf/torproject/language/zh_HK/)\n" "MIME-Version: 1.0\n" @@ -272,7 +272,7 @@ msgid "" "Another way to get bridges is to send an email to %s. Please note that you must\n" "send the email using an address from one of the following email providers:\n" "%s, %s or %s." -msgstr "另一取得橋接嘅方式係發送電郵到%s。請注意，你須\n使用下列電郵提供者嘅位址嚟發送電郵：\n%s、%s或%s。" +msgstr "另一取得橋接嘅方式係電郵到%s。請注意，你須\n使用下列電郵提供者嘅位址嚟寄電郵：\n%s、%s或%s。" #: bridgedb/strings.py:115 msgid "My bridges don't work! I need help!" @@ -282,7 +282,7 @@ msgstr "橋接器無法正常運作，我需要幫助！" #: bridgedb/strings.py:117 #, python-format msgid "If your Tor doesn't work, you should email %s." -msgstr "如果Tor洋蔥路由無法運作，可發送電郵到%s。" +msgstr "如果Tor洋蔥路由無法運作，可電郵到%s。" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #. TRANSLATORS: Please DO NOT translate "Tor Browser".

1 0

[research-web/master] petsymposium is https now
by arma＠torproject.org 19 Apr '16

19 Apr '16

commit 643acc70f5c42b8df6c32183fa1a1eaade09ab58 Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Apr 18 21:50:54 2016 -0400 petsymposium is https now --- htdocs/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/index.html b/htdocs/index.html index 4f77d2a..50921b7 100644 --- a/htdocs/index.html +++ b/htdocs/index.html @@ -112,7 +112,7 @@ really important. So let us know, and we'll work something out. <p> If you're interested in anonymity research, you must make it to the -<a href="http://petsymposium.org/">Privacy Enhancing Technologies +<a href="https://petsymposium.org/">Privacy Enhancing Technologies Symposium</a>. Everybody who's anybody in the anonymity research world will be there. Stipends are generally available for people whose presence will benefit the community.

1 0

[check/master] Add some translations
by arlo＠torproject.org 18 Apr '16

18 Apr '16

commit abca67d60674e9b93f6be6621cc86b0ef07218aa Author: Arlo Breault <arlolra(a)gmail.com> Date: Mon Apr 18 14:18:52 2016 -0700 Add some translations --- utils.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/utils.go b/utils.go index 0872c15..4d438d2 100644 --- a/utils.go +++ b/utils.go @@ -171,12 +171,14 @@ func GetLocaleList(base string) map[string]string { "hr_HR": "Hrvatski jezik (Croatia)", "hu": "Magyar", "id": "Bahasa Indonesia", + "is": "íslenska", "it": "Italiano", "ja": "日本語", "km": "មែរ", "kn": "ಕನ್ನಡ", "ko": "한국어", "ko_KR": "한국어 (South Korea)", + "lb": "Lëtzebuergesch", "lo": "ລາວ", "lv": "Latviešu valoda", "mk": "македонски јазик", @@ -208,6 +210,7 @@ func GetLocaleList(base string) map[string]string { "tr": "Türkçe", "uk": "українська мова", "zh_CN": "中文简体", + "zh_HK": "中文繁體", "zh_TW": "中文繁體", }

1 0

[nyx/master] Test _draw_disconnected()
by atagar＠torproject.org 18 Apr '16

18 Apr '16

commit 6cc017c0a67a6a8fe7038f229b3111743ec5b6ef Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Apr 9 23:06:23 2016 -0700 Test _draw_disconnected() --- nyx/panel/header.py | 26 ++++++++++++++------------ test/panel/header.py | 8 ++++++++ 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/nyx/panel/header.py b/nyx/panel/header.py index 54046b2..922b907 100644 --- a/nyx/panel/header.py +++ b/nyx/panel/header.py @@ -186,7 +186,7 @@ class HeaderPanel(nyx.panel.Panel, threading.Thread): if vals.is_connected: _draw_ports_section(subwindow, 0, 1, left_width, vals) else: - self._draw_disconnected(subwindow, 0, 1, left_width, vals) + _draw_disconnected(subwindow, 0, 1, vals.last_heartbeat) if is_wide: self._draw_resource_usage(subwindow, left_width, 0, right_width, vals) @@ -212,17 +212,6 @@ class HeaderPanel(nyx.panel.Panel, threading.Thread): else: subwindow.addstr(0, subwindow.height - 1, 'Paused', HIGHLIGHT) - def _draw_disconnected(self, subwindow, x, y, width, vals): - """ - Message indicating that tor is disconnected... - - Tor Disconnected (15:21 07/13/2014, press r to reconnect) - """ - - x = subwindow.addstr(x, y, 'Tor Disconnected', RED, BOLD) - last_heartbeat = time.strftime('%H:%M %m/%d/%Y', time.localtime(vals.last_heartbeat)) - subwindow.addstr(x, y, ' (%s, press r to reconnect)' % last_heartbeat) - def _draw_resource_usage(self, subwindow, x, y, width, vals): """ System resource usage of the tor process... @@ -531,6 +520,7 @@ def _draw_platform_section(subwindow, x, y, width, vals): x = subwindow.addstr(x, y, vals.version_status, version_color) subwindow.addstr(x, y, ')') + def _draw_ports_section(subwindow, x, y, width, vals): """ Section providing our nickname, address, and port information... @@ -557,3 +547,15 @@ def _draw_ports_section(subwindow, x, y, width, vals): subwindow.addstr(x, y, vals.format(', Control Port: {control_port}')) elif vals.socket_path: subwindow.addstr(x, y, vals.format(', Control Socket: {socket_path}')) + + +def _draw_disconnected(subwindow, x, y, last_heartbeat): + """ + Message indicating that tor is disconnected... + + Tor Disconnected (15:21 07/13/2014, press r to reconnect) + """ + + x = subwindow.addstr(x, y, 'Tor Disconnected', RED, BOLD) + last_heartbeat_str = time.strftime('%H:%M %m/%d/%Y', time.localtime(last_heartbeat)) + subwindow.addstr(x, y, ' (%s, press r to reconnect)' % last_heartbeat_str) diff --git a/test/panel/header.py b/test/panel/header.py index c06fd39..603d213 100644 --- a/test/panel/header.py +++ b/test/panel/header.py @@ -2,12 +2,14 @@ Unit tests for nyx.panel.header. """ +import time import unittest import nyx.panel.header import test from test import require_curses +from mock import patch class TestHeader(unittest.TestCase): @@ -76,3 +78,9 @@ class TestHeader(unittest.TestCase): ) self.assertEqual('Relaying Disabled, Control Socket: /path/to/control/socket', test.render(nyx.panel.header._draw_ports_section, 0, 0, 80, vals).content) + + @require_curses + @patch('time.localtime') + def test_draw_disconnected(self, localtime_mock): + localtime_mock.return_value = time.strptime('22:43 04/09/2016', '%H:%M %m/%d/%Y') + self.assertEqual('Tor Disconnected (22:43 04/09/2016, press r to reconnect)', test.render(nyx.panel.header._draw_disconnected, 0, 0, 1460267022.231895).content)

1 0

[nyx/master] Test _draw_flags()
by atagar＠torproject.org 18 Apr '16

18 Apr '16

commit 7c41f64f8e98f35614f5ab3cbeb0da837cd528af Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Apr 10 12:16:53 2016 -0700 Test _draw_flags() --- nyx/panel/header.py | 43 ++++++++++++++++++++++--------------------- test/panel/header.py | 6 ++++++ 2 files changed, 28 insertions(+), 21 deletions(-) diff --git a/nyx/panel/header.py b/nyx/panel/header.py index da0ba7f..00d4794 100644 --- a/nyx/panel/header.py +++ b/nyx/panel/header.py @@ -194,7 +194,7 @@ class HeaderPanel(nyx.panel.Panel, threading.Thread): if vals.is_relay: _draw_fingerprint_and_fd_usage(subwindow, left_width, 1, right_width, vals) - self._draw_flags(subwindow, 0, 2, left_width, vals) + _draw_flags(subwindow, 0, 2, vals.flags) self._draw_exit_policy(subwindow, left_width, 2, right_width, vals) elif vals.is_connected: self._draw_newnym_option(subwindow, left_width, 1, right_width, vals) @@ -203,7 +203,7 @@ class HeaderPanel(nyx.panel.Panel, threading.Thread): if vals.is_relay: _draw_fingerprint_and_fd_usage(subwindow, 0, 3, left_width, vals) - self._draw_flags(subwindow, 0, 4, left_width, vals) + _draw_flags(subwindow, 0, 4, vals.flags) if self._message: subwindow.addstr(0, subwindow.height - 1, self._message, *self._message_attr) @@ -213,25 +213,6 @@ class HeaderPanel(nyx.panel.Panel, threading.Thread): else: subwindow.addstr(0, subwindow.height - 1, 'Paused', HIGHLIGHT) - def _draw_flags(self, subwindow, x, y, width, vals): - """ - Presents flags held by our relay... - - flags: Running, Valid - """ - - x = subwindow.addstr(x, y, 'flags: ') - - if vals.flags: - for i, flag in enumerate(vals.flags): - flag_color = CONFIG['attr.flag_colors'].get(flag, WHITE) - x = subwindow.addstr(x, y, flag, flag_color, BOLD) - - if i < len(vals.flags) - 1: - x = subwindow.addstr(x, y, ', ') - else: - subwindow.addstr(x, y, 'none', CYAN, BOLD) - def _draw_exit_policy(self, subwindow, x, y, width, vals): """ Presents our exit policy... @@ -562,3 +543,23 @@ def _draw_fingerprint_and_fd_usage(subwindow, x, y, width, vals): x = subwindow.addstr(x, y, vals.format(': {fd_used} / {fd_limit} (')) x = subwindow.addstr(x, y, '%i%%' % fd_percent, *percentage_format) subwindow.addstr(x, y, ')') + + +def _draw_flags(subwindow, x, y, flags): + """ + Presents flags held by our relay... + + flags: Running, Valid + """ + + x = subwindow.addstr(x, y, 'flags: ') + + if flags: + for i, flag in enumerate(flags): + flag_color = CONFIG['attr.flag_colors'].get(flag, WHITE) + x = subwindow.addstr(x, y, flag, flag_color, BOLD) + + if i < len(flags) - 1: + x = subwindow.addstr(x, y, ', ') + else: + subwindow.addstr(x, y, 'none', CYAN, BOLD) diff --git a/test/panel/header.py b/test/panel/header.py index 0d80f0f..39982e0 100644 --- a/test/panel/header.py +++ b/test/panel/header.py @@ -156,3 +156,9 @@ class TestHeader(unittest.TestCase): ) self.assertEqual(expected, test.render(nyx.panel.header._draw_fingerprint_and_fd_usage, 0, 0, 80, vals).content) + + @require_curses + def test_draw_flags(self): + self.assertEqual('flags: none', test.render(nyx.panel.header._draw_flags, 0, 0, []).content) + self.assertEqual('flags: Guard', test.render(nyx.panel.header._draw_flags, 0, 0, ['Guard']).content) + self.assertEqual('flags: Running, Exit', test.render(nyx.panel.header._draw_flags, 0, 0, ['Running', 'Exit']).content)

1 0

[nyx/master] Test _draw_fingerprint_and_fd_usage()
by atagar＠torproject.org 18 Apr '16

18 Apr '16

commit 7b30d6fdecfe2b404188e57f81cf5fd4f8b03859 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Apr 10 11:45:30 2016 -0700 Test _draw_fingerprint_and_fd_usage() --- nyx/panel/header.py | 69 ++++++++++++++++++++++++++-------------------------- test/panel/header.py | 46 ++++++++++++++++++++++++++++++++++- 2 files changed, 80 insertions(+), 35 deletions(-) diff --git a/nyx/panel/header.py b/nyx/panel/header.py index 9e8e57d..da0ba7f 100644 --- a/nyx/panel/header.py +++ b/nyx/panel/header.py @@ -193,7 +193,7 @@ class HeaderPanel(nyx.panel.Panel, threading.Thread): _draw_resource_usage(subwindow, left_width, 0, right_width, vals, pause_time) if vals.is_relay: - self._draw_fingerprint_and_fd_usage(subwindow, left_width, 1, right_width, vals) + _draw_fingerprint_and_fd_usage(subwindow, left_width, 1, right_width, vals) self._draw_flags(subwindow, 0, 2, left_width, vals) self._draw_exit_policy(subwindow, left_width, 2, right_width, vals) elif vals.is_connected: @@ -202,7 +202,7 @@ class HeaderPanel(nyx.panel.Panel, threading.Thread): _draw_resource_usage(subwindow, 0, 2, left_width, vals, pause_time) if vals.is_relay: - self._draw_fingerprint_and_fd_usage(subwindow, 0, 3, left_width, vals) + _draw_fingerprint_and_fd_usage(subwindow, 0, 3, left_width, vals) self._draw_flags(subwindow, 0, 4, left_width, vals) if self._message: @@ -213,37 +213,6 @@ class HeaderPanel(nyx.panel.Panel, threading.Thread): else: subwindow.addstr(0, subwindow.height - 1, 'Paused', HIGHLIGHT) - def _draw_fingerprint_and_fd_usage(self, subwindow, x, y, width, vals): - """ - Presents our fingerprint, and our file descriptor usage if we're running - out... - - fingerprint: 1A94D1A794FCB2F8B6CBC179EF8FDD4008A98D3B, file desc: 900 / 1000 (90%) - """ - - initial_x, space_left = x, width - - x = subwindow.addstr(x, y, vals.format('fingerprint: {fingerprint}', width)) - space_left -= x - initial_x - - if space_left >= 30 and vals.fd_used and vals.fd_limit != -1: - fd_percent = 100 * vals.fd_used / vals.fd_limit - - if fd_percent >= SHOW_FD_THRESHOLD: - if fd_percent >= 95: - percentage_format = (RED, BOLD) - elif fd_percent >= 90: - percentage_format = (RED,) - elif fd_percent >= 60: - percentage_format = (YELLOW,) - else: - percentage_format = () - - x = subwindow.addstr(x, y, ', file descriptors' if space_left >= 37 else ', file desc') - x = subwindow.addstr(x, y, vals.format(': {fd_used} / {fd_limit} (')) - x = subwindow.addstr(x, y, '%i%%' % fd_percent, *percentage_format) - subwindow.addstr(x, y, ')') - def _draw_flags(self, subwindow, x, y, width, vals): """ Presents flags held by our relay... @@ -377,7 +346,7 @@ def _sampling(**attr): def format(self, message, crop_width = None): formatted_msg = message.format(**self._attr) - if crop_width: + if crop_width is not None: formatted_msg = str_tools.crop(formatted_msg, crop_width) return formatted_msg @@ -561,3 +530,35 @@ def _draw_resource_usage(subwindow, x, y, width, vals, pause_time): subwindow.addstr(x + start, y, label) else: break + + +def _draw_fingerprint_and_fd_usage(subwindow, x, y, width, vals): + """ + Presents our fingerprint, and our file descriptor usage if we're running + out... + + fingerprint: 1A94D1A794FCB2F8B6CBC179EF8FDD4008A98D3B, file desc: 900 / 1000 (90%) + """ + + initial_x, space_left = x, width + + x = subwindow.addstr(x, y, vals.format('fingerprint: {fingerprint}', width)) + space_left -= x - initial_x + + if space_left >= 30 and vals.fd_used and vals.fd_limit != -1: + fd_percent = 100 * vals.fd_used / vals.fd_limit + + if fd_percent >= SHOW_FD_THRESHOLD: + if fd_percent >= 95: + percentage_format = (RED, BOLD) + elif fd_percent >= 90: + percentage_format = (RED,) + elif fd_percent >= 60: + percentage_format = (YELLOW,) + else: + percentage_format = () + + x = subwindow.addstr(x, y, ', file descriptors' if space_left >= 37 else ', file desc') + x = subwindow.addstr(x, y, vals.format(': {fd_used} / {fd_limit} (')) + x = subwindow.addstr(x, y, '%i%%' % fd_percent, *percentage_format) + subwindow.addstr(x, y, ')') diff --git a/test/panel/header.py b/test/panel/header.py index 3828804..0d80f0f 100644 --- a/test/panel/header.py +++ b/test/panel/header.py @@ -31,7 +31,7 @@ class TestHeader(unittest.TestCase): 30: 'nyx - odin (Linux 3.5.0-54...)', 20: 'nyx - odin (Linu...)', 10: 'nyx - odin', - 0: 'nyx - odin', + 0: '', } for width, expected in test_input.items(): @@ -112,3 +112,47 @@ class TestHeader(unittest.TestCase): for width, expected in test_input.items(): self.assertEqual(expected, test.render(nyx.panel.header._draw_resource_usage, 0, 0, width, vals, None).content) + + @require_curses + def test_draw_fingerprint_and_fd_usage(self): + vals = nyx.panel.header._sampling( + fingerprint = '1A94D1A794FCB2F8B6CBC179EF8FDD4008A98D3B', + fd_used = None, + ) + + test_input = { + 80: 'fingerprint: 1A94D1A794FCB2F8B6CBC179EF8FDD4008A98D3B', + 70: 'fingerprint: 1A94D1A794FCB2F8B6CBC179EF8FDD4008A98D3B', + 60: 'fingerprint: 1A94D1A794FCB2F8B6CBC179EF8FDD4008A98D3B', + 50: 'fingerprint: 1A94D1A794FCB2F8B6CBC179EF8FDD4008...', + 40: 'fingerprint: 1A94D1A794FCB2F8B6CBC179...', + 30: 'fingerprint: 1A94D1A794FCB2...', + 20: 'fingerprint: 1A94...', + 10: 'fingerp...', + 0: '', + } + + for width, expected in test_input.items(): + self.assertEqual(expected, test.render(nyx.panel.header._draw_fingerprint_and_fd_usage, 0, 0, width, vals).content) + + @require_curses + def test_draw_fingerprint_and_fd_usage_with_fd_count(self): + test_input = { + 59: 'fingerprint: <stub>', + 60: 'fingerprint: <stub>, file descriptors: 60 / 100 (60%)', + 75: 'fingerprint: <stub>, file descriptors: 75 / 100 (75%)', + 89: 'fingerprint: <stub>, file descriptors: 89 / 100 (89%)', + 90: 'fingerprint: <stub>, file descriptors: 90 / 100 (90%)', + 95: 'fingerprint: <stub>, file descriptors: 95 / 100 (95%)', + 99: 'fingerprint: <stub>, file descriptors: 99 / 100 (99%)', + 100: 'fingerprint: <stub>, file descriptors: 100 / 100 (100%)', + } + + for fd_used, expected in test_input.items(): + vals = nyx.panel.header._sampling( + fingerprint = '<stub>', + fd_used = fd_used, + fd_limit = 100, + ) + + self.assertEqual(expected, test.render(nyx.panel.header._draw_fingerprint_and_fd_usage, 0, 0, 80, vals).content)

1 0

[nyx/master] Account for subcommands in nyx cpu usage
by atagar＠torproject.org 18 Apr '16

18 Apr '16

commit 3148caa37ba406610ddb0187468107205581c105 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Apr 13 10:10:04 2016 -0700 Account for subcommands in nyx cpu usage Shelling out to other commands isn't accounted for in os.times(). As such wrapping stem's call() function so shelling out is accounted for in the nyx cpu usage we show. --- nyx/panel/header.py | 53 ++++++++++++++++++++++++++++++++++++---------------- test/panel/header.py | 13 ++++++++++--- 2 files changed, 47 insertions(+), 19 deletions(-) diff --git a/nyx/panel/header.py b/nyx/panel/header.py index 998a20d..f29d232 100644 --- a/nyx/panel/header.py +++ b/nyx/panel/header.py @@ -12,14 +12,17 @@ import time import threading import stem +import stem.control +import stem.util.proc +import stem.util.str_tools +import stem.util.system import nyx.controller import nyx.panel import nyx.popups import nyx.tracker -from stem.control import Listener, State -from stem.util import conf, log, proc, str_tools, system +from stem.util import conf, log from nyx import msg, tor_controller from nyx.curses import RED, GREEN, YELLOW, CYAN, WHITE, BOLD, HIGHLIGHT @@ -28,6 +31,13 @@ MIN_DUAL_COL_WIDTH = 141 # minimum width where we'll show two columns SHOW_FD_THRESHOLD = 60 # show file descriptor usage if usage is over this percentage UPDATE_RATE = 5 # rate in seconds at which we refresh +# Tracks total time spent shelling out to other commands like 'ps' and +# 'netstat', so we can account for it as part of our cpu time. + +SYSTEM_CALL_TIME = 0.0 +SYSTEM_CALL_TIME_LOCK = threading.RLock() +SYSTEM_CALL_ORIG = stem.util.system.call + CONFIG = conf.config_dict('nyx', { 'attr.flag_colors': {}, 'attr.version_status_colors': {}, @@ -35,6 +45,21 @@ CONFIG = conf.config_dict('nyx', { }) +def call_wrapper(*args, **kwargs): + global SYSTEM_CALL_TIME + + start_time = time.time() + + try: + return SYSTEM_CALL_ORIG(*args, **kwargs) + finally: + with SYSTEM_CALL_TIME_LOCK: + SYSTEM_CALL_TIME += time.time() - start_time + + +stem.util.system.call = call_wrapper + + class HeaderPanel(nyx.panel.Panel, threading.Thread): """ Top area containing tor settings and system information. @@ -232,7 +257,7 @@ class HeaderPanel(nyx.panel.Panel, threading.Thread): def reset_listener(self, controller, event_type, _): self._update() - if event_type == State.CLOSED: + if event_type == stem.control.State.CLOSED: log.notice('Tor control port closed') def _update(self): @@ -282,10 +307,10 @@ class Sampling(object): pid = controller.get_pid('') tor_resources = nyx.tracker.get_resource_tracker().get_value() - nyx_total_cpu_time = sum(os.times()[:3]) + nyx_total_cpu_time = sum(os.times()[:3], SYSTEM_CALL_TIME) - or_listeners = controller.get_listeners(Listener.OR, []) - control_listeners = controller.get_listeners(Listener.CONTROL, []) + or_listeners = controller.get_listeners(stem.control.Listener.OR, []) + control_listeners = controller.get_listeners(stem.control.Listener.CONTROL, []) if controller.get_conf('HashedControlPassword', None): auth_type = 'password' @@ -295,18 +320,14 @@ class Sampling(object): auth_type = 'open' try: - fd_used = proc.file_descriptors_used(pid) + fd_used = stem.util.proc.file_descriptors_used(pid) except IOError: fd_used = None if last_sampling: nyx_cpu_delta = nyx_total_cpu_time - last_sampling.nyx_total_cpu_time nyx_time_delta = retrieved - last_sampling.retrieved - - python_cpu_time = nyx_cpu_delta / nyx_time_delta - sys_call_cpu_time = 0.0 # TODO: add a wrapper around call() to get this - - nyx_cpu = python_cpu_time + sys_call_cpu_time + nyx_cpu = nyx_cpu_delta / nyx_time_delta else: nyx_cpu = 0.0 @@ -334,14 +355,14 @@ class Sampling(object): 'auth_type': auth_type, 'pid': pid, - 'start_time': system.start_time(pid), + 'start_time': stem.util.system.start_time(pid), 'fd_limit': int(controller.get_info('process/descriptor-limit', '-1')), 'fd_used': fd_used, 'nyx_total_cpu_time': nyx_total_cpu_time, 'tor_cpu': '%0.1f' % (100 * tor_resources.cpu_sample), 'nyx_cpu': '%0.1f' % (nyx_cpu), - 'memory': str_tools.size_label(tor_resources.memory_bytes) if tor_resources.memory_bytes > 0 else 0, + 'memory': stem.util.str_tools.size_label(tor_resources.memory_bytes) if tor_resources.memory_bytes > 0 else 0, 'memory_percent': '%0.1f' % (100 * tor_resources.memory_percent), 'hostname': os.uname()[1], @@ -354,7 +375,7 @@ class Sampling(object): formatted_msg = message.format(**self._attr) if crop_width is not None: - formatted_msg = str_tools.crop(formatted_msg, crop_width) + formatted_msg = stem.util.str_tools.crop(formatted_msg, crop_width) return formatted_msg @@ -444,7 +465,7 @@ def _draw_resource_usage(subwindow, x, y, width, vals, pause_time): else: now = time.time() - uptime = str_tools.short_time_label(now - vals.start_time) + uptime = stem.util.str_tools.short_time_label(now - vals.start_time) else: uptime = '' diff --git a/test/panel/header.py b/test/panel/header.py index 7ea2510..6e0f275 100644 --- a/test/panel/header.py +++ b/test/panel/header.py @@ -5,10 +5,12 @@ Unit tests for nyx.panel.header. import time import unittest -import nyx.panel.header import stem.control import stem.exit_policy import stem.version +import stem.util.system + +import nyx.panel.header import test from test import require_curses @@ -16,13 +18,18 @@ from mock import patch, Mock class TestHeader(unittest.TestCase): + def test_system_call_time_tracked(self): + initial = nyx.panel.header.SYSTEM_CALL_TIME + stem.util.system.call('sleep 0.5') + self.assertTrue(nyx.panel.header.SYSTEM_CALL_TIME - initial > 0.4) + @patch('nyx.panel.header.tor_controller') @patch('nyx.tracker.get_resource_tracker') @patch('time.time', Mock(return_value = 1234.5)) @patch('os.times', Mock(return_value = (0.08, 0.03, 0.0, 0.0, 18759021.31))) @patch('os.uname', Mock(return_value = ('Linux', 'odin', '3.5.0-54-generic', '#81~precise1-Ubuntu SMP Tue Jul 15 04:05:58 UTC 2014', 'i686'))) - @patch('nyx.panel.header.system.start_time', Mock(return_value = 5678)) - @patch('nyx.panel.header.proc.file_descriptors_used', Mock(return_value = 89)) + @patch('stem.util.system.start_time', Mock(return_value = 5678)) + @patch('stem.util.proc.file_descriptors_used', Mock(return_value = 89)) def test_sample(self, resource_tracker_mock, tor_controller_mock): tor_controller_mock().is_alive.return_value = True tor_controller_mock().connection_time.return_value = 567.8

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits April 2016