November 2015 - tor-commits - lists.torproject.org

[tor/master] Add an util function to cast double to int64_t
by nickm＠torproject.org 12 Nov '15

12 Nov '15

commit 8acccdbeac69b066be805f711133e188a7b04f28 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Mon Feb 16 15:55:30 2015 -0500 Add an util function to cast double to int64_t Use it in the sample_laplace_distribution function to make sure we return the correct converted value after math operations are done on the input values. Thanks to Yawning for proposing a solution. Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- src/common/util.c | 41 +++++++++++++++++++++++++++++++++++------ src/common/util.h | 1 + 2 files changed, 36 insertions(+), 6 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index d8da8b1..cc7760b 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -554,12 +554,8 @@ sample_laplace_distribution(double mu, double b, double p) result = mu - b * (p > 0.5 ? 1.0 : -1.0) * tor_mathlog(1.0 - 2.0 * fabs(p - 0.5)); - if (result >= INT64_MAX) - return INT64_MAX; - else if (result <= INT64_MIN) - return INT64_MIN; - else - return tor_llround(trunc(result)); + + return cast_double_to_int64(result); } /** Add random noise between INT64_MIN and INT64_MAX coming from a Laplace @@ -5500,3 +5496,36 @@ tor_weak_random_range(tor_weak_rng_t *rng, int32_t top) return result; } +/** Cast a given double value to a int64_t. Return 0 if number is NaN. + * Returns either INT64_MIN or INT64_MAX if number is outside of the int64_t + * range. */ +int64_t cast_double_to_int64(double number) +{ + int exp; + + /* NaN is a special case that can't be used with the logic below. */ + if (isnan(number)) { + return 0; + } + + /* Time to validate if result can overflows a int64_t value. Fun with + * float! Find that exponent exp such that + * number == x * 2^exp + * for some x with abs(x) in [0.5, 1.0). Note that this implies that the + * magnitude of number is strictly less than 2^exp. + * + * If number is infinite, the call to frexp is legal but the contents of + * exp are unspecified. */ + frexp(number, &exp); + + /* If the magnitude of number is strictly less than 2^63, the truncated + * version of number is guaranteed to be representable. The only + * representable integer for which this is not the case is INT64_MIN, but + * it is covered by the logic below. */ + if (isfinite(number) && exp <= 63) { + return number; + } + + /* Handle infinities and finite numbers with magnitude >= 2^63. */ + return signbit(number) ? INT64_MIN : INT64_MAX; +} diff --git a/src/common/util.h b/src/common/util.h index 30ac248..e303da2 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -185,6 +185,7 @@ int64_t sample_laplace_distribution(double mu, double b, double p); int64_t add_laplace_noise(int64_t signal, double random, double delta_f, double epsilon); int n_bits_set_u8(uint8_t v); +int64_t cast_double_to_int64(double number); /* Compute the CEIL of a divided by b, for nonnegative a * and positive b. Works on integer types only. Not defined if a+b can

1 0

[tor/master] Fix hs stats comments to be more accurate
by nickm＠torproject.org 12 Nov '15

12 Nov '15

commit b3832e0b7f95e8082acce1be6505179d38f30d14 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Thu Feb 12 11:39:49 2015 -0500 Fix hs stats comments to be more accurate Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- src/or/rephist.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/or/rephist.c b/src/or/rephist.c index fe0997c..4f7aaae 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -3026,21 +3026,21 @@ rep_hist_stored_maybe_new_hs(const crypto_pk_t *pubkey) /* The number of cells that are supposed to be hidden from the adversary * by adding noise from the Laplace distribution. This value, divided by - * EPSILON, is Laplace parameter b. */ + * EPSILON, is Laplace parameter b. It must be greather than 0. */ #define REND_CELLS_DELTA_F 2048 /* Security parameter for obfuscating number of cells with a value between - * 0 and 1. Smaller values obfuscate observations more, but at the same + * ]0.0, 1.0]. Smaller values obfuscate observations more, but at the same * time make statistics less usable. */ #define REND_CELLS_EPSILON 0.3 /* The number of cells that are supposed to be hidden from the adversary * by rounding up to the next multiple of this number. */ #define REND_CELLS_BIN_SIZE 1024 -/* The number of service identities that are supposed to be hidden from - * the adversary by adding noise from the Laplace distribution. This - * value, divided by EPSILON, is Laplace parameter b. */ +/* The number of service identities that are supposed to be hidden from the + * adversary by adding noise from the Laplace distribution. This value, + * divided by EPSILON, is Laplace parameter b. It must be greater than 0. */ #define ONIONS_SEEN_DELTA_F 8 /* Security parameter for obfuscating number of service identities with a - * value between 0 and 1. Smaller values obfuscate observations more, but + * value between ]0.0, 1.0]. Smaller values obfuscate observations more, but * at the same time make statistics less usable. */ #define ONIONS_SEEN_EPSILON 0.3 /* The number of service identities that are supposed to be hidden from

