tor-commits June 2018

tor-commits@lists.torproject.org

16 participants
2190 discussions

[tor/master] Move network_init to lib/net
by nickm＠torproject.org 28 Jun '18

28 Jun '18

commit 042df08693521a7cba990489fa03547a6e3fec4c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 28 11:59:16 2018 -0400 Move network_init to lib/net --- src/common/compat.c | 28 ---------------------------- src/lib/net/socket.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/common/compat.c b/src/common/compat.c index e71931aa1..f8333624c 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -429,34 +429,6 @@ compute_num_cpus(void) return num_cpus; } -/** Called before we make any calls to network-related functions. - * (Some operating systems require their network libraries to be - * initialized.) */ -int -network_init(void) -{ -#ifdef _WIN32 - /* This silly exercise is necessary before windows will allow - * gethostbyname to work. */ - WSADATA WSAData; - int r; - r = WSAStartup(0x101,&WSAData); - if (r) { - log_warn(LD_NET,"Error initializing windows network layer: code was %d",r); - return -1; - } - if (sizeof(SOCKET) != sizeof(tor_socket_t)) { - log_warn(LD_BUG,"The tor_socket_t type does not match SOCKET in size; Tor " - "might not work. (Sizes are %d and %d respectively.)", - (int)sizeof(tor_socket_t), (int)sizeof(SOCKET)); - } - /* WSAData.iMaxSockets might show the max sockets we're allowed to use. - * We might use it to complain if we're trying to be a server but have - * too few sockets available. */ -#endif /* defined(_WIN32) */ - return 0; -} - #if defined(HW_PHYSMEM64) /* This appears to be an OpenBSD thing */ #define INT64_HW_MEM HW_PHYSMEM64 diff --git a/src/lib/net/socket.c b/src/lib/net/socket.c index ae384bcd4..dc3d1531f 100644 --- a/src/lib/net/socket.c +++ b/src/lib/net/socket.c @@ -25,6 +25,34 @@ #include <stddef.h> #include <string.h> +/** Called before we make any calls to network-related functions. + * (Some operating systems require their network libraries to be + * initialized.) */ +int +network_init(void) +{ +#ifdef _WIN32 + /* This silly exercise is necessary before windows will allow + * gethostbyname to work. */ + WSADATA WSAData; + int r; + r = WSAStartup(0x101,&WSAData); + if (r) { + log_warn(LD_NET,"Error initializing windows network layer: code was %d",r); + return -1; + } + if (sizeof(SOCKET) != sizeof(tor_socket_t)) { + log_warn(LD_BUG,"The tor_socket_t type does not match SOCKET in size; Tor " + "might not work. (Sizes are %d and %d respectively.)", + (int)sizeof(tor_socket_t), (int)sizeof(SOCKET)); + } + /* WSAData.iMaxSockets might show the max sockets we're allowed to use. + * We might use it to complain if we're trying to be a server but have + * too few sockets available. */ +#endif /* defined(_WIN32) */ + return 0; +} + /* When set_max_file_sockets() is called, update this with the max file * descriptor value so we can use it to check the limit when opening a new * socket. Default value is what Debian sets as the default hard limit. */

1 0

[tor/master] Move compute_num_cpus to lib/thread
by nickm＠torproject.org 28 Jun '18

28 Jun '18

commit 6178a9f758d60f5fc896644f1b9b0aaf4c32f2a5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 28 12:08:18 2018 -0400 Move compute_num_cpus to lib/thread --- src/common/compat.c | 75 -------------------------------------- src/common/compat.h | 2 - src/lib/thread/include.am | 4 +- src/lib/thread/numcpus.c | 93 +++++++++++++++++++++++++++++++++++++++++++++++ src/lib/thread/numcpus.h | 11 ++++++ src/or/config.c | 1 + src/test/test_util.c | 1 + 7 files changed, 109 insertions(+), 78 deletions(-) diff --git a/src/common/compat.c b/src/common/compat.c index f8333624c..6d89e1c08 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -354,81 +354,6 @@ get_uname,(void)) * Process control */ -/** Implementation logic for compute_num_cpus(). */ -static int -compute_num_cpus_impl(void) -{ -#ifdef _WIN32 - SYSTEM_INFO info; - memset(&info, 0, sizeof(info)); - GetSystemInfo(&info); - if (info.dwNumberOfProcessors >= 1 && info.dwNumberOfProcessors < INT_MAX) - return (int)info.dwNumberOfProcessors; - else - return -1; -#elif defined(HAVE_SYSCONF) -#ifdef _SC_NPROCESSORS_CONF - long cpus_conf = sysconf(_SC_NPROCESSORS_CONF); -#else - long cpus_conf = -1; -#endif -#ifdef _SC_NPROCESSORS_ONLN - long cpus_onln = sysconf(_SC_NPROCESSORS_ONLN); -#else - long cpus_onln = -1; -#endif - long cpus = -1; - - if (cpus_conf > 0 && cpus_onln < 0) { - cpus = cpus_conf; - } else if (cpus_onln > 0 && cpus_conf < 0) { - cpus = cpus_onln; - } else if (cpus_onln > 0 && cpus_conf > 0) { - if (cpus_onln < cpus_conf) { - log_notice(LD_GENERAL, "I think we have %ld CPUS, but only %ld of them " - "are available. Telling Tor to only use %ld. You can over" - "ride this with the NumCPUs option", - cpus_conf, cpus_onln, cpus_onln); - } - cpus = cpus_onln; - } - - if (cpus >= 1 && cpus < INT_MAX) - return (int)cpus; - else - return -1; -#else - return -1; -#endif /* defined(_WIN32) || ... */ -} - -#define MAX_DETECTABLE_CPUS 16 - -/** Return how many CPUs we are running with. We assume that nobody is - * using hot-swappable CPUs, so we don't recompute this after the first - * time. Return -1 if we don't know how to tell the number of CPUs on this - * system. - */ -int -compute_num_cpus(void) -{ - static int num_cpus = -2; - if (num_cpus == -2) { - num_cpus = compute_num_cpus_impl(); - tor_assert(num_cpus != -2); - if (num_cpus > MAX_DETECTABLE_CPUS) { - /* LCOV_EXCL_START */ - log_notice(LD_GENERAL, "Wow! I detected that you have %d CPUs. I " - "will not autodetect any more than %d, though. If you " - "want to configure more, set NumCPUs in your torrc", - num_cpus, MAX_DETECTABLE_CPUS); - num_cpus = MAX_DETECTABLE_CPUS; - /* LCOV_EXCL_STOP */ - } - } - return num_cpus; -} - #if defined(HW_PHYSMEM64) /* This appears to be an OpenBSD thing */ #define INT64_HW_MEM HW_PHYSMEM64 diff --git a/src/common/compat.h b/src/common/compat.h index 13e20a4ac..5cd8e7215 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -133,8 +133,6 @@ typedef unsigned long rlim_t; int set_max_file_descriptors(rlim_t limit, int *max); MOCK_DECL(int, get_total_system_memory, (size_t *mem_out)); -int compute_num_cpus(void); - /** Macros for MIN/MAX. Never use these when the arguments could have * side-effects. * {With GCC extensions we could probably define a safer MIN/MAX. But diff --git a/src/lib/thread/include.am b/src/lib/thread/include.am index 0eac7edee..9ec23d166 100644 --- a/src/lib/thread/include.am +++ b/src/lib/thread/include.am @@ -14,6 +14,7 @@ endif src_lib_libtor_thread_a_SOURCES = \ src/lib/thread/compat_threads.c \ + src/lib/thread/numcpus.c \ $(threads_impl_source) src_lib_libtor_thread_testing_a_SOURCES = \ @@ -22,4 +23,5 @@ src_lib_libtor_thread_testing_a_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS) src_lib_libtor_thread_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) noinst_HEADERS += \ - src/lib/thread/threads.h + src/lib/thread/threads.h \ + src/lib/thread/numcpus.h diff --git a/src/lib/thread/numcpus.c b/src/lib/thread/numcpus.c new file mode 100644 index 000000000..534b0570f --- /dev/null +++ b/src/lib/thread/numcpus.c @@ -0,0 +1,93 @@ +/* Copyright (c) 2003-2004, Roger Dingledine + * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. + * Copyright (c) 2007-2018, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +#include "orconfig.h" +#include "lib/thread/numcpus.h" +#include "lib/log/torlog.h" +#include "lib/log/util_bug.h" + +#ifdef HAVE_UNISTD_H +#include <unistd.h> +#endif +#ifdef _WIN32 +#include <windows.h> +#endif + +#include <stdlib.h> + +/** Implementation logic for compute_num_cpus(). */ +static int +compute_num_cpus_impl(void) +{ +#ifdef _WIN32 + SYSTEM_INFO info; + memset(&info, 0, sizeof(info)); + GetSystemInfo(&info); + if (info.dwNumberOfProcessors >= 1 && info.dwNumberOfProcessors < INT_MAX) + return (int)info.dwNumberOfProcessors; + else + return -1; +#elif defined(HAVE_SYSCONF) +#ifdef _SC_NPROCESSORS_CONF + long cpus_conf = sysconf(_SC_NPROCESSORS_CONF); +#else + long cpus_conf = -1; +#endif +#ifdef _SC_NPROCESSORS_ONLN + long cpus_onln = sysconf(_SC_NPROCESSORS_ONLN); +#else + long cpus_onln = -1; +#endif + long cpus = -1; + + if (cpus_conf > 0 && cpus_onln < 0) { + cpus = cpus_conf; + } else if (cpus_onln > 0 && cpus_conf < 0) { + cpus = cpus_onln; + } else if (cpus_onln > 0 && cpus_conf > 0) { + if (cpus_onln < cpus_conf) { + log_notice(LD_GENERAL, "I think we have %ld CPUS, but only %ld of them " + "are available. Telling Tor to only use %ld. You can over" + "ride this with the NumCPUs option", + cpus_conf, cpus_onln, cpus_onln); + } + cpus = cpus_onln; + } + + if (cpus >= 1 && cpus < INT_MAX) + return (int)cpus; + else + return -1; +#else + return -1; +#endif /* defined(_WIN32) || ... */ +} + +#define MAX_DETECTABLE_CPUS 16 + +/** Return how many CPUs we are running with. We assume that nobody is + * using hot-swappable CPUs, so we don't recompute this after the first + * time. Return -1 if we don't know how to tell the number of CPUs on this + * system. + */ +int +compute_num_cpus(void) +{ + static int num_cpus = -2; + if (num_cpus == -2) { + num_cpus = compute_num_cpus_impl(); + tor_assert(num_cpus != -2); + if (num_cpus > MAX_DETECTABLE_CPUS) { + /* LCOV_EXCL_START */ + log_notice(LD_GENERAL, "Wow! I detected that you have %d CPUs. I " + "will not autodetect any more than %d, though. If you " + "want to configure more, set NumCPUs in your torrc", + num_cpus, MAX_DETECTABLE_CPUS); + num_cpus = MAX_DETECTABLE_CPUS; + /* LCOV_EXCL_STOP */ + } + } + return num_cpus; +} diff --git a/src/lib/thread/numcpus.h b/src/lib/thread/numcpus.h new file mode 100644 index 000000000..2899a9ec8 --- /dev/null +++ b/src/lib/thread/numcpus.h @@ -0,0 +1,11 @@ +/* Copyright (c) 2003-2004, Roger Dingledine + * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. + * Copyright (c) 2007-2018, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +#ifndef TOR_NUMCPUS_H +#define TOR_NUMCPUS_H + +int compute_num_cpus(void); + +#endif diff --git a/src/or/config.c b/src/or/config.c index 690025911..55dd1d7f8 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -117,6 +117,7 @@ #include "lib/process/setuid.h" #include "lib/process/subprocess.h" #include "lib/net/gethostname.h" +#include "lib/thread/numcpus.h" #include "lib/encoding/keyval.h" #include "lib/fs/conffile.h" diff --git a/src/test/test_util.c b/src/test/test_util.c index a6fb0ce84..bdc6fca7d 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -28,6 +28,7 @@ #include "lib/process/pidfile.h" #include "lib/process/subprocess.h" #include "lib/intmath/weakrng.h" +#include "lib/thread/numcpus.h" #ifdef HAVE_PWD_H #include <pwd.h>

1 0

[tor/master] Extract time functionality into lib/wallclock and lib/time
by nickm＠torproject.org 28 Jun '18

28 Jun '18

commit a097ddb4f5105d33146eb8f6afa7d6cd01d47fea Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 28 12:57:01 2018 -0400 Extract time functionality into lib/wallclock and lib/time --- .gitignore | 2 + Makefile.am | 2 + src/common/compat.h | 43 +-------- src/common/include.am | 2 - src/common/util.c | 146 ------------------------------- src/common/util.h | 3 - src/include.am | 1 + src/lib/time/.may_include | 8 ++ src/{common => lib/time}/compat_time.c | 16 +++- src/{common => lib/time}/compat_time.h | 2 + src/lib/time/include.am | 19 ++++ src/lib/time/tvdiff.c | 155 +++++++++++++++++++++++++++++++++ src/lib/time/tvdiff.h | 16 ++++ src/lib/wallclock/include.am | 1 + src/lib/wallclock/timeval.c | 0 src/lib/wallclock/timeval.h | 58 ++++++++++++ src/or/circuitstats.c | 1 + src/or/circuituse.c | 1 + src/or/geoip.c | 1 + src/test/test_util.c | 1 + 20 files changed, 281 insertions(+), 197 deletions(-) diff --git a/.gitignore b/.gitignore index c940166aa..0b45af3b6 100644 --- a/.gitignore +++ b/.gitignore @@ -203,6 +203,8 @@ uptime-*.json /src/lib/libtor-smartlist-core-testing.a /src/lib/libtor-thread.a /src/lib/libtor-thread-testing.a +/src/lib/libtor-time.a +/src/lib/libtor-time-testing.a /src/lib/libtor-tls.a /src/lib/libtor-tls-testing.a /src/lib/libtor-trace.a diff --git a/Makefile.am b/Makefile.am index 5a7271e30..d28eb6149 100644 --- a/Makefile.am +++ b/Makefile.am @@ -49,6 +49,7 @@ TOR_UTIL_LIBS = \ src/lib/libtor-thread.a \ src/lib/libtor-memarea.a \ src/lib/libtor-math.a \ + src/lib/libtor-time.a \ src/lib/libtor-log.a \ src/lib/libtor-lock.a \ src/lib/libtor-fdio.a \ @@ -73,6 +74,7 @@ TOR_UTIL_TESTING_LIBS = \ src/lib/libtor-thread-testing.a \ src/lib/libtor-memarea-testing.a \ src/lib/libtor-math-testing.a \ + src/lib/libtor-time-testing.a \ src/lib/libtor-log-testing.a \ src/lib/libtor-lock-testing.a \ src/lib/libtor-fdio-testing.a \ diff --git a/src/common/compat.h b/src/common/compat.h index 5cd8e7215..582945734 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -59,54 +59,13 @@ #include "lib/fs/files.h" #include "lib/fs/mmap.h" #include "lib/fs/userdb.h" +#include "lib/wallclock/timeval.h" #include <stdio.h> #include <errno.h> /* ===== Time compatibility */ -#ifndef timeradd -/** Replacement for timeradd on platforms that do not have it: sets tvout to - * the sum of tv1 and tv2. */ -#define timeradd(tv1,tv2,tvout) \ - do { \ - (tvout)->tv_sec = (tv1)->tv_sec + (tv2)->tv_sec; \ - (tvout)->tv_usec = (tv1)->tv_usec + (tv2)->tv_usec; \ - if ((tvout)->tv_usec >= 1000000) { \ - (tvout)->tv_usec -= 1000000; \ - (tvout)->tv_sec++; \ - } \ - } while (0) -#endif /* !defined(timeradd) */ - -#ifndef timersub -/** Replacement for timersub on platforms that do not have it: sets tvout to - * tv1 minus tv2. */ -#define timersub(tv1,tv2,tvout) \ - do { \ - (tvout)->tv_sec = (tv1)->tv_sec - (tv2)->tv_sec; \ - (tvout)->tv_usec = (tv1)->tv_usec - (tv2)->tv_usec; \ - if ((tvout)->tv_usec < 0) { \ - (tvout)->tv_usec += 1000000; \ - (tvout)->tv_sec--; \ - } \ - } while (0) -#endif /* !defined(timersub) */ - -#ifndef timercmp -/** Replacement for timercmp on platforms that do not have it: returns true - * iff the relational operator "op" makes the expression tv1 op tv2 true. - * - * Note that while this definition should work for all boolean operators, some - * platforms' native timercmp definitions do not support >=, <=, or ==. So - * don't use those. - */ -#define timercmp(tv1,tv2,op) \ - (((tv1)->tv_sec == (tv2)->tv_sec) ? \ - ((tv1)->tv_usec op (tv2)->tv_usec) : \ - ((tv1)->tv_sec op (tv2)->tv_sec)) -#endif /* !defined(timercmp) */ - /* ===== File compatibility */ /* ===== Net compatibility */ diff --git a/src/common/include.am b/src/common/include.am index 2d7297665..bb1a3ee42 100644 --- a/src/common/include.am +++ b/src/common/include.am @@ -27,7 +27,6 @@ LIBOR_A_SRC = \ src/common/address_set.c \ src/common/buffers.c \ src/common/compat.c \ - src/common/compat_time.c \ src/common/util.c \ src/common/token_bucket.c \ src/common/workqueue.c \ @@ -64,7 +63,6 @@ COMMONHEADERS = \ src/common/buffers.h \ src/common/compat.h \ src/common/compat_libevent.h \ - src/common/compat_time.h \ src/common/handles.h \ src/common/procmon.h \ src/common/timers.h \ diff --git a/src/common/util.c b/src/common/util.c index e1fae0dea..b31bb834e 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -135,152 +135,6 @@ ENABLE_GCC_WARNING(aggregate-return) * Time * ===== */ -#define TOR_USEC_PER_SEC 1000000 - -/** Return the difference between start->tv_sec and end->tv_sec. - * Returns INT64_MAX on overflow and underflow. - */ -static int64_t -tv_secdiff_impl(const struct timeval *start, const struct timeval *end) -{ - const int64_t s = (int64_t)start->tv_sec; - const int64_t e = (int64_t)end->tv_sec; - - /* This may not be the most efficient way of implemeting this check, - * but it's easy to see that it's correct and doesn't overflow */ - - if (s > 0 && e < INT64_MIN + s) { - /* s is positive: equivalent to e - s < INT64_MIN, but without any - * overflow */ - return INT64_MAX; - } else if (s < 0 && e > INT64_MAX + s) { - /* s is negative: equivalent to e - s > INT64_MAX, but without any - * overflow */ - return INT64_MAX; - } - - return e - s; -} - -/** Return the number of microseconds elapsed between *start and *end. - * Returns LONG_MAX on overflow and underflow. - */ -long -tv_udiff(const struct timeval *start, const struct timeval *end) -{ - /* Sanity check tv_usec */ - if (start->tv_usec > TOR_USEC_PER_SEC || start->tv_usec < 0) { - log_warn(LD_GENERAL, "comparing times on microsecond detail with bad " - "start tv_usec: " I64_FORMAT " microseconds", - I64_PRINTF_ARG(start->tv_usec)); - return LONG_MAX; - } - - if (end->tv_usec > TOR_USEC_PER_SEC || end->tv_usec < 0) { - log_warn(LD_GENERAL, "comparing times on microsecond detail with bad " - "end tv_usec: " I64_FORMAT " microseconds", - I64_PRINTF_ARG(end->tv_usec)); - return LONG_MAX; - } - - /* Some BSDs have struct timeval.tv_sec 64-bit, but time_t (and long) 32-bit - */ - int64_t udiff; - const int64_t secdiff = tv_secdiff_impl(start, end); - - /* end->tv_usec - start->tv_usec can be up to 1 second either way */ - if (secdiff > (int64_t)(LONG_MAX/1000000 - 1) || - secdiff < (int64_t)(LONG_MIN/1000000 + 1)) { - log_warn(LD_GENERAL, "comparing times on microsecond detail too far " - "apart: " I64_FORMAT " seconds", I64_PRINTF_ARG(secdiff)); - return LONG_MAX; - } - - /* we'll never get an overflow here, because we check that both usecs are - * between 0 and TV_USEC_PER_SEC. */ - udiff = secdiff*1000000 + ((int64_t)end->tv_usec - (int64_t)start->tv_usec); - - /* Some compilers are smart enough to work out this is a no-op on L64 */ -#if SIZEOF_LONG < 8 - if (udiff > (int64_t)LONG_MAX || udiff < (int64_t)LONG_MIN) { - return LONG_MAX; - } -#endif - - return (long)udiff; -} - -/** Return the number of milliseconds elapsed between *start and *end. - * If the tv_usec difference is 500, rounds away from zero. - * Returns LONG_MAX on overflow and underflow. - */ -long -tv_mdiff(const struct timeval *start, const struct timeval *end) -{ - /* Sanity check tv_usec */ - if (start->tv_usec > TOR_USEC_PER_SEC || start->tv_usec < 0) { - log_warn(LD_GENERAL, "comparing times on millisecond detail with bad " - "start tv_usec: " I64_FORMAT " microseconds", - I64_PRINTF_ARG(start->tv_usec)); - return LONG_MAX; - } - - if (end->tv_usec > TOR_USEC_PER_SEC || end->tv_usec < 0) { - log_warn(LD_GENERAL, "comparing times on millisecond detail with bad " - "end tv_usec: " I64_FORMAT " microseconds", - I64_PRINTF_ARG(end->tv_usec)); - return LONG_MAX; - } - - /* Some BSDs have struct timeval.tv_sec 64-bit, but time_t (and long) 32-bit - */ - int64_t mdiff; - const int64_t secdiff = tv_secdiff_impl(start, end); - - /* end->tv_usec - start->tv_usec can be up to 1 second either way, but the - * mdiff calculation may add another temporary second for rounding. - * Whether this actually causes overflow depends on the compiler's constant - * folding and order of operations. */ - if (secdiff > (int64_t)(LONG_MAX/1000 - 2) || - secdiff < (int64_t)(LONG_MIN/1000 + 1)) { - log_warn(LD_GENERAL, "comparing times on millisecond detail too far " - "apart: " I64_FORMAT " seconds", I64_PRINTF_ARG(secdiff)); - return LONG_MAX; - } - - /* Subtract and round */ - mdiff = secdiff*1000 + - /* We add a million usec here to ensure that the result is positive, - * so that the round-towards-zero behavior of the division will give - * the right result for rounding to the nearest msec. Later we subtract - * 1000 in order to get the correct result. - * We'll never get an overflow here, because we check that both usecs are - * between 0 and TV_USEC_PER_SEC. */ - ((int64_t)end->tv_usec - (int64_t)start->tv_usec + 500 + 1000000) / 1000 - - 1000; - - /* Some compilers are smart enough to work out this is a no-op on L64 */ -#if SIZEOF_LONG < 8 - if (mdiff > (int64_t)LONG_MAX || mdiff < (int64_t)LONG_MIN) { - return LONG_MAX; - } -#endif - - return (long)mdiff; -} - -/** - * Converts timeval to milliseconds. - */ -int64_t -tv_to_msec(const struct timeval *tv) -{ - int64_t conv = ((int64_t)tv->tv_sec)*1000L; - /* Round ghetto-style */ - conv += ((int64_t)tv->tv_usec+500)/1000L; - return conv; -} - #ifdef _WIN32 HANDLE load_windows_system_library(const TCHAR *library_name) diff --git a/src/common/util.h b/src/common/util.h index 3068f023a..f174cd366 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -66,9 +66,6 @@ void tor_log_mallinfo(int severity); /* String manipulation */ /* Time helpers */ -long tv_udiff(const struct timeval *start, const struct timeval *end); -long tv_mdiff(const struct timeval *start, const struct timeval *end); -int64_t tv_to_msec(const struct timeval *tv); /* File helpers */ diff --git a/src/include.am b/src/include.am index 8345813b7..ba5421e09 100644 --- a/src/include.am +++ b/src/include.am @@ -24,6 +24,7 @@ include src/lib/string/include.am include src/lib/smartlist_core/include.am include src/lib/testsupport/include.am include src/lib/thread/include.am +include src/lib/time/include.am include src/lib/tls/include.am include src/lib/trace/include.am include src/lib/wallclock/include.am diff --git a/src/lib/time/.may_include b/src/lib/time/.may_include new file mode 100644 index 000000000..a35e7a34e --- /dev/null +++ b/src/lib/time/.may_include @@ -0,0 +1,8 @@ +orconfig.h + +lib/cc/*.h +lib/err/*.h +lib/intmath/*.h +lib/log/*.h +lib/time/*.h +lib/wallclock/*.h diff --git a/src/common/compat_time.c b/src/lib/time/compat_time.c similarity index 99% rename from src/common/compat_time.c rename to src/lib/time/compat_time.c index 148f2f895..f50ccb5e3 100644 --- a/src/common/compat_time.c +++ b/src/lib/time/compat_time.c @@ -10,7 +10,12 @@ **/ #define COMPAT_TIME_PRIVATE -#include "common/compat.h" +#include "lib/time/compat_time.h" + +#include "lib/err/torerr.h" +#include "lib/log/torlog.h" +#include "lib/log/util_bug.h" +#include "lib/intmath/muldiv.h" #ifdef _WIN32 #include <winsock2.h> @@ -20,6 +25,9 @@ #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> #endif +#ifdef HAVE_SYS_TIME_H +#include <sys/time.h> +#endif #ifdef HAVE_UNISTD_H #include <unistd.h> #endif @@ -34,9 +42,9 @@ #include <mach/mach_time.h> #endif -#include "lib/err/torerr.h" -#include "lib/log/torlog.h" -#include "common/util.h" +#include <errno.h> +#include <stdlib.h> +#include <string.h> #ifdef _WIN32 #undef HAVE_CLOCK_GETTIME diff --git a/src/common/compat_time.h b/src/lib/time/compat_time.h similarity index 99% rename from src/common/compat_time.h rename to src/lib/time/compat_time.h index 2f7e87a63..4427ce8f9 100644 --- a/src/common/compat_time.h +++ b/src/lib/time/compat_time.h @@ -19,6 +19,8 @@ #define TOR_COMPAT_TIME_H #include "orconfig.h" +#include "lib/cc/torint.h" + #include "lib/wallclock/tor_gettimeofday.h" #ifdef _WIN32 diff --git a/src/lib/time/include.am b/src/lib/time/include.am new file mode 100644 index 000000000..a3f93a374 --- /dev/null +++ b/src/lib/time/include.am @@ -0,0 +1,19 @@ + +noinst_LIBRARIES += src/lib/libtor-time.a + +if UNITTESTS_ENABLED +noinst_LIBRARIES += src/lib/libtor-time-testing.a +endif + +src_lib_libtor_time_a_SOURCES = \ + src/lib/time/compat_time.c \ + src/lib/time/tvdiff.c + +src_lib_libtor_time_testing_a_SOURCES = \ + $(src_lib_libtor_time_a_SOURCES) +src_lib_libtor_time_testing_a_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS) +src_lib_libtor_time_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) + +noinst_HEADERS += \ + src/lib/time/compat_time.h \ + src/lib/time/tvdiff.h diff --git a/src/lib/time/tvdiff.c b/src/lib/time/tvdiff.c new file mode 100644 index 000000000..11c881234 --- /dev/null +++ b/src/lib/time/tvdiff.c @@ -0,0 +1,155 @@ +/* Copyright (c) 2003-2004, Roger Dingledine + * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. + * Copyright (c) 2007-2018, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +#include "lib/time/tvdiff.h" + +#include "lib/cc/compat_compiler.h" +#include "lib/log/torlog.h" + +#define TOR_USEC_PER_SEC 1000000 + +/** Return the difference between start->tv_sec and end->tv_sec. + * Returns INT64_MAX on overflow and underflow. + */ +static int64_t +tv_secdiff_impl(const struct timeval *start, const struct timeval *end) +{ + const int64_t s = (int64_t)start->tv_sec; + const int64_t e = (int64_t)end->tv_sec; + + /* This may not be the most efficient way of implemeting this check, + * but it's easy to see that it's correct and doesn't overflow */ + + if (s > 0 && e < INT64_MIN + s) { + /* s is positive: equivalent to e - s < INT64_MIN, but without any + * overflow */ + return INT64_MAX; + } else if (s < 0 && e > INT64_MAX + s) { + /* s is negative: equivalent to e - s > INT64_MAX, but without any + * overflow */ + return INT64_MAX; + } + + return e - s; +} + +/** Return the number of microseconds elapsed between *start and *end. + * Returns LONG_MAX on overflow and underflow. + */ +long +tv_udiff(const struct timeval *start, const struct timeval *end) +{ + /* Sanity check tv_usec */ + if (start->tv_usec > TOR_USEC_PER_SEC || start->tv_usec < 0) { + log_warn(LD_GENERAL, "comparing times on microsecond detail with bad " + "start tv_usec: " I64_FORMAT " microseconds", + I64_PRINTF_ARG(start->tv_usec)); + return LONG_MAX; + } + + if (end->tv_usec > TOR_USEC_PER_SEC || end->tv_usec < 0) { + log_warn(LD_GENERAL, "comparing times on microsecond detail with bad " + "end tv_usec: " I64_FORMAT " microseconds", + I64_PRINTF_ARG(end->tv_usec)); + return LONG_MAX; + } + + /* Some BSDs have struct timeval.tv_sec 64-bit, but time_t (and long) 32-bit + */ + int64_t udiff; + const int64_t secdiff = tv_secdiff_impl(start, end); + + /* end->tv_usec - start->tv_usec can be up to 1 second either way */ + if (secdiff > (int64_t)(LONG_MAX/1000000 - 1) || + secdiff < (int64_t)(LONG_MIN/1000000 + 1)) { + log_warn(LD_GENERAL, "comparing times on microsecond detail too far " + "apart: " I64_FORMAT " seconds", I64_PRINTF_ARG(secdiff)); + return LONG_MAX; + } + + /* we'll never get an overflow here, because we check that both usecs are + * between 0 and TV_USEC_PER_SEC. */ + udiff = secdiff*1000000 + ((int64_t)end->tv_usec - (int64_t)start->tv_usec); + + /* Some compilers are smart enough to work out this is a no-op on L64 */ +#if SIZEOF_LONG < 8 + if (udiff > (int64_t)LONG_MAX || udiff < (int64_t)LONG_MIN) { + return LONG_MAX; + } +#endif + + return (long)udiff; +} + +/** Return the number of milliseconds elapsed between *start and *end. + * If the tv_usec difference is 500, rounds away from zero. + * Returns LONG_MAX on overflow and underflow. + */ +long +tv_mdiff(const struct timeval *start, const struct timeval *end) +{ + /* Sanity check tv_usec */ + if (start->tv_usec > TOR_USEC_PER_SEC || start->tv_usec < 0) { + log_warn(LD_GENERAL, "comparing times on millisecond detail with bad " + "start tv_usec: " I64_FORMAT " microseconds", + I64_PRINTF_ARG(start->tv_usec)); + return LONG_MAX; + } + + if (end->tv_usec > TOR_USEC_PER_SEC || end->tv_usec < 0) { + log_warn(LD_GENERAL, "comparing times on millisecond detail with bad " + "end tv_usec: " I64_FORMAT " microseconds", + I64_PRINTF_ARG(end->tv_usec)); + return LONG_MAX; + } + + /* Some BSDs have struct timeval.tv_sec 64-bit, but time_t (and long) 32-bit + */ + int64_t mdiff; + const int64_t secdiff = tv_secdiff_impl(start, end); + + /* end->tv_usec - start->tv_usec can be up to 1 second either way, but the + * mdiff calculation may add another temporary second for rounding. + * Whether this actually causes overflow depends on the compiler's constant + * folding and order of operations. */ + if (secdiff > (int64_t)(LONG_MAX/1000 - 2) || + secdiff < (int64_t)(LONG_MIN/1000 + 1)) { + log_warn(LD_GENERAL, "comparing times on millisecond detail too far " + "apart: " I64_FORMAT " seconds", I64_PRINTF_ARG(secdiff)); + return LONG_MAX; + } + + /* Subtract and round */ + mdiff = secdiff*1000 + + /* We add a million usec here to ensure that the result is positive, + * so that the round-towards-zero behavior of the division will give + * the right result for rounding to the nearest msec. Later we subtract + * 1000 in order to get the correct result. + * We'll never get an overflow here, because we check that both usecs are + * between 0 and TV_USEC_PER_SEC. */ + ((int64_t)end->tv_usec - (int64_t)start->tv_usec + 500 + 1000000) / 1000 + - 1000; + + /* Some compilers are smart enough to work out this is a no-op on L64 */ +#if SIZEOF_LONG < 8 + if (mdiff > (int64_t)LONG_MAX || mdiff < (int64_t)LONG_MIN) { + return LONG_MAX; + } +#endif + + return (long)mdiff; +} + +/** + * Converts timeval to milliseconds. + */ +int64_t +tv_to_msec(const struct timeval *tv) +{ + int64_t conv = ((int64_t)tv->tv_sec)*1000L; + /* Round ghetto-style */ + conv += ((int64_t)tv->tv_usec+500)/1000L; + return conv; +} diff --git a/src/lib/time/tvdiff.h b/src/lib/time/tvdiff.h new file mode 100644 index 000000000..215de9cf3 --- /dev/null +++ b/src/lib/time/tvdiff.h @@ -0,0 +1,16 @@ +/* Copyright (c) 2003-2004, Roger Dingledine + * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. + * Copyright (c) 2007-2018, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +#ifndef TOR_TVDIFF_H +#define TOR_TVDIFF_H + +#include "lib/cc/torint.h" +struct timeval; + +long tv_udiff(const struct timeval *start, const struct timeval *end); +long tv_mdiff(const struct timeval *start, const struct timeval *end); +int64_t tv_to_msec(const struct timeval *tv); + +#endif diff --git a/src/lib/wallclock/include.am b/src/lib/wallclock/include.am index 7b735e97e..7864c21e1 100644 --- a/src/lib/wallclock/include.am +++ b/src/lib/wallclock/include.am @@ -17,5 +17,6 @@ src_lib_libtor_wallclock_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) noinst_HEADERS += \ src/lib/wallclock/approx_time.h \ + src/lib/wallclock/timeval.h \ src/lib/wallclock/tm_cvt.h \ src/lib/wallclock/tor_gettimeofday.h diff --git a/src/lib/wallclock/timeval.c b/src/lib/wallclock/timeval.c new file mode 100644 index 000000000..e69de29bb diff --git a/src/lib/wallclock/timeval.h b/src/lib/wallclock/timeval.h new file mode 100644 index 000000000..6a9b36a02 --- /dev/null +++ b/src/lib/wallclock/timeval.h @@ -0,0 +1,58 @@ +/* Copyright (c) 2003-2004, Roger Dingledine + * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. + * Copyright (c) 2007-2018, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +#ifndef TOR_TIMEVAL_H +#define TOR_TIMEVAL_H + +#include "orconfig.h" +#include "lib/cc/torint.h" + +#ifdef HAVE_SYS_TIME_H +#include <sys/time.h> +#endif + +#ifndef timeradd +/** Replacement for timeradd on platforms that do not have it: sets tvout to + * the sum of tv1 and tv2. */ +#define timeradd(tv1,tv2,tvout) \ + do { \ + (tvout)->tv_sec = (tv1)->tv_sec + (tv2)->tv_sec; \ + (tvout)->tv_usec = (tv1)->tv_usec + (tv2)->tv_usec; \ + if ((tvout)->tv_usec >= 1000000) { \ + (tvout)->tv_usec -= 1000000; \ + (tvout)->tv_sec++; \ + } \ + } while (0) +#endif /* !defined(timeradd) */ + +#ifndef timersub +/** Replacement for timersub on platforms that do not have it: sets tvout to + * tv1 minus tv2. */ +#define timersub(tv1,tv2,tvout) \ + do { \ + (tvout)->tv_sec = (tv1)->tv_sec - (tv2)->tv_sec; \ + (tvout)->tv_usec = (tv1)->tv_usec - (tv2)->tv_usec; \ + if ((tvout)->tv_usec < 0) { \ + (tvout)->tv_usec += 1000000; \ + (tvout)->tv_sec--; \ + } \ + } while (0) +#endif /* !defined(timersub) */ + +#ifndef timercmp +/** Replacement for timercmp on platforms that do not have it: returns true + * iff the relational operator "op" makes the expression tv1 op tv2 true. + * + * Note that while this definition should work for all boolean operators, some + * platforms' native timercmp definitions do not support >=, <=, or ==. So + * don't use those. + */ +#define timercmp(tv1,tv2,op) \ + (((tv1)->tv_sec == (tv2)->tv_sec) ? \ + ((tv1)->tv_usec op (tv2)->tv_usec) : \ + ((tv1)->tv_sec op (tv2)->tv_sec)) +#endif /* !defined(timercmp) */ + +#endif diff --git a/src/or/circuitstats.c b/src/or/circuitstats.c index 08186ca9a..c2abb2d14 100644 --- a/src/or/circuitstats.c +++ b/src/or/circuitstats.c @@ -41,6 +41,7 @@ #include "or/circuitlist.h" #include "or/circuituse.h" #include "lib/math/fp.h" +#include "lib/time/tvdiff.h" #include "or/crypt_path_st.h" #include "or/origin_circuit_st.h" diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 3669eb7f1..71abd5d6c 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -57,6 +57,7 @@ #include "or/router.h" #include "or/routerlist.h" #include "lib/math/fp.h" +#include "lib/time/tvdiff.h" #include "or/cpath_build_state_st.h" #include "or/dir_connection_st.h" diff --git a/src/or/geoip.c b/src/or/geoip.c index 330477e4c..4a55e3f8d 100644 --- a/src/or/geoip.c +++ b/src/or/geoip.c @@ -39,6 +39,7 @@ #include "or/routerlist.h" #include "lib/container/order.h" +#include "lib/time/tvdiff.h" static void init_geoip_countries(void); diff --git a/src/test/test_util.c b/src/test/test_util.c index 8fe308826..220b05b49 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -31,6 +31,7 @@ #include "lib/thread/numcpus.h" #include "lib/math/fp.h" #include "lib/math/laplace.h" +#include "lib/time/tvdiff.h" #ifdef HAVE_PWD_H #include <pwd.h>

1 0

[tor/master] Use tor_ntohs in compress.c; avoid a winsocks dependency
by nickm＠torproject.org 28 Jun '18

28 Jun '18

commit 7d7af19f1b282554df5117c5c963736d0253a8d5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 28 13:39:49 2018 -0400 Use tor_ntohs in compress.c; avoid a winsocks dependency --- src/lib/compress/compress.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/compress/compress.c b/src/lib/compress/compress.c index 23a5c0304..2cb5dbaec 100644 --- a/src/lib/compress/compress.c +++ b/src/lib/compress/compress.c @@ -281,7 +281,7 @@ detect_compression_method(const char *in, size_t in_len) if (in_len > 2 && fast_memeq(in, "\x1f\x8b", 2)) { return GZIP_METHOD; } else if (in_len > 2 && (in[0] & 0x0f) == 8 && - (ntohs(get_uint16(in)) % 31) == 0) { + (tor_ntohs(get_uint16(in)) % 31) == 0) { return ZLIB_METHOD; } else if (in_len > 2 && fast_memeq(in, "\x5d\x00\x00", 3)) {

1 0

[tor/master] Move DLL support to lib/fs
by nickm＠torproject.org 28 Jun '18

28 Jun '18

commit 02bb701bba5fb6b5eb6ce5716b8fff9fd2c5e028 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 28 13:37:51 2018 -0400 Move DLL support to lib/fs --- src/common/util.c | 15 --------------- src/common/util.h | 5 +---- src/lib/fs/include.am | 7 ++++++- src/lib/fs/winlib.c | 21 +++++++++++++++++++++ src/lib/fs/winlib.h | 16 ++++++++++++++++ 5 files changed, 44 insertions(+), 20 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index b31bb834e..135af77c6 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -134,18 +134,3 @@ ENABLE_GCC_WARNING(aggregate-return) /* ===== * Time * ===== */ - -#ifdef _WIN32 -HANDLE -load_windows_system_library(const TCHAR *library_name) -{ - TCHAR path[MAX_PATH]; - unsigned n; - n = GetSystemDirectory(path, MAX_PATH); - if (n == 0 || n + _tcslen(library_name) + 2 >= MAX_PATH) - return 0; - _tcscat(path, TEXT("\\")); - _tcscat(path, library_name); - return LoadLibrary(path); -} -#endif /* defined(_WIN32) */ diff --git a/src/common/util.h b/src/common/util.h index f174cd366..ffd958c42 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -40,6 +40,7 @@ #include "lib/fs/path.h" #include "lib/encoding/time_fmt.h" #include "lib/encoding/cstring.h" +#include "lib/fs/winlib.h" void tor_log_mallinfo(int severity); @@ -76,8 +77,4 @@ void tor_log_mallinfo(int severity); ((isSock) ? read_all_from_socket((fd), (buf), (count)) \ : read_all_from_fd((int)(fd), (buf), (count))) -#ifdef _WIN32 -HANDLE load_windows_system_library(const TCHAR *library_name); -#endif - #endif /* !defined(TOR_UTIL_H) */ diff --git a/src/lib/fs/include.am b/src/lib/fs/include.am index 0256c0f2f..a025eb81c 100644 --- a/src/lib/fs/include.am +++ b/src/lib/fs/include.am @@ -15,6 +15,10 @@ src_lib_libtor_fs_a_SOURCES = \ src/lib/fs/storagedir.c \ src/lib/fs/userdb.c +if WIN32 +src_lib_libtor_fs_a_SOURCES += src/lib/fs/winlib.c +endif + src_lib_libtor_fs_testing_a_SOURCES = \ $(src_lib_libtor_fs_a_SOURCES) src_lib_libtor_fs_testing_a_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS) @@ -28,4 +32,5 @@ noinst_HEADERS += \ src/lib/fs/mmap.h \ src/lib/fs/path.h \ src/lib/fs/storagedir.h \ - src/lib/fs/userdb.h + src/lib/fs/userdb.h \ + src/lib/fs/winlib.h diff --git a/src/lib/fs/winlib.c b/src/lib/fs/winlib.c new file mode 100644 index 000000000..7a88a841a --- /dev/null +++ b/src/lib/fs/winlib.c @@ -0,0 +1,21 @@ +/* Copyright (c) 2003, Roger Dingledine + * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. + * Copyright (c) 2007-2018, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +#ifdef _WIN32 +#include "lib/fs/winlib.h" + +HANDLE +load_windows_system_library(const TCHAR *library_name) +{ + TCHAR path[MAX_PATH]; + unsigned n; + n = GetSystemDirectory(path, MAX_PATH); + if (n == 0 || n + _tcslen(library_name) + 2 >= MAX_PATH) + return 0; + _tcscat(path, TEXT("\\")); + _tcscat(path, library_name); + return LoadLibrary(path); +} +#endif /* defined(_WIN32) */ diff --git a/src/lib/fs/winlib.h b/src/lib/fs/winlib.h new file mode 100644 index 000000000..f53f04645 --- /dev/null +++ b/src/lib/fs/winlib.h @@ -0,0 +1,16 @@ +/* Copyright (c) 2003, Roger Dingledine + * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. + * Copyright (c) 2007-2018, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +#ifndef TOR_WINLIB_H +#define TOR_WINLIB_H + +#ifdef _WIN32 +#include <windows.h> +#include <tchar.h> + +HANDLE load_windows_system_library(const TCHAR *library_name); +#endif + +#endif

1 0

[tor/master] Move floating-point math functions into a new lib/math
by nickm＠torproject.org 28 Jun '18

28 Jun '18

commit bdea94a6653240e0e477eda186ceccbe6be00535 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 28 12:24:45 2018 -0400 Move floating-point math functions into a new lib/math --- .gitignore | 2 + Makefile.am | 2 + src/common/util.c | 158 ---------------------------------------------- src/common/util.h | 7 -- src/include.am | 1 + src/lib/math/.may_include | 5 ++ src/lib/math/fp.c | 113 +++++++++++++++++++++++++++++++++ src/lib/math/fp.h | 17 +++++ src/lib/math/include.am | 20 ++++++ src/lib/math/laplace.c | 67 ++++++++++++++++++++ src/lib/math/laplace.h | 16 +++++ src/or/circpathbias.c | 3 +- src/or/circuitstats.c | 2 +- src/or/circuituse.c | 2 +- src/or/entrynodes.c | 1 + src/or/rephist.c | 2 + src/or/routerlist.c | 1 + src/or/scheduler_kist.c | 2 +- src/test/test_util.c | 2 + 19 files changed, 254 insertions(+), 169 deletions(-) diff --git a/.gitignore b/.gitignore index 8f2d66b0d..c940166aa 100644 --- a/.gitignore +++ b/.gitignore @@ -187,6 +187,8 @@ uptime-*.json /src/lib/libtor-log-testing.a /src/lib/libtor-malloc.a /src/lib/libtor-malloc-testing.a +/src/lib/libtor-math.a +/src/lib/libtor-math-testing.a /src/lib/libtor-memarea.a /src/lib/libtor-memarea-testing.a /src/lib/libtor-net.a diff --git a/Makefile.am b/Makefile.am index f28eae3bb..5a7271e30 100644 --- a/Makefile.am +++ b/Makefile.am @@ -48,6 +48,7 @@ TOR_UTIL_LIBS = \ src/lib/libtor-net.a \ src/lib/libtor-thread.a \ src/lib/libtor-memarea.a \ + src/lib/libtor-math.a \ src/lib/libtor-log.a \ src/lib/libtor-lock.a \ src/lib/libtor-fdio.a \ @@ -71,6 +72,7 @@ TOR_UTIL_TESTING_LIBS = \ src/lib/libtor-net-testing.a \ src/lib/libtor-thread-testing.a \ src/lib/libtor-memarea-testing.a \ + src/lib/libtor-math-testing.a \ src/lib/libtor-log-testing.a \ src/lib/libtor-lock-testing.a \ src/lib/libtor-fdio-testing.a \ diff --git a/src/common/util.c b/src/common/util.c index 6a557c956..e1fae0dea 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -127,100 +127,6 @@ ENABLE_GCC_WARNING(aggregate-return) * Math * ===== */ -/** - * Returns the natural logarithm of d base e. We defined this wrapper here so - * to avoid conflicts with old versions of tor_log(), which were named log(). - */ -double -tor_mathlog(double d) -{ - return log(d); -} - -/** Return the long integer closest to d. We define this wrapper - * here so that not all users of math.h need to use the right incantations - * to get the c99 functions. */ -long -tor_lround(double d) -{ -#if defined(HAVE_LROUND) - return lround(d); -#elif defined(HAVE_RINT) - return (long)rint(d); -#else - return (long)(d > 0 ? d + 0.5 : ceil(d - 0.5)); -#endif /* defined(HAVE_LROUND) || ... */ -} - -/** Return the 64-bit integer closest to d. We define this wrapper here so - * that not all users of math.h need to use the right incantations to get the - * c99 functions. */ -int64_t -tor_llround(double d) -{ -#if defined(HAVE_LLROUND) - return (int64_t)llround(d); -#elif defined(HAVE_RINT) - return (int64_t)rint(d); -#else - return (int64_t)(d > 0 ? d + 0.5 : ceil(d - 0.5)); -#endif /* defined(HAVE_LLROUND) || ... */ -} - -/** Transform a random value p from the uniform distribution in - * [0.0, 1.0[ into a Laplace distributed value with location parameter - * mu and scale parameter b. Truncate the final result - * to be an integer in [INT64_MIN, INT64_MAX]. */ -int64_t -sample_laplace_distribution(double mu, double b, double p) -{ - double result; - tor_assert(p >= 0.0 && p < 1.0); - - /* This is the "inverse cumulative distribution function" from: - * http://en.wikipedia.org/wiki/Laplace_distribution */ - if (p <= 0.0) { - /* Avoid taking log(0.0) == -INFINITY, as some processors or compiler - * options can cause the program to trap. */ - return INT64_MIN; - } - - result = mu - b * (p > 0.5 ? 1.0 : -1.0) - * tor_mathlog(1.0 - 2.0 * fabs(p - 0.5)); - - return clamp_double_to_int64(result); -} - -/** Add random noise between INT64_MIN and INT64_MAX coming from a Laplace - * distribution with mu = 0 and b = delta_f/epsilon to - * signal based on the provided random value in [0.0, 1.0[. - * The epsilon value must be between ]0.0, 1.0]. delta_f must be greater - * than 0. */ -int64_t -add_laplace_noise(int64_t signal_, double random_, double delta_f, - double epsilon) -{ - int64_t noise; - - /* epsilon MUST be between ]0.0, 1.0] */ - tor_assert(epsilon > 0.0 && epsilon <= 1.0); - /* delta_f MUST be greater than 0. */ - tor_assert(delta_f > 0.0); - - /* Just add noise, no further signal */ - noise = sample_laplace_distribution(0.0, - delta_f / epsilon, - random_); - - /* Clip (signal + noise) to [INT64_MIN, INT64_MAX] */ - if (noise > 0 && INT64_MAX - noise < signal_) - return INT64_MAX; - else if (noise < 0 && INT64_MIN - noise > signal_) - return INT64_MIN; - else - return signal_ + noise; -} - /* ===== * String manipulation * ===== */ @@ -389,67 +295,3 @@ load_windows_system_library(const TCHAR *library_name) return LoadLibrary(path); } #endif /* defined(_WIN32) */ - -/** 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 -clamp_double_to_int64(double number) -{ - int exponent; - -#if defined(MINGW_ANY) && GCC_VERSION >= 409 -/* - Mingw's math.h uses gcc's __builtin_choose_expr() facility to declare - isnan, isfinite, and signbit. But as implemented in at least some - versions of gcc, __builtin_choose_expr() can generate type warnings - even from branches that are not taken. So, suppress those warnings. -*/ -#define PROBLEMATIC_FLOAT_CONVERSION_WARNING -DISABLE_GCC_WARNING(float-conversion) -#endif /* defined(MINGW_ANY) && GCC_VERSION >= 409 */ - -/* - With clang 4.0 we apparently run into "double promotion" warnings here, - since clang thinks we're promoting a double to a long double. - */ -#if defined(__clang__) -#if __has_warning("-Wdouble-promotion") -#define PROBLEMATIC_DOUBLE_PROMOTION_WARNING -DISABLE_GCC_WARNING(double-promotion) -#endif -#endif /* defined(__clang__) */ - - /* 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 - * are exponent unspecified. */ - frexp(number, &exponent); - - /* 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) && exponent <= 63) { - return (int64_t)number; - } - - /* Handle infinities and finite numbers with magnitude >= 2^63. */ - return signbit(number) ? INT64_MIN : INT64_MAX; - -#ifdef PROBLEMATIC_DOUBLE_PROMOTION_WARNING -ENABLE_GCC_WARNING(double-promotion) -#endif -#ifdef PROBLEMATIC_FLOAT_CONVERSION_WARNING -ENABLE_GCC_WARNING(float-conversion) -#endif -} diff --git a/src/common/util.h b/src/common/util.h index 0f991f8c4..3068f023a 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -62,13 +62,6 @@ void tor_log_mallinfo(int severity); #define bool_neq(a,b) (!(a)!=!(b)) /* Math functions */ -double tor_mathlog(double d) ATTR_CONST; -long tor_lround(double d) ATTR_CONST; -int64_t tor_llround(double d) ATTR_CONST; -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); -int64_t clamp_double_to_int64(double number); /* String manipulation */ diff --git a/src/include.am b/src/include.am index 621c906d9..8345813b7 100644 --- a/src/include.am +++ b/src/include.am @@ -14,6 +14,7 @@ include src/lib/include.libdonna.am include src/lib/intmath/include.am include src/lib/lock/include.am include src/lib/log/include.am +include src/lib/math/include.am include src/lib/memarea/include.am include src/lib/malloc/include.am include src/lib/net/include.am diff --git a/src/lib/math/.may_include b/src/lib/math/.may_include new file mode 100644 index 000000000..1fd26864d --- /dev/null +++ b/src/lib/math/.may_include @@ -0,0 +1,5 @@ +orconfig.h + +lib/cc/*.h +lib/log/*.h +lib/math/*.h diff --git a/src/lib/math/fp.c b/src/lib/math/fp.c new file mode 100644 index 000000000..d1c442825 --- /dev/null +++ b/src/lib/math/fp.c @@ -0,0 +1,113 @@ +/* Copyright (c) 2003, Roger Dingledine + * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. + * Copyright (c) 2007-2018, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +#include "orconfig.h" +#include "lib/math/fp.h" + +#include <math.h> + +/** + * Returns the natural logarithm of d base e. We defined this wrapper here so + * to avoid conflicts with old versions of tor_log(), which were named log(). + */ +double +tor_mathlog(double d) +{ + return log(d); +} + +/** Return the long integer closest to d. We define this wrapper + * here so that not all users of math.h need to use the right incantations + * to get the c99 functions. */ +long +tor_lround(double d) +{ +#if defined(HAVE_LROUND) + return lround(d); +#elif defined(HAVE_RINT) + return (long)rint(d); +#else + return (long)(d > 0 ? d + 0.5 : ceil(d - 0.5)); +#endif /* defined(HAVE_LROUND) || ... */ +} + +/** Return the 64-bit integer closest to d. We define this wrapper here so + * that not all users of math.h need to use the right incantations to get the + * c99 functions. */ +int64_t +tor_llround(double d) +{ +#if defined(HAVE_LLROUND) + return (int64_t)llround(d); +#elif defined(HAVE_RINT) + return (int64_t)rint(d); +#else + return (int64_t)(d > 0 ? d + 0.5 : ceil(d - 0.5)); +#endif /* defined(HAVE_LLROUND) || ... */ +} + +/** 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 +clamp_double_to_int64(double number) +{ + int exponent; + +#if defined(MINGW_ANY) && GCC_VERSION >= 409 +/* + Mingw's math.h uses gcc's __builtin_choose_expr() facility to declare + isnan, isfinite, and signbit. But as implemented in at least some + versions of gcc, __builtin_choose_expr() can generate type warnings + even from branches that are not taken. So, suppress those warnings. +*/ +#define PROBLEMATIC_FLOAT_CONVERSION_WARNING +DISABLE_GCC_WARNING(float-conversion) +#endif /* defined(MINGW_ANY) && GCC_VERSION >= 409 */ + +/* + With clang 4.0 we apparently run into "double promotion" warnings here, + since clang thinks we're promoting a double to a long double. + */ +#if defined(__clang__) +#if __has_warning("-Wdouble-promotion") +#define PROBLEMATIC_DOUBLE_PROMOTION_WARNING +DISABLE_GCC_WARNING(double-promotion) +#endif +#endif /* defined(__clang__) */ + + /* 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 + * are exponent unspecified. */ + frexp(number, &exponent); + + /* 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) && exponent <= 63) { + return (int64_t)number; + } + + /* Handle infinities and finite numbers with magnitude >= 2^63. */ + return signbit(number) ? INT64_MIN : INT64_MAX; + +#ifdef PROBLEMATIC_DOUBLE_PROMOTION_WARNING +ENABLE_GCC_WARNING(double-promotion) +#endif +#ifdef PROBLEMATIC_FLOAT_CONVERSION_WARNING +ENABLE_GCC_WARNING(float-conversion) +#endif +} diff --git a/src/lib/math/fp.h b/src/lib/math/fp.h new file mode 100644 index 000000000..b35c18a1c --- /dev/null +++ b/src/lib/math/fp.h @@ -0,0 +1,17 @@ +/* Copyright (c) 2003, Roger Dingledine + * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. + * Copyright (c) 2007-2018, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +#ifndef TOR_FP_H +#define TOR_FP_H + +#include "lib/cc/compat_compiler.h" +#include "lib/cc/torint.h" + +double tor_mathlog(double d) ATTR_CONST; +long tor_lround(double d) ATTR_CONST; +int64_t tor_llround(double d) ATTR_CONST; +int64_t clamp_double_to_int64(double number); + +#endif diff --git a/src/lib/math/include.am b/src/lib/math/include.am new file mode 100644 index 000000000..b088b3f3c --- /dev/null +++ b/src/lib/math/include.am @@ -0,0 +1,20 @@ + +noinst_LIBRARIES += src/lib/libtor-math.a + +if UNITTESTS_ENABLED +noinst_LIBRARIES += src/lib/libtor-math-testing.a +endif + +src_lib_libtor_math_a_SOURCES = \ + src/lib/math/fp.c \ + src/lib/math/laplace.c + + +src_lib_libtor_math_testing_a_SOURCES = \ + $(src_lib_libtor_math_a_SOURCES) +src_lib_libtor_math_testing_a_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS) +src_lib_libtor_math_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) + +noinst_HEADERS += \ + src/lib/math/fp.h \ + src/lib/math/laplace.h diff --git a/src/lib/math/laplace.c b/src/lib/math/laplace.c new file mode 100644 index 000000000..8e45a1fb3 --- /dev/null +++ b/src/lib/math/laplace.c @@ -0,0 +1,67 @@ +/* Copyright (c) 2003, Roger Dingledine + * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. + * Copyright (c) 2007-2018, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +#include "orconfig.h" +#include "lib/math/laplace.h" +#include "lib/math/fp.h" + +#include "lib/log/util_bug.h" + +#include <math.h> +#include <stdlib.h> + +/** Transform a random value p from the uniform distribution in + * [0.0, 1.0[ into a Laplace distributed value with location parameter + * mu and scale parameter b. Truncate the final result + * to be an integer in [INT64_MIN, INT64_MAX]. */ +int64_t +sample_laplace_distribution(double mu, double b, double p) +{ + double result; + tor_assert(p >= 0.0 && p < 1.0); + + /* This is the "inverse cumulative distribution function" from: + * http://en.wikipedia.org/wiki/Laplace_distribution */ + if (p <= 0.0) { + /* Avoid taking log(0.0) == -INFINITY, as some processors or compiler + * options can cause the program to trap. */ + return INT64_MIN; + } + + result = mu - b * (p > 0.5 ? 1.0 : -1.0) + * tor_mathlog(1.0 - 2.0 * fabs(p - 0.5)); + + return clamp_double_to_int64(result); +} + +/** Add random noise between INT64_MIN and INT64_MAX coming from a Laplace + * distribution with mu = 0 and b = delta_f/epsilon to + * signal based on the provided random value in [0.0, 1.0[. + * The epsilon value must be between ]0.0, 1.0]. delta_f must be greater + * than 0. */ +int64_t +add_laplace_noise(int64_t signal_, double random_, double delta_f, + double epsilon) +{ + int64_t noise; + + /* epsilon MUST be between ]0.0, 1.0] */ + tor_assert(epsilon > 0.0 && epsilon <= 1.0); + /* delta_f MUST be greater than 0. */ + tor_assert(delta_f > 0.0); + + /* Just add noise, no further signal */ + noise = sample_laplace_distribution(0.0, + delta_f / epsilon, + random_); + + /* Clip (signal + noise) to [INT64_MIN, INT64_MAX] */ + if (noise > 0 && INT64_MAX - noise < signal_) + return INT64_MAX; + else if (noise < 0 && INT64_MIN - noise > signal_) + return INT64_MIN; + else + return signal_ + noise; +} diff --git a/src/lib/math/laplace.h b/src/lib/math/laplace.h new file mode 100644 index 000000000..b22862e64 --- /dev/null +++ b/src/lib/math/laplace.h @@ -0,0 +1,16 @@ +/* Copyright (c) 2003, Roger Dingledine + * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. + * Copyright (c) 2007-2018, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +#ifndef TOR_LAPLACE_H +#define TOR_LAPLACE_H + +#include "lib/cc/compat_compiler.h" +#include "lib/cc/torint.h" + +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); + +#endif diff --git a/src/or/circpathbias.c b/src/or/circpathbias.c index 908b76b48..32b3212d3 100644 --- a/src/or/circpathbias.c +++ b/src/or/circpathbias.c @@ -34,6 +34,8 @@ #include "or/entrynodes.h" #include "or/networkstatus.h" #include "or/relay.h" +#include "lib/math/fp.h" +#include "lib/math/laplace.h" #include "or/cell_st.h" #include "or/cpath_build_state_st.h" @@ -1574,4 +1576,3 @@ pathbias_scale_use_rates(entry_guard_t *guard) entry_guards_changed(); } } - diff --git a/src/or/circuitstats.c b/src/or/circuitstats.c index 34605457d..08186ca9a 100644 --- a/src/or/circuitstats.c +++ b/src/or/circuitstats.c @@ -40,6 +40,7 @@ #include "or/statefile.h" #include "or/circuitlist.h" #include "or/circuituse.h" +#include "lib/math/fp.h" #include "or/crypt_path_st.h" #include "or/origin_circuit_st.h" @@ -1946,4 +1947,3 @@ cbt_control_event_buildtimeout_set(const circuit_build_times_t *cbt, tor_free(args); } - diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 0ba3f34b4..3669eb7f1 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -56,6 +56,7 @@ #include "or/rephist.h" #include "or/router.h" #include "or/routerlist.h" +#include "lib/math/fp.h" #include "or/cpath_build_state_st.h" #include "or/dir_connection_st.h" @@ -3152,4 +3153,3 @@ circuit_read_valid_data(origin_circuit_t *circ, uint16_t relay_body_len) tor_add_u32_nowrap(circ->n_overhead_read_circ_bw, RELAY_PAYLOAD_SIZE-relay_body_len); } - diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index 47e689b5c..191933622 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -138,6 +138,7 @@ #include "or/routerset.h" #include "or/transports.h" #include "or/statefile.h" +#include "lib/math/fp.h" #include "or/node_st.h" #include "or/origin_circuit_st.h" diff --git a/src/or/rephist.c b/src/or/rephist.c index 2103eecdf..907b01d68 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -94,6 +94,8 @@ #include "lib/container/bloomfilt.h" #include "lib/container/order.h" +#include "lib/math/fp.h" +#include "lib/math/laplace.h" static void bw_arrays_init(void); static void predicted_ports_alloc(void); diff --git a/src/or/routerlist.c b/src/or/routerlist.c index a86e29adb..68fd76344 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -121,6 +121,7 @@ #include "or/routerset.h" #include "lib/sandbox/sandbox.h" #include "or/torcert.h" +#include "lib/math/fp.h" #include "or/dirauth/dirvote.h" #include "or/dirauth/mode.h" diff --git a/src/or/scheduler_kist.c b/src/or/scheduler_kist.c index 6f07458d4..b62281d58 100644 --- a/src/or/scheduler_kist.c +++ b/src/or/scheduler_kist.c @@ -13,6 +13,7 @@ #include "or/channeltls.h" #define SCHEDULER_PRIVATE_ #include "or/scheduler.h" +#include "lib/math/fp.h" #include "or/or_connection_st.h" @@ -835,4 +836,3 @@ scheduler_can_use_kist(void) } #endif /* defined(HAVE_KIST_SUPPORT) */ - diff --git a/src/test/test_util.c b/src/test/test_util.c index bdc6fca7d..8fe308826 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -29,6 +29,8 @@ #include "lib/process/subprocess.h" #include "lib/intmath/weakrng.h" #include "lib/thread/numcpus.h" +#include "lib/math/fp.h" +#include "lib/math/laplace.h" #ifdef HAVE_PWD_H #include <pwd.h>

1 0

[tor/master] Remove a pair of windows flags used nowhere in our code
by nickm＠torproject.org 28 Jun '18

28 Jun '18

commit 8736892679eabeecfa87f9bf19ac22245dc711c0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 28 13:02:33 2018 -0400 Remove a pair of windows flags used nowhere in our code --- src/common/compat.h | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/src/common/compat.h b/src/common/compat.h index ca18970cb..43e98d906 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -105,21 +105,6 @@ MOCK_DECL(int, get_total_system_memory, (size_t *mem_out)); #define MIN(a,b) ( ((a)>(b)) ? (b) : (a) ) #endif -/*for some reason my compiler doesn't have these version flags defined - a nice homework assignment for someone one day is to define the rest*/ -//these are the values as given on MSDN -#ifdef _WIN32 - -#ifndef VER_SUITE_EMBEDDEDNT -#define VER_SUITE_EMBEDDEDNT 0x00000040 -#endif - -#ifndef VER_SUITE_SINGLEUSERTS -#define VER_SUITE_SINGLEUSERTS 0x00000100 -#endif - -#endif /* defined(_WIN32) */ - ssize_t tor_getpass(const char *prompt, char *output, size_t buflen); /* This needs some of the declarations above so we include it here. */

1 0

[tor/master] Fix up the include path of compat_time.h (automated)
by nickm＠torproject.org 28 Jun '18

28 Jun '18

commit 57f4b8385232a15a6713eacc9eb197e1b2f2067d Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 28 12:58:53 2018 -0400 Fix up the include path of compat_time.h (automated) --- src/common/compat.h | 2 +- src/or/channel.c | 2 +- src/or/channelpadding.c | 2 +- src/test/test_channelpadding.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/common/compat.h b/src/common/compat.h index 582945734..ca18970cb 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -47,7 +47,7 @@ #include "lib/cc/compat_compiler.h" #include "lib/arch/bytes.h" -#include "common/compat_time.h" +#include "lib/time/compat_time.h" #include "lib/string/compat_ctype.h" #include "lib/string/compat_string.h" #include "lib/string/printf.h" diff --git a/src/or/channel.c b/src/or/channel.c index 2cf5b8a2a..ac1960ae0 100644 --- a/src/or/channel.c +++ b/src/or/channel.c @@ -76,7 +76,7 @@ #include "or/router.h" #include "or/routerlist.h" #include "or/scheduler.h" -#include "common/compat_time.h" +#include "lib/time/compat_time.h" #include "or/networkstatus.h" #include "or/rendservice.h" diff --git a/src/or/channelpadding.c b/src/or/channelpadding.c index 2afa483f5..6bef4d8b3 100644 --- a/src/or/channelpadding.c +++ b/src/or/channelpadding.c @@ -20,7 +20,7 @@ #include "or/main.h" #include "or/rephist.h" #include "or/router.h" -#include "common/compat_time.h" +#include "lib/time/compat_time.h" #include "or/rendservice.h" #include "or/cell_st.h" diff --git a/src/test/test_channelpadding.c b/src/test/test_channelpadding.c index 7edfdc114..15c6fb23f 100644 --- a/src/test/test_channelpadding.c +++ b/src/test/test_channelpadding.c @@ -15,7 +15,7 @@ #include "or/channelpadding.h" #include "common/compat_libevent.h" #include "or/config.h" -#include "common/compat_time.h" +#include "lib/time/compat_time.h" #include "or/main.h" #include "or/networkstatus.h" #include "test/log_test_helpers.h"

1 0

[tor/master] Move MIN and MAX into lib/intmath/cmp.h
by nickm＠torproject.org 28 Jun '18

28 Jun '18

commit 3d1e99d01bc0142397cd0dd8be41d001f0f66131 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 28 13:19:42 2018 -0400 Move MIN and MAX into lib/intmath/cmp.h --- src/common/compat.h | 14 +------------- src/lib/intmath/cmp.h | 13 +++++++++++++ 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/common/compat.h b/src/common/compat.h index 43e98d906..ec4df1cc5 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -60,6 +60,7 @@ #include "lib/fs/mmap.h" #include "lib/fs/userdb.h" #include "lib/wallclock/timeval.h" +#include "lib/intmath/cmp.h" #include <stdio.h> #include <errno.h> @@ -92,19 +93,6 @@ typedef unsigned long rlim_t; int set_max_file_descriptors(rlim_t limit, int *max); MOCK_DECL(int, get_total_system_memory, (size_t *mem_out)); -/** Macros for MIN/MAX. Never use these when the arguments could have - * side-effects. - * {With GCC extensions we could probably define a safer MIN/MAX. But - * depending on that safety would be dangerous, since not every platform - * has it.} - **/ -#ifndef MAX -#define MAX(a,b) ( ((a)<(b)) ? (b) : (a) ) -#endif -#ifndef MIN -#define MIN(a,b) ( ((a)>(b)) ? (b) : (a) ) -#endif - ssize_t tor_getpass(const char *prompt, char *output, size_t buflen); /* This needs some of the declarations above so we include it here. */ diff --git a/src/lib/intmath/cmp.h b/src/lib/intmath/cmp.h index 90ea3ca07..627e5d18b 100644 --- a/src/lib/intmath/cmp.h +++ b/src/lib/intmath/cmp.h @@ -6,6 +6,19 @@ #ifndef TOR_INTMATH_CMP_H #define TOR_INTMATH_CMP_H +/** Macros for MIN/MAX. Never use these when the arguments could have + * side-effects. + * {With GCC extensions we could probably define a safer MIN/MAX. But + * depending on that safety would be dangerous, since not every platform + * has it.} + **/ +#ifndef MAX +#define MAX(a,b) ( ((a)<(b)) ? (b) : (a) ) +#endif +#ifndef MIN +#define MIN(a,b) ( ((a)>(b)) ? (b) : (a) ) +#endif + /* Return v if it's between min and max. Otherwise * return min if v is smaller than min, or max if * b is larger than max.

1 0

[tor/master] fixup! Extract time functionality into lib/wallclock and lib/time
by nickm＠torproject.org 28 Jun '18

28 Jun '18

commit 326c473b793d6dfa5fcdb3dbd5a73e5f0d502d54 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 28 13:39:09 2018 -0400 fixup! Extract time functionality into lib/wallclock and lib/time --- src/lib/time/tvdiff.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/lib/time/tvdiff.c b/src/lib/time/tvdiff.c index 11c881234..9fb67bcd2 100644 --- a/src/lib/time/tvdiff.c +++ b/src/lib/time/tvdiff.c @@ -8,6 +8,10 @@ #include "lib/cc/compat_compiler.h" #include "lib/log/torlog.h" +#ifdef _WIN32 +#include <winsock2.h> +#endif + #define TOR_USEC_PER_SEC 1000000 /** Return the difference between start->tv_sec and end->tv_sec.

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits June 2018