tor-commits June 2012

tor-commits@lists.torproject.org

17 participants
880 discussions

[tor/master] Fix a warning when using glibc's strcspn with clang.
by nickm＠torproject.org 26 Jun '12

26 Jun '12

commit 5fad3dc36b3aad7f2ea13e56d838c3eb37fb029d Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 26 10:55:23 2012 -0400 Fix a warning when using glibc's strcspn with clang. With glibc 2.15 and clang 3.0, I get warnings from where we use the strcpsn implementation in the header as strcspn(string, "="). This is apparently because clang sees that part of the strcspn macro expands to "="[2], and doesn't realize that that part of the macro is only evaluated when "="[1] != 0. --- changes/clang_strcspn | 3 +++ src/common/util.c | 19 ++++++++++++++++--- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/changes/clang_strcspn b/changes/clang_strcspn new file mode 100644 index 0000000..38670ac --- /dev/null +++ b/changes/clang_strcspn @@ -0,0 +1,3 @@ + o Minor bugfixes: + - Avoid a warning caused by using strcspn from glibc with clang 3.0. + Bugfix on 0.2.3.13-alpha. diff --git a/src/common/util.c b/src/common/util.c index d94dcf2..51d9321 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -3887,13 +3887,26 @@ tor_get_exit_code(const process_handle_t *process_handle, return PROCESS_EXIT_EXITED; } +/** Helper: return the number of characters in s preceding the first + * occurence of ch. If ch does not occur in s, return + * the length of s. Should be equivalent to strspn(s, "ch"). */ +static INLINE size_t +str_num_before(const char *s, char ch) +{ + const char *cp = strchr(s, ch); + if (cp) + return cp - s; + else + return strlen(s); +} + /** Return non-zero iff getenv would consider s1 and s2 * to have the same name as strings in a process's environment. */ int environment_variable_names_equal(const char *s1, const char *s2) { - size_t s1_name_len = strcspn(s1, "="); - size_t s2_name_len = strcspn(s2, "="); + size_t s1_name_len = str_num_before(s1, '='); + size_t s2_name_len = str_num_before(s2, '='); return (s1_name_len == s2_name_len && tor_memeq(s1, s2, s1_name_len)); @@ -3968,7 +3981,7 @@ process_environment_make(struct smartlist_t *env_vars) for (i = 0; i < n_env_vars; ++i) { const char *s = smartlist_get(env_vars_sorted, i); size_t slen = strlen(s); - size_t s_name_len = strcspn(s, "="); + size_t s_name_len = str_num_before(s, '='); if (s_name_len == slen) { log_warn(LD_GENERAL,

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.3'
by nickm＠torproject.org 26 Jun '12

26 Jun '12

commit 05dd0a9cd9055f0d7cc847ea0c9b5181b9c20057 Merge: 4050800 5fad3dc Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 26 11:03:32 2012 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' changes/clang_strcspn | 3 +++ changes/envvar_test | 2 ++ src/common/util.c | 21 +++++++++++++++++---- src/test/test_util.c | 34 ++++++++++++++++++++++++++++++++++ 4 files changed, 56 insertions(+), 4 deletions(-)

1 0

[tor/maint-0.2.3] Add a unit test for environment_variable_names_equal
by nickm＠torproject.org 26 Jun '12

26 Jun '12

commit 9c8ec0aa20cda1787ee27a96e666af84f1081f5b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 26 10:50:37 2012 -0400 Add a unit test for environment_variable_names_equal I need this because I'm about to frob that function to stop using strcspn() in order to get rid of a clang warning. --- changes/envvar_test | 2 ++ src/test/test_util.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 0 deletions(-) diff --git a/changes/envvar_test b/changes/envvar_test new file mode 100644 index 0000000..d76a817 --- /dev/null +++ b/changes/envvar_test @@ -0,0 +1,2 @@ + o New unit tests: + - Add a unit test for the environment_variable_names_equal function. \ No newline at end of file diff --git a/src/test/test_util.c b/src/test/test_util.c index fab9595..d2d0a55 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -2869,6 +2869,39 @@ test_util_sl_new_from_text_lines(void *ptr) } } +static void +test_util_envnames(void *ptr) +{ + (void) ptr; + + tt_assert(environment_variable_names_equal("abc", "abc")); + tt_assert(environment_variable_names_equal("abc", "abc=")); + tt_assert(environment_variable_names_equal("abc", "abc=def")); + tt_assert(environment_variable_names_equal("abc=def", "abc")); + tt_assert(environment_variable_names_equal("abc=def", "abc=ghi")); + + tt_assert(environment_variable_names_equal("abc", "abc")); + tt_assert(environment_variable_names_equal("abc", "abc=")); + tt_assert(environment_variable_names_equal("abc", "abc=def")); + tt_assert(environment_variable_names_equal("abc=def", "abc")); + tt_assert(environment_variable_names_equal("abc=def", "abc=ghi")); + + tt_assert(!environment_variable_names_equal("abc", "abcd")); + tt_assert(!environment_variable_names_equal("abc=", "abcd")); + tt_assert(!environment_variable_names_equal("abc=", "abcd")); + tt_assert(!environment_variable_names_equal("abc=", "def")); + tt_assert(!environment_variable_names_equal("abc=", "def=")); + tt_assert(!environment_variable_names_equal("abc=x", "def=x")); + + tt_assert(!environment_variable_names_equal("", "a=def")); + /* A bit surprising. */ + tt_assert(environment_variable_names_equal("", "=def")); + tt_assert(environment_variable_names_equal("=y", "=x")); + + done: + ; +} + /** Test process_environment_make */ static void test_util_make_environment(void *ptr) @@ -3081,6 +3114,7 @@ struct testcase_t util_tests[] = { UTIL_TEST(n_bits_set, 0), UTIL_TEST(eat_whitespace, 0), UTIL_TEST(sl_new_from_text_lines, 0), + UTIL_TEST(envnames, 0), UTIL_TEST(make_environment, 0), UTIL_TEST(set_env_var_in_sl, 0), END_OF_TESTCASES

1 0

[tor/maint-0.2.3] Fix a compilation warning with clang 3.0
by nickm＠torproject.org 26 Jun '12

26 Jun '12

commit 201b852c277bdf4bf70a656871d502318bd5b25b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 26 10:48:31 2012 -0400 Fix a compilation warning with clang 3.0 In b1ad1a1d0266a20bb we introduced an implicit (but safe) long-to-int shortening that clang didn't like. Warning not in any released version of Tor. --- src/common/util.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index e5b51b9..d94dcf2 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -3347,7 +3347,7 @@ format_helper_exit_status(unsigned char child_state, int saved_errno, *cur++ = '\n'; *cur++ = '\0'; - res = cur - hex_errno - 1; + res = (int)(cur - hex_errno - 1); goto done;

1 0

[tor/maint-0.2.3] Fix a warning when using glibc's strcspn with clang.
by nickm＠torproject.org 26 Jun '12

26 Jun '12

1 0

[tor/master] Downgrade message about md cache cleaning from notice to info
by nickm＠torproject.org 26 Jun '12

26 Jun '12

commit c4586f4df7b7b403867baab03508ccc2f078a0ec Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 26 10:30:11 2012 -0400 Downgrade message about md cache cleaning from notice to info Fix for #6238 --- changes/bug6238 | 3 +++ src/or/microdesc.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/changes/bug6238 b/changes/bug6238 new file mode 100644 index 0000000..67cfd1d --- /dev/null +++ b/changes/bug6238 @@ -0,0 +1,3 @@ + o Minor bugfixes: + - Downgrade a message about cleaning the microdescriptor cache to + "info" from "notice". Fixes bug 6238; bugfix on 0.2.3.1-alpha. diff --git a/src/or/microdesc.c b/src/or/microdesc.c index 42e8605..9395a9a 100644 --- a/src/or/microdesc.c +++ b/src/or/microdesc.c @@ -373,8 +373,8 @@ microdesc_cache_clean(microdesc_cache_t *cache, time_t cutoff, int force) } if (dropped) { - log_notice(LD_DIR, "Removed %d/%d microdescriptors as old.", - dropped,dropped+kept); + log_info(LD_DIR, "Removed %d/%d microdescriptors as old.", + dropped,dropped+kept); cache->bytes_dropped += bytes_dropped; } }

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.3'
by nickm＠torproject.org 26 Jun '12

26 Jun '12

commit 4050800251c77d4fc059c51a268abe02c3d4e9a0 Merge: 7c9f6a9 c4586f4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 26 10:30:51 2012 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' changes/bug6238 | 3 +++ src/or/microdesc.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.2.3] Downgrade message about md cache cleaning from notice to info
by nickm＠torproject.org 26 Jun '12

26 Jun '12

1 0

[vidalia/alpha] Merge remote-tracking branch 'sirop/bug6130_countries_list' into alpha
by chiiph＠torproject.org 25 Jun '12

25 Jun '12

commit 57cd5e842e4df053494c04e06163fc0fc635f689 Merge: f853d07 78b41ae Author: Tomás Touceda <chiiph(a)torproject.org> Date: Mon Jun 25 20:15:42 2012 -0300 Merge remote-tracking branch 'sirop/bug6130_countries_list' into alpha changes/bug6130 | 3 + src/vidalia/network/CountryInfo.cpp | 285 +++++++++++-------- src/vidalia/res/country-coordinates.csv | 495 +++++++++++++++---------------- src/vidalia/res/flags/ad.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/ae.png | Bin 1048 -> 1093 bytes src/vidalia/res/flags/af.png | Bin 1063 -> 1170 bytes src/vidalia/res/flags/ag.png | Bin 0 -> 1195 bytes src/vidalia/res/flags/ai.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/al.png | Bin 1061 -> 1185 bytes src/vidalia/res/flags/am.png | Bin 1063 -> 1185 bytes src/vidalia/res/flags/an.png | Bin 1062 -> 1117 bytes src/vidalia/res/flags/ao.png | Bin 1062 -> 1125 bytes src/vidalia/res/flags/aq.png | Bin 0 -> 998 bytes src/vidalia/res/flags/ar.png | Bin 1064 -> 1132 bytes src/vidalia/res/flags/as.png | Bin 0 -> 1177 bytes src/vidalia/res/flags/at.png | Bin 1062 -> 1096 bytes src/vidalia/res/flags/au.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/aw.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/ax.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/az.png | Bin 1063 -> 1182 bytes src/vidalia/res/flags/ba.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/bb.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/bd.png | Bin 1061 -> 1185 bytes src/vidalia/res/flags/be.png | Bin 1060 -> 1170 bytes src/vidalia/res/flags/bf.png | Bin 1063 -> 1182 bytes src/vidalia/res/flags/bg.png | Bin 602 -> 1038 bytes src/vidalia/res/flags/bh.png | Bin 1052 -> 1153 bytes src/vidalia/res/flags/bi.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/bj.png | Bin 1063 -> 1185 bytes src/vidalia/res/flags/bl.png | Bin 0 -> 1083 bytes src/vidalia/res/flags/bm.png | Bin 1057 -> 1176 bytes src/vidalia/res/flags/bn.png | Bin 1064 -> 1189 bytes src/vidalia/res/flags/bo.png | Bin 1063 -> 1185 bytes src/vidalia/res/flags/br.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/bs.png | Bin 1063 -> 1179 bytes src/vidalia/res/flags/bt.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/bv.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/bw.png | Bin 1053 -> 1185 bytes src/vidalia/res/flags/by.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/bz.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/ca.png | Bin 1064 -> 1171 bytes src/vidalia/res/flags/cc.png | Bin 0 -> 1179 bytes src/vidalia/res/flags/cd.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/cf.png | Bin 1064 -> 1171 bytes src/vidalia/res/flags/cg.png | Bin 1061 -> 1185 bytes src/vidalia/res/flags/ch.png | Bin 1045 -> 1185 bytes src/vidalia/res/flags/ci.png | Bin 1061 -> 1083 bytes src/vidalia/res/flags/ck.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/cl.png | Bin 1046 -> 1039 bytes src/vidalia/res/flags/cm.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/cn.png | Bin 645 -> 1185 bytes src/vidalia/res/flags/co.png | Bin 1051 -> 1185 bytes src/vidalia/res/flags/cr.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/cu.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/cv.png | Bin 1062 -> 1185 bytes src/vidalia/res/flags/cx.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/cy.png | Bin 1062 -> 902 bytes src/vidalia/res/flags/cz.png | Bin 1063 -> 1040 bytes src/vidalia/res/flags/de.png | Bin 194 -> 1185 bytes src/vidalia/res/flags/dj.png | Bin 0 -> 1174 bytes src/vidalia/res/flags/dk.png | Bin 1058 -> 1185 bytes src/vidalia/res/flags/dm.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/do.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/dz.png | Bin 1058 -> 1042 bytes src/vidalia/res/flags/ec.png | Bin 1063 -> 1185 bytes src/vidalia/res/flags/ee.png | Bin 1062 -> 1189 bytes src/vidalia/res/flags/eg.png | Bin 1062 -> 1063 bytes src/vidalia/res/flags/eh.png | Bin 0 -> 1174 bytes src/vidalia/res/flags/er.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/es.png | Bin 342 -> 1185 bytes src/vidalia/res/flags/et.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/eu.png | Bin 146 -> 1185 bytes src/vidalia/res/flags/fi.png | Bin 344 -> 1028 bytes src/vidalia/res/flags/fj.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/fk.png | Bin 0 -> 1176 bytes src/vidalia/res/flags/fm.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/fo.png | Bin 1062 -> 1035 bytes src/vidalia/res/flags/fr.png | Bin 226 -> 1083 bytes src/vidalia/res/flags/ga.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/gb.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/gd.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/ge.png | Bin 649 -> 1141 bytes src/vidalia/res/flags/gf.png | Bin 0 -> 1179 bytes src/vidalia/res/flags/gg.png | Bin 0 -> 1021 bytes src/vidalia/res/flags/gh.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/gi.png | Bin 1060 -> 1024 bytes src/vidalia/res/flags/gl.png | Bin 1059 -> 1057 bytes src/vidalia/res/flags/gm.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/gn.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/gp.png | Bin 1051 -> 1173 bytes src/vidalia/res/flags/gq.png | Bin 0 -> 1165 bytes src/vidalia/res/flags/gr.png | Bin 1064 -> 1176 bytes src/vidalia/res/flags/gs.png | Bin 0 -> 1182 bytes src/vidalia/res/flags/gt.png | Bin 1064 -> 1150 bytes src/vidalia/res/flags/gu.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/gw.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/gy.png | Bin 1062 -> 1185 bytes src/vidalia/res/flags/hk.png | Bin 1062 -> 1185 bytes src/vidalia/res/flags/hm.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/hn.png | Bin 0 -> 1149 bytes src/vidalia/res/flags/hr.png | Bin 1062 -> 1149 bytes src/vidalia/res/flags/ht.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/hu.png | Bin 606 -> 1096 bytes src/vidalia/res/flags/id.png | Bin 1062 -> 1109 bytes src/vidalia/res/flags/ie.png | Bin 1063 -> 1102 bytes src/vidalia/res/flags/il.png | Bin 1063 -> 1065 bytes src/vidalia/res/flags/im.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/in.png | Bin 1064 -> 1156 bytes src/vidalia/res/flags/io.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/iq.png | Bin 1063 -> 1097 bytes src/vidalia/res/flags/ir.png | Bin 1064 -> 1132 bytes src/vidalia/res/flags/is.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/it.png | Bin 231 -> 1083 bytes src/vidalia/res/flags/je.png | Bin 0 -> 1106 bytes src/vidalia/res/flags/jm.png | Bin 1063 -> 1185 bytes src/vidalia/res/flags/jo.png | Bin 1063 -> 1158 bytes src/vidalia/res/flags/jp.png | Bin 669 -> 897 bytes src/vidalia/res/flags/ke.png | Bin 1060 -> 1182 bytes src/vidalia/res/flags/kg.png | Bin 1062 -> 1185 bytes src/vidalia/res/flags/kh.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/ki.png | Bin 1063 -> 1182 bytes src/vidalia/res/flags/km.png | Bin 0 -> 1180 bytes src/vidalia/res/flags/kn.png | Bin 0 -> 1179 bytes src/vidalia/res/flags/kp.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/kr.png | Bin 1061 -> 1058 bytes src/vidalia/res/flags/kw.png | Bin 1032 -> 1137 bytes src/vidalia/res/flags/ky.png | Bin 1062 -> 1182 bytes src/vidalia/res/flags/kz.png | Bin 1063 -> 1182 bytes src/vidalia/res/flags/la.png | Bin 0 -> 1189 bytes src/vidalia/res/flags/lb.png | Bin 1063 -> 1074 bytes src/vidalia/res/flags/lc.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/li.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/lk.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/lr.png | Bin 0 -> 1182 bytes src/vidalia/res/flags/ls.png | Bin 0 -> 1134 bytes src/vidalia/res/flags/lt.png | Bin 1062 -> 1185 bytes src/vidalia/res/flags/lu.png | Bin 1062 -> 1096 bytes src/vidalia/res/flags/lv.png | Bin 1053 -> 1185 bytes src/vidalia/res/flags/ly.png | Bin 644 -> 1185 bytes src/vidalia/res/flags/ma.png | Bin 104 -> 1185 bytes src/vidalia/res/flags/mc.png | Bin 1061 -> 1109 bytes src/vidalia/res/flags/md.png | Bin 1062 -> 1185 bytes src/vidalia/res/flags/me.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/mf.png | Bin 0 -> 1083 bytes src/vidalia/res/flags/mg.png | Bin 1062 -> 1113 bytes src/vidalia/res/flags/mh.png | Bin 0 -> 1198 bytes src/vidalia/res/flags/mk.png | Bin 294 -> 1185 bytes src/vidalia/res/flags/ml.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/mm.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/mn.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/mo.png | Bin 1062 -> 1182 bytes src/vidalia/res/flags/mp.png | Bin 1063 -> 1185 bytes src/vidalia/res/flags/mq.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/mr.png | Bin 0 -> 1182 bytes src/vidalia/res/flags/ms.png | Bin 1064 -> 1182 bytes src/vidalia/res/flags/mt.png | Bin 647 -> 1101 bytes src/vidalia/res/flags/mu.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/mv.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/mw.png | Bin 0 -> 1182 bytes src/vidalia/res/flags/mx.png | Bin 1063 -> 1171 bytes src/vidalia/res/flags/my.png | Bin 1064 -> 1182 bytes src/vidalia/res/flags/mz.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/na.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/nc.png | Bin 1062 -> 1083 bytes src/vidalia/res/flags/ne.png | Bin 0 -> 1132 bytes src/vidalia/res/flags/nf.png | Bin 1062 -> 1182 bytes src/vidalia/res/flags/ng.png | Bin 0 -> 1083 bytes src/vidalia/res/flags/ni.png | Bin 0 -> 1132 bytes src/vidalia/res/flags/nl.png | Bin 607 -> 1096 bytes src/vidalia/res/flags/no.png | Bin 1062 -> 1185 bytes src/vidalia/res/flags/np.png | Bin 104 -> 935 bytes src/vidalia/res/flags/nr.png | Bin 1059 -> 1185 bytes src/vidalia/res/flags/nu.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/nz.png | Bin 1063 -> 1185 bytes src/vidalia/res/flags/om.png | Bin 1062 -> 1109 bytes src/vidalia/res/flags/pa.png | Bin 1062 -> 1171 bytes src/vidalia/res/flags/pe.png | Bin 1064 -> 1083 bytes src/vidalia/res/flags/pf.png | Bin 1064 -> 1062 bytes src/vidalia/res/flags/pg.png | Bin 0 -> 1130 bytes src/vidalia/res/flags/ph.png | Bin 1064 -> 1195 bytes src/vidalia/res/flags/pk.png | Bin 1062 -> 1129 bytes src/vidalia/res/flags/pl.png | Bin 583 -> 1182 bytes src/vidalia/res/flags/pm.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/pn.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/pr.png | Bin 1064 -> 1176 bytes src/vidalia/res/flags/ps.png | Bin 0 -> 1129 bytes src/vidalia/res/flags/pt.png | Bin 355 -> 1182 bytes src/vidalia/res/flags/pw.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/py.png | Bin 1062 -> 1129 bytes src/vidalia/res/flags/qa.png | Bin 668 -> 1109 bytes src/vidalia/res/flags/re.png | Bin 0 -> 1083 bytes src/vidalia/res/flags/ro.png | Bin 1063 -> 1185 bytes src/vidalia/res/flags/rs.png | Bin 0 -> 1176 bytes src/vidalia/res/flags/ru.png | Bin 232 -> 1029 bytes src/vidalia/res/flags/rw.png | Bin 0 -> 1182 bytes src/vidalia/res/flags/sa.png | Bin 1063 -> 1185 bytes src/vidalia/res/flags/sb.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/sc.png | Bin 0 -> 1198 bytes src/vidalia/res/flags/sd.png | Bin 1062 -> 1087 bytes src/vidalia/res/flags/se.png | Bin 1062 -> 1185 bytes src/vidalia/res/flags/sg.png | Bin 1062 -> 1112 bytes src/vidalia/res/flags/sh.png | Bin 0 -> 1182 bytes src/vidalia/res/flags/si.png | Bin 1063 -> 1090 bytes src/vidalia/res/flags/sj.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/sk.png | Bin 1063 -> 1090 bytes src/vidalia/res/flags/sl.png | Bin 1063 -> 1093 bytes src/vidalia/res/flags/sm.png | Bin 946 -> 990 bytes src/vidalia/res/flags/sn.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/so.png | Bin 1054 -> 1185 bytes src/vidalia/res/flags/sr.png | Bin 0 -> 1182 bytes src/vidalia/res/flags/st.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/sv.png | Bin 0 -> 1129 bytes src/vidalia/res/flags/sy.png | Bin 104 -> 1096 bytes src/vidalia/res/flags/sz.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/tc.png | Bin 1061 -> 1182 bytes src/vidalia/res/flags/td.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/tf.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/tg.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/th.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/tj.png | Bin 0 -> 1154 bytes src/vidalia/res/flags/tk.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/tl.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/tm.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/tn.png | Bin 1062 -> 1185 bytes src/vidalia/res/flags/to.png | Bin 670 -> 1179 bytes src/vidalia/res/flags/tr.png | Bin 1050 -> 1185 bytes src/vidalia/res/flags/tt.png | Bin 1064 -> 1182 bytes src/vidalia/res/flags/tv.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/tw.png | Bin 654 -> 1179 bytes src/vidalia/res/flags/tz.png | Bin 1061 -> 1179 bytes src/vidalia/res/flags/ua.png | Bin 1062 -> 1185 bytes src/vidalia/res/flags/ug.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/um.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/us.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/uy.png | Bin 1064 -> 1182 bytes src/vidalia/res/flags/uz.png | Bin 0 -> 1096 bytes src/vidalia/res/flags/va.png | Bin 1063 -> 1130 bytes src/vidalia/res/flags/vc.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/ve.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/vg.png | Bin 1064 -> 1182 bytes src/vidalia/res/flags/vi.png | Bin 1064 -> 1168 bytes src/vidalia/res/flags/vn.png | Bin 1059 -> 1185 bytes src/vidalia/res/flags/vu.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/wf.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/ws.png | Bin 1048 -> 1185 bytes src/vidalia/res/flags/ye.png | Bin 1062 -> 1030 bytes src/vidalia/res/flags/yt.png | Bin 0 -> 1079 bytes src/vidalia/res/flags/za.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/zm.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/zw.png | Bin 269 -> 1185 bytes 250 files changed, 417 insertions(+), 366 deletions(-)

1 0

[vidalia/alpha] Improve network map router loading performance
by chiiph＠torproject.org 25 Jun '12

25 Jun '12

commit f853d07f066b909c74dcb5dca0c0582ac63741d3 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Mon Jun 25 20:08:20 2012 -0300 Improve network map router loading performance --- changes/bug6216 | 3 +++ src/vidalia/network/NetViewer.cpp | 6 ++++-- src/vidalia/network/RouterListWidget.cpp | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/changes/bug6216 b/changes/bug6216 new file mode 100644 index 0000000..9484f75 --- /dev/null +++ b/changes/bug6216 @@ -0,0 +1,3 @@ + Internal cleanups and improvements: + o Improve Network Map router loading performance by disabling sorting with + every addition. Resolves ticket 6216. diff --git a/src/vidalia/network/NetViewer.cpp b/src/vidalia/network/NetViewer.cpp index 12f2081..2747cd6 100644 --- a/src/vidalia/network/NetViewer.cpp +++ b/src/vidalia/network/NetViewer.cpp @@ -73,6 +73,7 @@ NetViewer::NetViewer(QWidget *parent) { /* Invoke Qt Designer generated QObject setup routine */ ui.setupUi(this); + ui.treeRouterList->setSortingEnabled(false); ui.lblConsensus->setVisible(false); ui.lblOffline->setVisible(false); @@ -454,14 +455,14 @@ NetViewer::preLoadNetworkStatus() void NetViewer::loadNetworkStatus() { - int count = 0, thres = 10; + int count = 0, thres = 50; for(; _it != _routers.constEnd() and count < thres; ++_it, ++count) { addRouter((*_it)); QCoreApplication::processEvents(); } if(_it != _routers.constEnd()) - QTimer::singleShot(10, this, SLOT(loadNetworkStatus())); + QTimer::singleShot(1, this, SLOT(loadNetworkStatus())); else { QString id = _torControl->getInfo("fingerprint").toString(); RouterListItem *item = ui.treeRouterList->findRouterById(id); @@ -470,6 +471,7 @@ NetViewer::loadNetworkStatus() ui.lblOffline->setVisible(false); } + ui.treeRouterList->setSortingEnabled(true); /* Load existing address mappings */ loadAddressMap(); /* Load Circuits and Streams information */ diff --git a/src/vidalia/network/RouterListWidget.cpp b/src/vidalia/network/RouterListWidget.cpp index eb0d74c..409c99e 100644 --- a/src/vidalia/network/RouterListWidget.cpp +++ b/src/vidalia/network/RouterListWidget.cpp @@ -40,6 +40,7 @@ RouterListWidget::RouterListWidget(QWidget *parent) << tr("Uptime")); /* Sort by descending server bandwidth */ + setSortingEnabled(false); sortItems(StatusColumn, Qt::DescendingOrder); /* Find out when the selected item has changed. */

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
88
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits June 2012