1 0

[tor/master] Add unit tests for cast_double_to_int64().
by nickm＠torproject.org 12 Nov '15

12 Nov '15

commit 0fcd150959c82add23e82532a29e874ce9e84468 Author: teor <teor2345(a)gmail.com> Date: Wed May 6 18:08:18 2015 +1000 Add unit tests for cast_double_to_int64(). --- src/test/test_util.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/src/test/test_util.c b/src/test/test_util.c index 3310316..3580493 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -4237,6 +4237,62 @@ test_util_laplace(void *arg) ; } +static void +test_util_cast_double_to_int64(void *arg) +{ + (void)arg; + + tt_i64_op(INT64_MIN, ==, cast_double_to_int64(-INFINITY)); + tt_i64_op(INT64_MIN, ==, + cast_double_to_int64(-1.0 * pow(2.0, 64.0) - 1.0)); + tt_i64_op(INT64_MIN, ==, + cast_double_to_int64(-1.0 * pow(2.0, 63.0) - 1.0)); + tt_i64_op(((int64_t) -1) << 53, ==, + cast_double_to_int64(-1.0 * pow(2.0, 53.0))); + tt_i64_op((((int64_t) -1) << 53) + 1, ==, + cast_double_to_int64(-1.0 * pow(2.0, 53.0) + 1.0)); + tt_i64_op(-1, ==, cast_double_to_int64(-1.0)); + tt_i64_op(0, ==, cast_double_to_int64(-0.9)); + tt_i64_op(0, ==, cast_double_to_int64(-0.1)); + tt_i64_op(0, ==, cast_double_to_int64(0.0)); + tt_i64_op(0, ==, cast_double_to_int64(NAN)); + tt_i64_op(0, ==, cast_double_to_int64(0.1)); + tt_i64_op(0, ==, cast_double_to_int64(0.9)); + tt_i64_op(1, ==, cast_double_to_int64(1.0)); + tt_i64_op((((int64_t) 1) << 53) - 1, ==, + cast_double_to_int64(pow(2.0, 53.0) - 1.0)); + tt_i64_op(((int64_t) 1) << 53, ==, + cast_double_to_int64(pow(2.0, 53.0))); + tt_i64_op(INT64_MAX, ==, + cast_double_to_int64(pow(2.0, 63.0))); + tt_i64_op(INT64_MAX, ==, + cast_double_to_int64(pow(2.0, 64.0))); + tt_i64_op(INT64_MAX, ==, cast_double_to_int64(INFINITY)); + + done: + ; +} + +static void +test_util_strclear(void *arg) +{ + static const char *vals[] = { "", "a", "abcdef", "abcdefgh", NULL }; + int i; + char *v = NULL; + (void)arg; + + for (i = 0; vals[i]; ++i) { + size_t n; + v = tor_strdup(vals[i]); + n = strlen(v); + tor_strclear(v); + tt_assert(tor_mem_is_zero(v, n+1)); + tor_free(v); + } + done: + tor_free(v); +} + #define UTIL_LEGACY(name) \ { #name, test_util_ ## name , 0, NULL, NULL } @@ -4454,6 +4510,8 @@ struct testcase_t util_tests[] = { UTIL_LEGACY(di_ops), UTIL_TEST(round_to_next_multiple_of, 0), UTIL_TEST(laplace, 0), + UTIL_TEST(cast_double_to_int64, 0), + UTIL_TEST(strclear, 0), UTIL_TEST(find_str_at_start_of_line, 0), UTIL_TEST(string_is_C_identifier, 0), UTIL_TEST(asprintf, 0),

