April 2018 - tor-commits - lists.torproject.org

[tor/release-0.3.3] Attempt to fix 32-bit clang builds, which broke with 31508a0abccfee1cd
by nickm＠torproject.org 12 Apr '18

12 Apr '18

commit 46795a7be63b9a1b90a59fcf9efda4f4f1eacc37 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 12 12:24:36 2018 -0400 Attempt to fix 32-bit clang builds, which broke with 31508a0abccfee1cd When size_t is 32 bits, the unit tests can't fit anything more than 4GB-1 into a size_t. Additionally, tt_int_op() uses "long" -- we need tt_u64_op() to safely test uint64_t values for equality. Bug caused by tests for #24782 fix; not in any released Tor. --- src/test/test_config.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/test/test_config.c b/src/test/test_config.c index d82f6d21d..e214a8277 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -5626,10 +5626,10 @@ test_config_compute_max_mem_in_queues(void *data) #if SIZEOF_VOID_P >= 8 /* We are on a 64-bit system. */ - tt_int_op(compute_real_max_mem_in_queues(0, 0), OP_EQ, GIGABYTE(8)); + tt_u64_op(compute_real_max_mem_in_queues(0, 0), OP_EQ, GIGABYTE(8)); #else /* We are on a 32-bit system. */ - tt_int_op(compute_real_max_mem_in_queues(0, 0), OP_EQ, GIGABYTE(1)); + tt_u64_op(compute_real_max_mem_in_queues(0, 0), OP_EQ, GIGABYTE(1)); #endif /* We are able to detect the amount of RAM on the system. */ @@ -5639,7 +5639,7 @@ test_config_compute_max_mem_in_queues(void *data) total_system_memory_output = GIGABYTE(1); /* We have 0.75 * RAM available. */ - tt_int_op(compute_real_max_mem_in_queues(0, 0), OP_EQ, + tt_u64_op(compute_real_max_mem_in_queues(0, 0), OP_EQ, 3 * (GIGABYTE(1) / 4)); /* We are running on a tiny machine with 256 MB of RAM. */ @@ -5648,28 +5648,30 @@ test_config_compute_max_mem_in_queues(void *data) /* We will now enforce a minimum of 256 MB of RAM available for the * MaxMemInQueues here, even though we should only have had 0.75 * 256 = 192 * MB available. */ - tt_int_op(compute_real_max_mem_in_queues(0, 0), OP_EQ, MEGABYTE(256)); + tt_u64_op(compute_real_max_mem_in_queues(0, 0), OP_EQ, MEGABYTE(256)); +#if SIZEOF_SIZE_T > 4 /* We are running on a machine with 8 GB of RAM. */ total_system_memory_output = GIGABYTE(8); /* We will have 0.4 * RAM available. */ - tt_int_op(compute_real_max_mem_in_queues(0, 0), OP_EQ, + tt_u64_op(compute_real_max_mem_in_queues(0, 0), OP_EQ, 2 * (GIGABYTE(8) / 5)); /* We are running on a machine with 16 GB of RAM. */ total_system_memory_output = GIGABYTE(16); /* We will have 0.4 * RAM available. */ - tt_int_op(compute_real_max_mem_in_queues(0, 0), OP_EQ, + tt_u64_op(compute_real_max_mem_in_queues(0, 0), OP_EQ, 2 * (GIGABYTE(16) / 5)); /* We are running on a machine with 32 GB of RAM. */ total_system_memory_output = GIGABYTE(32); /* We will at maximum get MAX_DEFAULT_MEMORY_QUEUE_SIZE here. */ - tt_int_op(compute_real_max_mem_in_queues(0, 0), OP_EQ, + tt_u64_op(compute_real_max_mem_in_queues(0, 0), OP_EQ, MAX_DEFAULT_MEMORY_QUEUE_SIZE); +#endif done: UNMOCK(get_total_system_memory);

1 0

[tor/master] Attempt to fix 32-bit clang builds, which broke with 31508a0abccfee1cd
by nickm＠torproject.org 12 Apr '18

12 Apr '18

