February 2016 - tor-commits - lists.torproject.org

[tor/master] Properly detach circuits from cmuxes when calling circuit_free_all() on shutdown again
by nickm＠torproject.org 10 Feb '16

10 Feb '16

commit ae0f858602739abbe17277860c060ecc70aa3003 Author: Andrea Shepard <andrea(a)torproject.org> Date: Wed Feb 10 05:35:03 2016 +0000 Properly detach circuits from cmuxes when calling circuit_free_all() on shutdown again --- changes/bug18116 | 3 +++ src/or/circuitlist.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/changes/bug18116 b/changes/bug18116 new file mode 100644 index 0000000..23ff8f7 --- /dev/null +++ b/changes/bug18116 @@ -0,0 +1,3 @@ + o Major bugfixes: + - Correctly handle detaching circuits from cmuxes when doing + circuit_free_all() on shutdown again; fixes bug #18116. diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index dcbeb1e..9b7df75 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -53,6 +53,7 @@ static void cpath_ref_decref(crypt_path_reference_t *cpath_ref); //static void circuit_set_rend_token(or_circuit_t *circ, int is_rend_circ, // const uint8_t *token); static void circuit_clear_rend_token(or_circuit_t *circ); +static void circuit_about_to_free_terminal(circuit_t *circ); static void circuit_about_to_free(circuit_t *circ); /********* END VARIABLES ************/ @@ -901,6 +902,7 @@ circuit_free_all(void) } } tmp->global_circuitlist_idx = -1; + circuit_about_to_free_terminal(tmp); circuit_free(tmp); SMARTLIST_DEL_CURRENT(lst, tmp); } SMARTLIST_FOREACH_END(tmp); @@ -1744,6 +1746,32 @@ circuit_mark_for_close_, (circuit_t *circ, int reason, int line, smartlist_add(circuits_pending_close, circ); } +/** Called immediately before freeing a marked circuit <b>circ</b> from + * circuit_free_all() while shutting down Tor; this is a safe-at-shutdown + * version of circuit_about_to_free(). It's important that it at least + * do circuitmux_detach_circuit() when appropriate. + */ +static void +circuit_about_to_free_terminal(circuit_t *circ) +{ + + if (circ->n_chan) { + circuit_clear_cell_queue(circ, circ->n_chan); + circuitmux_detach_circuit(circ->n_chan->cmux, circ); + circuit_set_n_circid_chan(circ, 0, NULL); + } + + if (! CIRCUIT_IS_ORIGIN(circ)) { + or_circuit_t *or_circ = TO_OR_CIRCUIT(circ); + + if (or_circ->p_chan) { + circuit_clear_cell_queue(circ, or_circ->p_chan); + circuitmux_detach_circuit(or_circ->p_chan->cmux, circ); + circuit_set_p_circid_chan(or_circ, 0, NULL); + } + } +} + /** Called immediately before freeing a marked circuit <b>circ</b>. * Disconnects the circuit from other data structures, launches events * as appropriate, and performs other housekeeping.

1 0

[tor/master] Merge remote-tracking branch 'andrea/bug18116'
by nickm＠torproject.org 10 Feb '16

10 Feb '16

commit ee75c02691888a0cb7ee34e4f18436c523f92f0d Merge: 69c47ab ae0f858 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 10 15:42:11 2016 -0500 Merge remote-tracking branch 'andrea/bug18116' changes/bug18116 | 3 +++ src/or/circuitlist.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+)

1 0

[tor/master] Make the no-assertions-during-coverage check into a configure option
by nickm＠torproject.org 10 Feb '16

10 Feb '16

