[tor-commits] [tor/master] Merge branch 'timeouts_v2_squashed'
nickm at torproject.org
nickm at torproject.org
Mon May 9 18:08:56 UTC 2016
commit 69380033d644d39a7369e0cd2b2cb7fd5cd7c695
Merge: 641cdc3 af132fc
Author: Nick Mathewson <nickm at torproject.org>
Date: Mon May 9 14:06:10 2016 -0400
Merge branch 'timeouts_v2_squashed'
.gitignore | 2 +
changes/timeouts | 7 +
src/common/include.am | 5 +-
src/common/timers.c | 297 +++++++++++++
src/common/timers.h | 22 +
src/ext/README | 4 +
src/ext/include.am | 24 +-
src/ext/timeouts/Makefile | 68 +++
src/ext/timeouts/Rules.shrc | 40 ++
src/ext/timeouts/bench/Rules.mk | 49 +++
src/ext/timeouts/bench/bench-add.lua | 30 ++
src/ext/timeouts/bench/bench-aux.lua | 30 ++
src/ext/timeouts/bench/bench-del.lua | 25 ++
src/ext/timeouts/bench/bench-expire.lua | 29 ++
src/ext/timeouts/bench/bench-heap.c | 236 ++++++++++
src/ext/timeouts/bench/bench-llrb.c | 425 ++++++++++++++++++
src/ext/timeouts/bench/bench-wheel.c | 81 ++++
src/ext/timeouts/bench/bench.c | 293 +++++++++++++
src/ext/timeouts/bench/bench.h | 11 +
src/ext/timeouts/bench/bench.plt | 19 +
src/ext/timeouts/lua/Rules.mk | 20 +
src/ext/timeouts/lua/timeout-lua.c | 396 +++++++++++++++++
src/ext/timeouts/test-timeout.c | 530 ++++++++++++++++++++++
src/ext/timeouts/timeout-bitops.c | 254 +++++++++++
src/ext/timeouts/timeout-debug.h | 77 ++++
src/ext/timeouts/timeout.c | 754 ++++++++++++++++++++++++++++++++
src/ext/timeouts/timeout.h | 256 +++++++++++
src/test/include.am | 16 +-
src/test/test-timers.c | 133 ++++++
29 files changed, 4130 insertions(+), 3 deletions(-)
More information about the tor-commits
mailing list