1 0

[tor/master] Remove test for strclear as it no longer exists in the codebase
by nickm＠torproject.org 12 Nov '15

12 Nov '15

commit 75fc4d551174b712a0468ae7a8be821b566ef1f9 Author: teor <teor2345(a)gmail.com> Date: Wed May 6 18:27:26 2015 +1000 Remove test for strclear as it no longer exists in the codebase --- src/test/test_util.c | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index d3a2bc2..d23ce5f 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -4273,26 +4273,6 @@ test_util_cast_double_to_int64(void *arg) ; } -static void -test_util_strclear(void *arg) -{ - static const char *vals[] = { "", "a", "abcdef", "abcdefgh", NULL }; - int i; - char *v = NULL; - (void)arg; - - for (i = 0; vals[i]; ++i) { - size_t n; - v = tor_strdup(vals[i]); - n = strlen(v); - tor_strclear(v); - tt_assert(tor_mem_is_zero(v, n+1)); - tor_free(v); - } - done: - tor_free(v); -} - #define UTIL_LEGACY(name) \ { #name, test_util_ ## name , 0, NULL, NULL } @@ -4511,7 +4491,6 @@ struct testcase_t util_tests[] = { UTIL_TEST(round_to_next_multiple_of, 0), UTIL_TEST(laplace, 0), UTIL_TEST(cast_double_to_int64, 0), - UTIL_TEST(strclear, 0), UTIL_TEST(find_str_at_start_of_line, 0), UTIL_TEST(string_is_C_identifier, 0), UTIL_TEST(asprintf, 0),

1 0

[tor/master] Use standard float.h header and resolve undefined left shift behaviour
by nickm＠torproject.org 12 Nov '15

12 Nov '15

commit e60c612447d376ad07be5e950cce087abcf8f491 Author: teor <teor2345(a)gmail.com> Date: Fri Mar 27 20:37:07 2015 +1100 Use standard float.h header and resolve undefined left shift behaviour --- src/test/test_util.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index 3580493..d3a2bc2 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -19,7 +19,7 @@ #endif #include <math.h> #include <ctype.h> -#include <values.h> +#include <float.h> /* XXXX this is a minimal wrapper to make the unit tests compile with the * changed tor_timegm interface. */ @@ -4247,9 +4247,9 @@ test_util_cast_double_to_int64(void *arg) cast_double_to_int64(-1.0 * pow(2.0, 64.0) - 1.0)); tt_i64_op(INT64_MIN, ==, cast_double_to_int64(-1.0 * pow(2.0, 63.0) - 1.0)); - tt_i64_op(((int64_t) -1) << 53, ==, + tt_i64_op(((uint64_t) -1) << 53, ==, cast_double_to_int64(-1.0 * pow(2.0, 53.0))); - tt_i64_op((((int64_t) -1) << 53) + 1, ==, + tt_i64_op((((uint64_t) -1) << 53) + 1, ==, cast_double_to_int64(-1.0 * pow(2.0, 53.0) + 1.0)); tt_i64_op(-1, ==, cast_double_to_int64(-1.0)); tt_i64_op(0, ==, cast_double_to_int64(-0.9));