commit 46795a7be63b9a1b90a59fcf9efda4f4f1eacc37 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 12 12:24:36 2018 -0400 Attempt to fix 32-bit clang builds, which broke with 31508a0abccfee1cd When size_t is 32 bits, the unit tests can't fit anything more than 4GB-1 into a size_t. Additionally, tt_int_op() uses "long" -- we need tt_u64_op() to safely test uint64_t values for equality. Bug caused by tests for #24782 fix; not in any released Tor. --- src/test/test_config.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/test/test_config.c b/src/test/test_config.c index d82f6d21d..e214a8277 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -5626,10 +5626,10 @@ test_config_compute_max_mem_in_queues(void *data) #if SIZEOF_VOID_P >= 8 /* We are on a 64-bit system. */ - tt_int_op(compute_real_max_mem_in_queues(0, 0), OP_EQ, GIGABYTE(8)); + tt_u64_op(compute_real_max_mem_in_queues(0, 0), OP_EQ, GIGABYTE(8)); #else /* We are on a 32-bit system. */ - tt_int_op(compute_real_max_mem_in_queues(0, 0), OP_EQ, GIGABYTE(1)); + tt_u64_op(compute_real_max_mem_in_queues(0, 0), OP_EQ, GIGABYTE(1)); #endif /* We are able to detect the amount of RAM on the system. */ @@ -5639,7 +5639,7 @@ test_config_compute_max_mem_in_queues(void *data) total_system_memory_output = GIGABYTE(1); /* We have 0.75 * RAM available. */ - tt_int_op(compute_real_max_mem_in_queues(0, 0), OP_EQ, + tt_u64_op(compute_real_max_mem_in_queues(0, 0), OP_EQ, 3 * (GIGABYTE(1) / 4)); /* We are running on a tiny machine with 256 MB of RAM. */ @@ -5648,28 +5648,30 @@ test_config_compute_max_mem_in_queues(void *data) /* We will now enforce a minimum of 256 MB of RAM available for the * MaxMemInQueues here, even though we should only have had 0.75 * 256 = 192 * MB available. */ - tt_int_op(compute_real_max_mem_in_queues(0, 0), OP_EQ, MEGABYTE(256)); + tt_u64_op(compute_real_max_mem_in_queues(0, 0), OP_EQ, MEGABYTE(256)); +#if SIZEOF_SIZE_T > 4 /* We are running on a machine with 8 GB of RAM. */ total_system_memory_output = GIGABYTE(8); /* We will have 0.4 * RAM available. */ - tt_int_op(compute_real_max_mem_in_queues(0, 0), OP_EQ, + tt_u64_op(compute_real_max_mem_in_queues(0, 0), OP_EQ, 2 * (GIGABYTE(8) / 5)); /* We are running on a machine with 16 GB of RAM. */ total_system_memory_output = GIGABYTE(16); /* We will have 0.4 * RAM available. */ - tt_int_op(compute_real_max_mem_in_queues(0, 0), OP_EQ, + tt_u64_op(compute_real_max_mem_in_queues(0, 0), OP_EQ, 2 * (GIGABYTE(16) / 5)); /* We are running on a machine with 32 GB of RAM. */ total_system_memory_output = GIGABYTE(32); /* We will at maximum get MAX_DEFAULT_MEMORY_QUEUE_SIZE here. */ - tt_int_op(compute_real_max_mem_in_queues(0, 0), OP_EQ, + tt_u64_op(compute_real_max_mem_in_queues(0, 0), OP_EQ, MAX_DEFAULT_MEMORY_QUEUE_SIZE); +#endif done: UNMOCK(get_total_system_memory);

1 0

[tor/maint-0.3.3] Attempt to fix 32-bit clang builds, which broke with 31508a0abccfee1cd
by nickm＠torproject.org 12 Apr '18

12 Apr '18