commit af116081f9d30d0830dc3c099c9c87f37b07d1f0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 4 12:51:52 2016 -0500 Make the no-assertions-during-coverage check into a configure option Closes ticket 18242. The rationale here is that I like having coverage on by default in my own working directory, but I always want assertions turned on unless I'm doing branch coverage specifically. --- configure.ac | 2 ++ src/common/util.h | 7 ++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 1a78f41..d92f1e6 100644 --- a/configure.ac +++ b/configure.ac @@ -41,6 +41,8 @@ AC_ARG_ENABLE(unittests, AS_HELP_STRING(--disable-unittests, [don't build unit tests for Tor. Risky!])) AC_ARG_ENABLE(coverage, AS_HELP_STRING(--enable-coverage, [enable coverage support in the unit-test build])) +AC_ARG_ENABLE(asserts-in-tests, + AS_HELP_STRING(--disable-asserts-in-tests, [disable tor_assert() calls in the unit tests, for branch coverage])) AC_ARG_ENABLE(system-torrc, AS_HELP_STRING(--disable-system-torrc, [don't look for a system-wide torrc file])) diff --git a/src/common/util.h b/src/common/util.h index 165bc0d..d05ffa7 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -45,9 +45,10 @@ #error "Sorry; we don't support building with NDEBUG." #endif -/* Don't use assertions during coverage. It leads to tons of unreached - * branches which in reality are only assertions we didn't hit. */ -#ifdef TOR_COVERAGE +/* Sometimes we don't want to use assertions during branch coverage tests; it + * leads to tons of unreached branches which in reality are only assertions we + * didn't hit. */ +#if defined(TOR_UNIT_TESTS) && defined(DISABLE_ASSERTS_IN_UNIT_TESTS) #define tor_assert(a) STMT_BEGIN \ (void)(a); \ STMT_END

1 0

[tor/master] whoops, add a changes file for 18242.
by nickm＠torproject.org 10 Feb '16

10 Feb '16

commit 5d63cbf7f94d7747c00f6bf30a4094d13dc92332 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 4 12:54:54 2016 -0500 whoops, add a changes file for 18242. --- changes/bug18242 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/changes/bug18242 b/changes/bug18242 new file mode 100644 index 0000000..e91f6d5 --- /dev/null +++ b/changes/bug18242 @@ -0,0 +1,6 @@ + o Minor bugfixes (testing): + - We no longer disable assertions in the unit tests when coverage + is enabled. Instead, we require you to say --disable-asserts-in-tests + to the configure script if you need assertions disabled in the + unit tests (for example, if you want to perform branch coverage). + Fixes bug 18242; bugfix on 0.2.7.1-alpha.

1 0

[tor/master] Fix the --disable-asserts-in-tests configure option
by nickm＠torproject.org 10 Feb '16

10 Feb '16

commit 55d6fd27cbe6f058a1f444f47f05c7b64891655e Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Feb 5 14:40:07 2016 +0100 Fix the --disable-asserts-in-tests configure option --- Makefile.am | 4 ++++ configure.ac | 6 ++++++ src/test/test_rendcache.c | 4 ++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index fc9f7b2..1333f36 100644 --- a/Makefile.am +++ b/Makefile.am @@ -42,7 +42,11 @@ EXTRA_DIST+= \ if COVERAGE_ENABLED TEST_CFLAGS=-fno-inline -fprofile-arcs -ftest-coverage +if DISABLE_ASSERTS_IN_UNIT_TESTS +TEST_CPPFLAGS=-DTOR_UNIT_TESTS -DTOR_COVERAGE -DDISABLE_ASSERTS_IN_UNIT_TESTS +else TEST_CPPFLAGS=-DTOR_UNIT_TESTS -DTOR_COVERAGE +endif TEST_NETWORK_FLAGS=--coverage --hs-multi-client 1 else TEST_CFLAGS= diff --git a/configure.ac b/configure.ac index d92f1e6..25d63c9 100644 --- a/configure.ac +++ b/configure.ac @@ -46,8 +46,14 @@ AC_ARG_ENABLE(asserts-in-tests, AC_ARG_ENABLE(system-torrc, AS_HELP_STRING(--disable-system-torrc, [don't look for a system-wide torrc file])) +if test x$enable_coverage != xyes -a x$enable_asserts_in_tests = xno ; then + AC_MSG_ERROR([Can't disable assertions outside of coverage build]) +fi + + AM_CONDITIONAL(UNITTESTS_ENABLED, test x$enable_unittests != xno) AM_CONDITIONAL(COVERAGE_ENABLED, test x$enable_coverage = xyes) +AM_CONDITIONAL(DISABLE_ASSERTS_IN_UNIT_TESTS, test x$enable_asserts_in_tests = xno) if test "$enable_static_tor" = "yes"; then enable_static_libevent="yes"; diff --git a/src/test/test_rendcache.c b/src/test/test_rendcache.c index 7779699..7e04799 100644 --- a/src/test/test_rendcache.c +++ b/src/test/test_rendcache.c @@ -128,8 +128,8 @@ test_rend_cache_store_v2_desc_as_client(void *data) // Test bad base32 failure // This causes an assertion failure if we're running with assertions. - // But when doing coverage, we can test it. -#ifdef TOR_COVERAGE + // But when building without asserts, we can test it. +#ifdef DISABLE_ASSERTS_IN_UNIT_TESTS ret = rend_cache_store_v2_desc_as_client(desc_holder->desc_str, "!xqunszqnaolrrfmtzgaki7mxelgvkj", mock_rend_query, NULL); tt_int_op(ret, OP_EQ, RCS_BADDESC);

1 0

[tor/master] Merge remote-tracking branch 'sebastian/bug18242'
by nickm＠torproject.org 10 Feb '16

10 Feb '16

commit 69c47ab5fd608ecd47ddd3c1d2f041a2b41791b5 Merge: 4dc8dc4 55d6fd2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 10 15:38:52 2016 -0500 Merge remote-tracking branch 'sebastian/bug18242' Makefile.am | 4 ++++ changes/bug18242 | 6 ++++++ configure.ac | 8 ++++++++ src/common/util.h | 7 ++++--- src/test/test_rendcache.c | 4 ++-- 5 files changed, 24 insertions(+), 5 deletions(-)

1 0

[tor/master] Remove support for unsigned time_t
by nickm＠torproject.org 10 Feb '16

10 Feb '16

commit 5f7df92571ec5a2d1eddb257e22f5489acc4fc83 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jan 29 09:18:59 2016 -0500 Remove support for unsigned time_t We've never actually tested this support, and we should probably assume it's broken. To the best of my knowledge, only OpenVMS has this, and even on OpenVMS it's a compile-time option to disable it. And I don't think we build on openvms anyway. (Everybody else seems to be working around the 2038 problem by using a 64-bit time_t, which won't expire for roughly 292 billion years.) Closes ticket 18184. --- changes/bug18184 | 5 +++++ configure.ac | 4 ++-- src/common/torint.h | 28 ++-------------------------- src/test/test_dir.c | 2 -- src/win32/orconfig.h | 3 --- 5 files changed, 9 insertions(+), 33 deletions(-) diff --git a/changes/bug18184 b/changes/bug18184 new file mode 100644 index 0000000..af493df --- /dev/null +++ b/changes/bug18184 @@ -0,0 +1,5 @@ + o Removed platform support: + - Tor no longer attempts to support platforms where the "time_t" type + is unsigned. (To the best of our knowledge, only OpenVMS does this, + and Tor has never actually built on OpenVMS.) Closes ticket 18184. + diff --git a/configure.ac b/configure.ac index 6d2312d..de7221d 100644 --- a/configure.ac +++ b/configure.ac @@ -1176,7 +1176,7 @@ AC_CHECK_TYPES([rlim_t], , , ]) AX_CHECK_SIGN([time_t], - [ AC_DEFINE(TIME_T_IS_SIGNED, 1, [Define if time_t is signed]) ], + [ : ], [ : ], [ #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> @@ -1190,7 +1190,7 @@ AX_CHECK_SIGN([time_t], ]) if test "$ax_cv_decl_time_t_signed" = no; then - AC_MSG_WARN([You have an unsigned time_t; some things will probably break. Please tell the Tor developers about your interesting platform.]) + AC_MSG_ERROR([You have an unsigned time_t; Tor does not support that. Please tell the Tor developers about your interesting platform.]) fi AX_CHECK_SIGN([size_t], diff --git a/src/common/torint.h b/src/common/torint.h index 418fe0f..480ba1a 100644 --- a/src/common/torint.h +++ b/src/common/torint.h @@ -312,8 +312,6 @@ typedef uint32_t uintptr_t; #ifndef TIME_MAX -#ifdef TIME_T_IS_SIGNED - #if (SIZEOF_TIME_T == SIZEOF_INT) #define TIME_MAX ((time_t)INT_MAX) #elif (SIZEOF_TIME_T == SIZEOF_LONG) @@ -321,25 +319,13 @@ typedef uint32_t uintptr_t; #elif (SIZEOF_TIME_T == 8) #define TIME_MAX ((time_t)INT64_MAX) #else -#error "Can't define (signed) TIME_MAX" +#error "Can't define TIME_MAX" #endif -#else -/* Unsigned case */ -#if (SIZEOF_TIME_T == 4) -#define TIME_MAX ((time_t)UINT32_MAX) -#elif (SIZEOF_TIME_T == 8) -#define TIME_MAX ((time_t)UINT64_MAX) -#else -#error "Can't define (unsigned) TIME_MAX" -#endif -#endif /* time_t_is_signed */ #endif /* ifndef(TIME_MAX) */ #ifndef TIME_MIN -#ifdef TIME_T_IS_SIGNED - #if (SIZEOF_TIME_T == SIZEOF_INT) #define TIME_MIN ((time_t)INT_MIN) #elif (SIZEOF_TIME_T == SIZEOF_LONG) @@ -347,19 +333,9 @@ typedef uint32_t uintptr_t; #elif (SIZEOF_TIME_T == 8) #define TIME_MIN ((time_t)INT64_MIN) #else -#error "Can't define (signed) TIME_MIN" +#error "Can't define TIME_MIN" #endif -#else -/* Unsigned case */ -#if (SIZEOF_TIME_T == 4) -#define TIME_MIN ((time_t)UINT32_MIN) -#elif (SIZEOF_TIME_T == 8) -#define TIME_MIN ((time_t)UINT64_MIN) -#else -#error "Can't define (unsigned) TIME_MIN" -#endif -#endif /* time_t_is_signed */ #endif /* ifndef(TIME_MIN) */ #ifndef SIZE_MAX diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 4824a94..83a8b8c 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -3312,7 +3312,6 @@ test_dir_download_status_schedule(void *arg) tt_assert(increment == expected_increment); tt_assert(dls_failure.next_attempt_at == TIME_MIN + expected_increment); -#if TIME_T_IS_SIGNED delay1 = INT_MAX; increment = download_status_schedule_get_delay(&dls_failure, schedule, @@ -3320,7 +3319,6 @@ test_dir_download_status_schedule(void *arg) expected_increment = delay1; tt_assert(increment == expected_increment); tt_assert(dls_failure.next_attempt_at == TIME_MAX); -#endif delay1 = 0; increment = download_status_schedule_get_delay(&dls_attempt, diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index c0b14e5..f381152 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -220,9 +220,6 @@ /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS -/* Define to 1 if time_t is signed. */ -#define TIME_T_IS_SIGNED - /* Define to 1 iff unaligned int access is allowed */ #define UNALIGNED_INT_ACCESS_OK

1 0

[tor/master] Merge remote-tracking branch 'public/bug18184'
by nickm＠torproject.org 10 Feb '16

10 Feb '16

commit 4dc8dc4b89259e1418cd984abe1cd8d8fc6a7496 Merge: 2123f0a 5f7df92 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 10 15:36:48 2016 -0500 Merge remote-tracking branch 'public/bug18184' changes/bug18184 | 5 +++++ configure.ac | 4 ++-- src/common/torint.h | 28 ++-------------------------- src/test/test_dir.c | 2 -- src/win32/orconfig.h | 3 --- 5 files changed, 9 insertions(+), 33 deletions(-)

1 0

[tor/master] Make the callgraph module-aware
by nickm＠torproject.org 10 Feb '16

10 Feb '16

commit 2123f0a2f932f991a5209358a3aae183700c71ab Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 10 15:08:50 2016 -0500 Make the callgraph module-aware --- scripts/maint/analyze_callgraph.py | 50 ++++++++++++++++++++++++++++++++++---- scripts/maint/display_callgraph.py | 2 ++ 2 files changed, 47 insertions(+), 5 deletions(-) diff --git a/scripts/maint/analyze_callgraph.py b/scripts/maint/analyze_callgraph.py index b284604..8ce5827 100755 --- a/scripts/maint/analyze_callgraph.py +++ b/scripts/maint/analyze_callgraph.py @@ -9,19 +9,28 @@ import os class Parser: def __init__(self): self.calls = {} + self.definedIn = {} def enter_func(self, name): - if self.infunc and not self.extern: + if self.infunc and not self.extern and self.calledfns: + if self.infunc in self.definedIn: + #print "{}: {} or {}?".format( + # self.infunc, self.definedIn[self.infunc], self.module) + self.definedIn[self.infunc] = 'nil' + else: + self.definedIn[self.infunc] = self.module self.calls.setdefault(self.infunc, set()).update( self.calledfns ) self.calledfns = set() self.infunc = name self.extern = False - def parse_callgraph_file(self, inp): + def parse_callgraph_file(self, inp, module): self.infunc = None self.extern = False self.calledfns = set() + self.module = module + for line in inp: m = re.match(r"Call graph node for function: '([^']+)'", line) if m: @@ -189,13 +198,27 @@ def connection_bottlenecks(callgraph): if __name__ == '__main__': p = Parser() for fname in sys.argv[1:]: + modname = re.sub(r'.*/', '', fname).replace('.callgraph', '.c') with open(fname, 'r') as f: - p.parse_callgraph_file(f) + p.parse_callgraph_file(f, modname) - sys.stdout.flush + sys.stdout.flush() print "Building callgraph" callgraph = p.extract_callgraph() + inModule = p.definedIn + + print "Deriving module callgraph" + modCallgraph = {} + for fn in callgraph: + fnMod = inModule[fn] + for called in callgraph[fn]: + try: + calledMod = inModule[called] + except KeyError: + continue + modCallgraph.setdefault(fnMod, set()).add(calledMod) + del modCallgraph['nil'] print "Finding strongly connected components" sccs = strongly_connected_components(callgraph) @@ -206,11 +229,28 @@ if __name__ == '__main__': print "Finding bottlenecks..." bottlenecks = connection_bottlenecks(callgraph) + print "Finding module SCCs" + modSCCS = strongly_connected_components(modCallgraph) + + print "Finding module TC" + modTC = transitive_closure(modCallgraph) + + print "Finding module bottlenecks" + modB = connection_bottlenecks(modCallgraph) + data = { 'callgraph' : callgraph, 'sccs' : sccs, 'closure' : closure, - 'bottlenecks' : bottlenecks } + 'bottlenecks' : bottlenecks, + 'modules' : p.definedIn, + 'modItems' : { + 'callgraph' : modCallgraph, + 'sccs' : modSCCS, + 'closure' : modTC, + 'bottlenecks' : modB, + } + } with open('callgraph.pkl', 'w') as f: cPickle.dump(data, f) diff --git a/scripts/maint/display_callgraph.py b/scripts/maint/display_callgraph.py index 211bfda..c9001c6 100755 --- a/scripts/maint/display_callgraph.py +++ b/scripts/maint/display_callgraph.py @@ -4,6 +4,8 @@ import cPickle data = cPickle.load(open("callgraph.pkl")) +# data = data['modItems'] + callgraph = data['callgraph'] closure = data['closure'] sccs = data['sccs']

1 0

[translation/tor-messenger-prefsdtd] Update translations for tor-messenger-prefsdtd
by translation＠torproject.org 10 Feb '16

10 Feb '16

commit 632cb9e07e91293d4b6cc87cde9475d53225f4db Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 10 18:16:45 2016 +0000 Update translations for tor-messenger-prefsdtd --- eu/prefs.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eu/prefs.dtd b/eu/prefs.dtd index 1441b0e..f2153e7 100644 --- a/eu/prefs.dtd +++ b/eu/prefs.dtd @@ -1,4 +1,4 @@ -<!ENTITY prefs.otrPreferences "OTR Preferences"> +<!ENTITY prefs.otrPreferences "OTR-hobespenak"> <!ENTITY prefs.otrSettings "OTR Settings"> <!ENTITY prefs.requireEncryption "Require encryption"> <!ENTITY prefs.otrKeys "My Private Keys">

1 0