1 0

[tor/master] Test: remove edge cases that assert in laplace test
by nickm＠torproject.org 12 Nov '15

12 Nov '15

commit aecc354ee77f2e94d084c4e5bd19b57125db9e07 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Thu Feb 12 11:31:08 2015 -0500 Test: remove edge cases that assert in laplace test Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- src/test/test_util.c | 87 -------------------------------------------------- 1 file changed, 87 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index 74d7227..21737f6 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -4178,29 +4178,6 @@ test_util_laplace(void *arg) tt_assert((-35 + INT64_MAX) == add_laplace_noise(INT64_MAX, min_dbl_error, noscale_df, noscale_eps)); - /* ... even when scaled? */ - tt_assert(INT64_MIN == - add_laplace_noise(0, min_dbl_error, - INT64_MIN, -35)); - tt_assert(INT64_MIN == - add_laplace_noise(0, min_dbl_error, - INT64_MIN, -34)); - tt_assert(INT64_MAX == - add_laplace_noise(0, min_dbl_error, - INT64_MIN, 1)); - tt_assert((INT64_MIN + INT64_MAX) == - add_laplace_noise(INT64_MIN, min_dbl_error, - INT64_MIN, 1)); - tt_assert(INT64_MAX == - add_laplace_noise(INT64_MAX, min_dbl_error, - INT64_MIN, 1)); - - tt_assert(INT64_MAX == - add_laplace_noise(0, min_dbl_error, - INT64_MAX, -35)); - tt_assert(INT64_MAX == - add_laplace_noise(0, min_dbl_error, - INT64_MAX, -34)); tt_assert(INT64_MIN == add_laplace_noise(0, min_dbl_error, INT64_MAX, 1)); @@ -4244,81 +4221,17 @@ test_util_laplace(void *arg) tt_assert(INT64_MAX == add_laplace_noise(INT64_MAX, max_dbl_lt_one, delta_f, epsilon)); - tt_assert(INT64_MAX == - add_laplace_noise(0, max_dbl_lt_one, - INT64_MAX, 35)); - tt_assert(INT64_MAX == - add_laplace_noise(0, max_dbl_lt_one, - INT64_MAX, 34)); tt_assert((INT64_MIN + INT64_MAX) == add_laplace_noise(INT64_MIN, max_dbl_lt_one, INT64_MAX, 1)); tt_assert(INT64_MAX == add_laplace_noise(INT64_MAX, max_dbl_lt_one, INT64_MAX, 1)); - tt_assert((INT64_MAX + INT64_MIN) == - add_laplace_noise(INT64_MAX, max_dbl_lt_one, - INT64_MIN, 1)); - tt_assert(INT64_MIN == - add_laplace_noise(INT64_MIN, max_dbl_lt_one, - INT64_MIN, 1)); - /* does it play nice with INT64_MIN? */ tt_assert((INT64_MIN + 35) == add_laplace_noise(INT64_MIN, max_dbl_lt_one, noscale_df, noscale_eps)); - /* Test extreme values of b = delta_f / epsilon - * >>> laplace.ppf([0.5], loc = 0, scale = 1) - * array([0. ]) - */ - - /* Make sure edge cases don't depend on architecture, - * optimisation level, or other compiler flags. - * XXXX Are these edge cases important enough to make consistent? */ - - /* b = positive zero, p yields positive zero */ - tt_assert(0.0 == - add_laplace_noise(0.0, 0.5, 0.0, 1.0)) - /* b = negative zero, p yields positive zero */ - tt_assert(0.0 == - add_laplace_noise(0.0, 0.5, 0.0, -1.0)) - /* b = positive infinity, p yields positive zero, result is -NaN -> -Inf */ - tt_assert(INT64_MIN == - add_laplace_noise(0.0, 0.5, 1.0, 0.0)) - /* b = negative infinity, p yields positive zero, result is -NaN -> -Inf */ - tt_assert(INT64_MIN == - add_laplace_noise(0.0, 0.5, -1.0, 0.0)) - /* b = positive NaN (rounded to -Inf), p yields positive zero, - * result is -NaN -> -Inf */ - tt_assert(INT64_MIN == - add_laplace_noise(0.0, 0.5, -0.0, -0.0)) - /* b = negative NaN (rounded to -Inf), p yields positive zero, - * result is -NaN -> -Inf*/ - tt_assert(INT64_MIN == - add_laplace_noise(0.0, 0.5, -0.0, 0.0)) - - /* b = positive zero, p yields negative infinity, result is -NaN -> -Inf */ - tt_assert(INT64_MIN == - add_laplace_noise(0.0, 0.0, 0.0, 1.0)) - /* b = negative zero, p yields negative infinity, result is -NaN -> -Inf */ - tt_assert(INT64_MIN == - add_laplace_noise(0.0, 0.0, 0.0, -1.0)) - /* b = positive infinity, p yields negative infinity */ - tt_assert(INT64_MIN == - add_laplace_noise(0.0, 0.0, 1.0, 0.0)) - /* b = negative infinity, p yields negative infinity */ - tt_assert(INT64_MAX == - add_laplace_noise(0.0, 0.0, -1.0, 0.0)) - /* b = positive NaN (rounded to -Inf), p yields negative infinity, - * result is -NaN -> -Inf */ - tt_assert(INT64_MIN == - add_laplace_noise(0.0, 0.0, -0.0, -0.0)) - /* b = negative NaN (rounded to -Inf), p yields negative infinity, - * result is NaN -> Inf */ - tt_assert(INT64_MAX == - add_laplace_noise(0.0, 0.0, -0.0, 0.0)) - done: ; }