commit 46795a7be63b9a1b90a59fcf9efda4f4f1eacc37 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 12 12:24:36 2018 -0400 Attempt to fix 32-bit clang builds, which broke with 31508a0abccfee1cd When size_t is 32 bits, the unit tests can't fit anything more than 4GB-1 into a size_t. Additionally, tt_int_op() uses "long" -- we need tt_u64_op() to safely test uint64_t values for equality. Bug caused by tests for #24782 fix; not in any released Tor. --- src/test/test_config.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/test/test_config.c b/src/test/test_config.c index d82f6d21d..e214a8277 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -5626,10 +5626,10 @@ test_config_compute_max_mem_in_queues(void *data) #if SIZEOF_VOID_P >= 8 /* We are on a 64-bit system. */ - tt_int_op(compute_real_max_mem_in_queues(0, 0), OP_EQ, GIGABYTE(8)); + tt_u64_op(compute_real_max_mem_in_queues(0, 0), OP_EQ, GIGABYTE(8)); #else /* We are on a 32-bit system. */ - tt_int_op(compute_real_max_mem_in_queues(0, 0), OP_EQ, GIGABYTE(1)); + tt_u64_op(compute_real_max_mem_in_queues(0, 0), OP_EQ, GIGABYTE(1)); #endif /* We are able to detect the amount of RAM on the system. */ @@ -5639,7 +5639,7 @@ test_config_compute_max_mem_in_queues(void *data) total_system_memory_output = GIGABYTE(1); /* We have 0.75 * RAM available. */ - tt_int_op(compute_real_max_mem_in_queues(0, 0), OP_EQ, + tt_u64_op(compute_real_max_mem_in_queues(0, 0), OP_EQ, 3 * (GIGABYTE(1) / 4)); /* We are running on a tiny machine with 256 MB of RAM. */ @@ -5648,28 +5648,30 @@ test_config_compute_max_mem_in_queues(void *data) /* We will now enforce a minimum of 256 MB of RAM available for the * MaxMemInQueues here, even though we should only have had 0.75 * 256 = 192 * MB available. */ - tt_int_op(compute_real_max_mem_in_queues(0, 0), OP_EQ, MEGABYTE(256)); + tt_u64_op(compute_real_max_mem_in_queues(0, 0), OP_EQ, MEGABYTE(256)); +#if SIZEOF_SIZE_T > 4 /* We are running on a machine with 8 GB of RAM. */ total_system_memory_output = GIGABYTE(8); /* We will have 0.4 * RAM available. */ - tt_int_op(compute_real_max_mem_in_queues(0, 0), OP_EQ, + tt_u64_op(compute_real_max_mem_in_queues(0, 0), OP_EQ, 2 * (GIGABYTE(8) / 5)); /* We are running on a machine with 16 GB of RAM. */ total_system_memory_output = GIGABYTE(16); /* We will have 0.4 * RAM available. */ - tt_int_op(compute_real_max_mem_in_queues(0, 0), OP_EQ, + tt_u64_op(compute_real_max_mem_in_queues(0, 0), OP_EQ, 2 * (GIGABYTE(16) / 5)); /* We are running on a machine with 32 GB of RAM. */ total_system_memory_output = GIGABYTE(32); /* We will at maximum get MAX_DEFAULT_MEMORY_QUEUE_SIZE here. */ - tt_int_op(compute_real_max_mem_in_queues(0, 0), OP_EQ, + tt_u64_op(compute_real_max_mem_in_queues(0, 0), OP_EQ, MAX_DEFAULT_MEMORY_QUEUE_SIZE); +#endif done: UNMOCK(get_total_system_memory);

1 0

[tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3
by nickm＠torproject.org 12 Apr '18

12 Apr '18

commit be3d8cb1762d24e4ed87e7f26df53b1e564e6aac Merge: 85db0c46e 4aaa4215e Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 12 12:25:51 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 src/or/config.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.3.3'
by nickm＠torproject.org 12 Apr '18

12 Apr '18

commit 467c882baa9f08e46428319cea67f57bb4287730 Merge: 037fb0c80 4aaa4215e Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 12 12:25:51 2018 -0400 Merge branch 'maint-0.3.3' src/or/config.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.3] Attempt to fix 32-bit builds, which broke with 31508a0abccfee1cd
by nickm＠torproject.org 12 Apr '18

12 Apr '18

commit 4aaa4215e7e11f318c5a50124e29dc0b50ce21e1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 12 12:24:36 2018 -0400 Attempt to fix 32-bit builds, which broke with 31508a0abccfee1cd When size_t is 32 bits, doing "size_t ram; if (ram > 8GB) { ... }" produces a compile-time warning. Bug caused by #24782 fix; not in any released Tor. --- src/or/config.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/or/config.c b/src/or/config.c index 6b8885521..986794cec 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4545,7 +4545,15 @@ compute_real_max_mem_in_queues(const uint64_t val, int log_guess) /* We detected the amount of memory available. */ uint64_t avail = 0; - if (ram >= (8 * ONE_GIGABYTE)) { +#if SIZEOF_SIZE_T > 4 +/* On a 64-bit platform, we consider 8GB "very large". */ +#define RAM_IS_VERY_LARGE(x) ((x) >= (8 * ONE_GIGABYTE)) +#else +/* On a 32-bit platform, we can't have 8GB of ram. */ +#define RAM_IS_VERY_LARGE(x) (0) +#endif + + if (RAM_IS_VERY_LARGE(ram)) { /* If we have 8 GB, or more, RAM available, we set the MaxMemInQueues * to 0.4 * RAM. The idea behind this value is that the amount of RAM * is more than enough for a single relay and should allow the relay