1 0

[tor/master] Make round_to_next_multiple_of always round upwards.
by nickm＠torproject.org 12 Nov '15

12 Nov '15

commit 0694263b7533ba000d3d95a2936115b21b806a5d Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 12 11:32:14 2015 -0500 Make round_to_next_multiple_of always round upwards. Yes, even if it has to return a non-multiple. This prevents us from ever having a bug where we try to use it for allocation, and under-allocate. --- src/common/util.c | 32 +++++++++++++++++++++----------- src/test/test_util.c | 8 ++++---- 2 files changed, 25 insertions(+), 15 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index cc7760b..63bd1cc 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -487,48 +487,58 @@ round_to_power_of_2(uint64_t u64) } /** Return the lowest x such that x is at least number, and x modulo - * divisor == 0. */ + * divisor == 0. If no such x can be expressed as an unsigned, return + * UINT_MAX */ unsigned round_to_next_multiple_of(unsigned number, unsigned divisor) { tor_assert(divisor > 0); - if (UINT_MAX - divisor + 1 >= number) - number += divisor - 1; + if (UINT_MAX - divisor + 1 < number) + return UINT_MAX; + number += divisor - 1; number -= number % divisor; return number; } /** Return the lowest x such that x is at least number, and x modulo - * divisor == 0. */ + * divisor == 0. If no such x can be expressed as a uint32_t, return + * UINT32_MAX */ uint32_t round_uint32_to_next_multiple_of(uint32_t number, uint32_t divisor) { tor_assert(divisor > 0); - if (UINT32_MAX - divisor + 1 >= number) - number += divisor - 1; + if (UINT32_MAX - divisor + 1 < number) + return UINT32_MAX; + + number += divisor - 1; number -= number % divisor; return number; } /** Return the lowest x such that x is at least number, and x modulo - * divisor == 0. */ + * divisor == 0. If no such x can be expressed as a uint64_t, return + * UINT64_MAX */ uint64_t round_uint64_to_next_multiple_of(uint64_t number, uint64_t divisor) { tor_assert(divisor > 0); - if (UINT64_MAX - divisor + 1 >= number) - number += divisor - 1; + if (UINT64_MAX - divisor + 1 < number) + return UINT64_MAX; + number += divisor - 1; number -= number % divisor; return number; } /** Return the lowest x in [INT64_MIN, INT64_MAX] such that x is at least - * number, and x modulo divisor == 0. */ + * number, and x modulo divisor == 0. If no such x can be + * expressed as an int64_t, return INT64_MAX */ int64_t round_int64_to_next_multiple_of(int64_t number, int64_t divisor) { tor_assert(divisor > 0); - if (number >= 0 && INT64_MAX - divisor + 1 >= number) + if (INT64_MAX - divisor + 1 < number) + return INT64_MAX; + if (number >= 0) number += divisor - 1; number -= number % divisor; return number; diff --git a/src/test/test_util.c b/src/test/test_util.c index d23ce5f..8ae5bb3 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -4056,7 +4056,7 @@ test_util_round_to_next_multiple_of(void *arg) tt_u64_op(round_uint64_to_next_multiple_of(99,9), ==, 99); tt_u64_op(round_uint64_to_next_multiple_of(UINT64_MAX,2), ==, - UINT64_MAX-UINT64_MAX%2); + UINT64_MAX); tt_i64_op(round_int64_to_next_multiple_of(0,1), ==, 0); tt_i64_op(round_int64_to_next_multiple_of(0,7), ==, 0); @@ -4071,7 +4071,7 @@ test_util_round_to_next_multiple_of(void *arg) tt_i64_op(round_int64_to_next_multiple_of(INT64_MIN,2), ==, INT64_MIN); tt_i64_op(round_int64_to_next_multiple_of(INT64_MAX,2), ==, - INT64_MAX-INT64_MAX%2); + INT64_MAX); tt_int_op(round_uint32_to_next_multiple_of(0,1), ==, 0); tt_int_op(round_uint32_to_next_multiple_of(0,7), ==, 0); @@ -4081,7 +4081,7 @@ test_util_round_to_next_multiple_of(void *arg) tt_int_op(round_uint32_to_next_multiple_of(99,9), ==, 99); tt_int_op(round_uint32_to_next_multiple_of(UINT32_MAX,2), ==, - UINT32_MAX-UINT32_MAX%2); + UINT32_MAX); tt_uint_op(round_to_next_multiple_of(0,1), ==, 0); tt_uint_op(round_to_next_multiple_of(0,7), ==, 0); @@ -4091,7 +4091,7 @@ test_util_round_to_next_multiple_of(void *arg) tt_uint_op(round_to_next_multiple_of(99,9), ==, 99); tt_uint_op(round_to_next_multiple_of(UINT_MAX,2), ==, - UINT_MAX-UINT_MAX%2); + UINT_MAX); done: ; }

1 0

[tor/master] Merge branch 'karsten_bug13192_026_03_teor'
by nickm＠torproject.org 12 Nov '15

12 Nov '15

commit d20a3d07e3904d777b5395ad7e52930138634257 Merge: 0a3eed5 1f7ba11 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 12 11:40:58 2015 -0500 Merge branch 'karsten_bug13192_026_03_teor' changes/laplace-edge-cases | 8 +++ src/common/util.c | 102 +++++++++++++++++++++------ src/common/util.h | 1 + src/or/rephist.c | 12 ++-- src/test/test_util.c | 165 +++++++++++++++++++++++++++++++++++++++++++- 5 files changed, 260 insertions(+), 28 deletions(-) diff --cc src/test/test_util.c index 0a5783e,f96a362..208186c --- a/src/test/test_util.c +++ b/src/test/test_util.c @@@ -4438,9 -4488,9 +4600,10 @@@ struct testcase_t util_tests[] = UTIL_LEGACY(path_is_relative), UTIL_LEGACY(strtok), UTIL_LEGACY(di_ops), + UTIL_TEST(di_map, 0), UTIL_TEST(round_to_next_multiple_of, 0), UTIL_TEST(laplace, 0), + UTIL_TEST(clamp_double_to_int64, 0), UTIL_TEST(find_str_at_start_of_line, 0), UTIL_TEST(string_is_C_identifier, 0), UTIL_TEST(asprintf, 0),