1 0

[tor/master] Attempt to fix 32-bit builds, which broke with 31508a0abccfee1cd
by nickm＠torproject.org 12 Apr '18

12 Apr '18

commit 4aaa4215e7e11f318c5a50124e29dc0b50ce21e1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 12 12:24:36 2018 -0400 Attempt to fix 32-bit builds, which broke with 31508a0abccfee1cd When size_t is 32 bits, doing "size_t ram; if (ram > 8GB) { ... }" produces a compile-time warning. Bug caused by #24782 fix; not in any released Tor. --- src/or/config.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/or/config.c b/src/or/config.c index 6b8885521..986794cec 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4545,7 +4545,15 @@ compute_real_max_mem_in_queues(const uint64_t val, int log_guess) /* We detected the amount of memory available. */ uint64_t avail = 0; - if (ram >= (8 * ONE_GIGABYTE)) { +#if SIZEOF_SIZE_T > 4 +/* On a 64-bit platform, we consider 8GB "very large". */ +#define RAM_IS_VERY_LARGE(x) ((x) >= (8 * ONE_GIGABYTE)) +#else +/* On a 32-bit platform, we can't have 8GB of ram. */ +#define RAM_IS_VERY_LARGE(x) (0) +#endif + + if (RAM_IS_VERY_LARGE(ram)) { /* If we have 8 GB, or more, RAM available, we set the MaxMemInQueues * to 0.4 * RAM. The idea behind this value is that the amount of RAM * is more than enough for a single relay and should allow the relay

1 0

[tor/maint-0.3.3] Attempt to fix 32-bit builds, which broke with 31508a0abccfee1cd
by nickm＠torproject.org 12 Apr '18

12 Apr '18

commit 4aaa4215e7e11f318c5a50124e29dc0b50ce21e1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 12 12:24:36 2018 -0400 Attempt to fix 32-bit builds, which broke with 31508a0abccfee1cd When size_t is 32 bits, doing "size_t ram; if (ram > 8GB) { ... }" produces a compile-time warning. Bug caused by #24782 fix; not in any released Tor. --- src/or/config.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/or/config.c b/src/or/config.c index 6b8885521..986794cec 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4545,7 +4545,15 @@ compute_real_max_mem_in_queues(const uint64_t val, int log_guess) /* We detected the amount of memory available. */ uint64_t avail = 0; - if (ram >= (8 * ONE_GIGABYTE)) { +#if SIZEOF_SIZE_T > 4 +/* On a 64-bit platform, we consider 8GB "very large". */ +#define RAM_IS_VERY_LARGE(x) ((x) >= (8 * ONE_GIGABYTE)) +#else +/* On a 32-bit platform, we can't have 8GB of ram. */ +#define RAM_IS_VERY_LARGE(x) (0) +#endif + + if (RAM_IS_VERY_LARGE(ram)) { /* If we have 8 GB, or more, RAM available, we set the MaxMemInQueues * to 0.4 * RAM. The idea behind this value is that the amount of RAM * is more than enough for a single relay and should allow the relay

1 0

[tor/master] Merge branch 'maint-0.3.3'
by nickm＠torproject.org 12 Apr '18

12 Apr '18

commit 037fb0c804efda988c5c05f0384fccd426f807d0 Merge: a51630cc9 31508a0ab Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 12 11:14:42 2018 -0400 Merge branch 'maint-0.3.3' changes/bug24782 | 4 +++ src/common/compat.c | 4 +-- src/common/compat.h | 2 +- src/or/config.c | 35 +++++++++++++-------- src/or/config.h | 11 +++++++ src/test/test_config.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 123 insertions(+), 16 deletions(-)

1 0

[tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3
by nickm＠torproject.org 12 Apr '18

12 Apr '18

commit 85db0c46eb522c1ae2974306694cb35002ba62a2 Merge: 572077b7f 31508a0ab Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 12 11:14:42 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug24782 | 4 +++ src/common/compat.c | 4 +-- src/common/compat.h | 2 +- src/or/config.c | 35 +++++++++++++-------- src/or/config.h | 11 +++++++ src/test/test_config.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 123 insertions(+), 16 deletions(-)

1 0