1 0

[tor/master] Rename cast_double_to_int64 to clamp_double_to_int64
by nickm＠torproject.org 12 Nov '15

12 Nov '15

commit 1f7ba115a46743ea09402a30a7b11e4b6d2ee52e Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 9 16:54:17 2015 -0400 Rename cast_double_to_int64 to clamp_double_to_int64 --- src/common/util.c | 4 ++-- src/common/util.h | 2 +- src/test/test_util.c | 40 ++++++++++++++++++++-------------------- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index 63bd1cc..f642c6a 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -565,7 +565,7 @@ sample_laplace_distribution(double mu, double b, double p) result = mu - b * (p > 0.5 ? 1.0 : -1.0) * tor_mathlog(1.0 - 2.0 * fabs(p - 0.5)); - return cast_double_to_int64(result); + return clamp_double_to_int64(result); } /** Add random noise between INT64_MIN and INT64_MAX coming from a Laplace @@ -5509,7 +5509,7 @@ tor_weak_random_range(tor_weak_rng_t *rng, int32_t top) /** Cast a given double value to a int64_t. Return 0 if number is NaN. * Returns either INT64_MIN or INT64_MAX if number is outside of the int64_t * range. */ -int64_t cast_double_to_int64(double number) +int64_t clamp_double_to_int64(double number) { int exp; diff --git a/src/common/util.h b/src/common/util.h index e303da2..8e18e05 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -185,7 +185,7 @@ int64_t sample_laplace_distribution(double mu, double b, double p); int64_t add_laplace_noise(int64_t signal, double random, double delta_f, double epsilon); int n_bits_set_u8(uint8_t v); -int64_t cast_double_to_int64(double number); +int64_t clamp_double_to_int64(double number); /* Compute the CEIL of a divided by b, for nonnegative a * and positive b. Works on integer types only. Not defined if a+b can diff --git a/src/test/test_util.c b/src/test/test_util.c index 8ae5bb3..f96a362 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -4238,36 +4238,36 @@ test_util_laplace(void *arg) } static void -test_util_cast_double_to_int64(void *arg) +test_util_clamp_double_to_int64(void *arg) { (void)arg; - tt_i64_op(INT64_MIN, ==, cast_double_to_int64(-INFINITY)); + tt_i64_op(INT64_MIN, ==, clamp_double_to_int64(-INFINITY)); tt_i64_op(INT64_MIN, ==, - cast_double_to_int64(-1.0 * pow(2.0, 64.0) - 1.0)); + clamp_double_to_int64(-1.0 * pow(2.0, 64.0) - 1.0)); tt_i64_op(INT64_MIN, ==, - cast_double_to_int64(-1.0 * pow(2.0, 63.0) - 1.0)); + clamp_double_to_int64(-1.0 * pow(2.0, 63.0) - 1.0)); tt_i64_op(((uint64_t) -1) << 53, ==, - cast_double_to_int64(-1.0 * pow(2.0, 53.0))); + clamp_double_to_int64(-1.0 * pow(2.0, 53.0))); tt_i64_op((((uint64_t) -1) << 53) + 1, ==, - cast_double_to_int64(-1.0 * pow(2.0, 53.0) + 1.0)); - tt_i64_op(-1, ==, cast_double_to_int64(-1.0)); - tt_i64_op(0, ==, cast_double_to_int64(-0.9)); - tt_i64_op(0, ==, cast_double_to_int64(-0.1)); - tt_i64_op(0, ==, cast_double_to_int64(0.0)); - tt_i64_op(0, ==, cast_double_to_int64(NAN)); - tt_i64_op(0, ==, cast_double_to_int64(0.1)); - tt_i64_op(0, ==, cast_double_to_int64(0.9)); - tt_i64_op(1, ==, cast_double_to_int64(1.0)); + clamp_double_to_int64(-1.0 * pow(2.0, 53.0) + 1.0)); + tt_i64_op(-1, ==, clamp_double_to_int64(-1.0)); + tt_i64_op(0, ==, clamp_double_to_int64(-0.9)); + tt_i64_op(0, ==, clamp_double_to_int64(-0.1)); + tt_i64_op(0, ==, clamp_double_to_int64(0.0)); + tt_i64_op(0, ==, clamp_double_to_int64(NAN)); + tt_i64_op(0, ==, clamp_double_to_int64(0.1)); + tt_i64_op(0, ==, clamp_double_to_int64(0.9)); + tt_i64_op(1, ==, clamp_double_to_int64(1.0)); tt_i64_op((((int64_t) 1) << 53) - 1, ==, - cast_double_to_int64(pow(2.0, 53.0) - 1.0)); + clamp_double_to_int64(pow(2.0, 53.0) - 1.0)); tt_i64_op(((int64_t) 1) << 53, ==, - cast_double_to_int64(pow(2.0, 53.0))); + clamp_double_to_int64(pow(2.0, 53.0))); tt_i64_op(INT64_MAX, ==, - cast_double_to_int64(pow(2.0, 63.0))); + clamp_double_to_int64(pow(2.0, 63.0))); tt_i64_op(INT64_MAX, ==, - cast_double_to_int64(pow(2.0, 64.0))); - tt_i64_op(INT64_MAX, ==, cast_double_to_int64(INFINITY)); + clamp_double_to_int64(pow(2.0, 64.0))); + tt_i64_op(INT64_MAX, ==, clamp_double_to_int64(INFINITY)); done: ; @@ -4490,7 +4490,7 @@ struct testcase_t util_tests[] = { UTIL_LEGACY(di_ops), UTIL_TEST(round_to_next_multiple_of, 0), UTIL_TEST(laplace, 0), - UTIL_TEST(cast_double_to_int64, 0), + UTIL_TEST(clamp_double_to_int64, 0), UTIL_TEST(find_str_at_start_of_line, 0), UTIL_TEST(string_is_C_identifier, 0), UTIL_TEST(asprintf, 0),

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 12 Nov '15

12 Nov '15

commit 3ab4eb45b34efbde6a9cb28fe1aef21f7f8ba321 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 12 15:45:03 2015 +0000 Update translations for bridgedb --- th/LC_MESSAGES/bridgedb.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/th/LC_MESSAGES/bridgedb.po b/th/LC_MESSAGES/bridgedb.po index 5af5d77..18b4d49 100644 --- a/th/LC_MESSAGES/bridgedb.po +++ b/th/LC_MESSAGES/bridgedb.po @@ -12,7 +12,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: 2015-11-12 14:38+0000\n" +"PO-Revision-Date: 2015-11-12 15:24+0000\n" "Last-Translator: Ella Rudland <atwwtkp(a)gmail.com>\n" "Language-Team: Thai (http://www.transifex.com/otf/torproject/language/th/)\n" "MIME-Version: 1.0\n" @@ -82,7 +82,7 @@ msgstr "มีความผิดในการรับรหัส QR" msgid "" "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" " your bridge lines onto mobile and other devices." -msgstr "" +msgstr "รหัส QR นี่มีบริดจ์ไลนฺส์ท่าน สแกนด้วยเครื่องอ่านรหัส QR เพื่อที่จะทำสำเนาบริดจ์ไลนฺส์ท่าน ไปถึงโมบายและเครื่องอื่นๆ" #: bridgedb/https/templates/bridges.html:131 msgid "There currently aren't any bridges available..."

1 0