diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-04-13 08:58:43 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-04-15 09:03:22 -0400 |
| commit | 32e80ea3d32d5fd8207d16f9e5b26defa0d98a7c (patch) | |
| tree | a8260d5422c2371c3b630d9435052ea299f15336 /src/ext/include.am | |
| parent | 0e354ad45966d29ff4cd75854dbd1715270a2168 (diff) | |
| download | tor-32e80ea3d32d5fd8207d16f9e5b26defa0d98a7c.tar.gz tor-32e80ea3d32d5fd8207d16f9e5b26defa0d98a7c.zip | |
Import timeouts.c directly from William Ahern's git.
Imported from here: https://github.com/wahern/timeout
Imported as of upstream e5a9e8bfaa9c631bdc54002181795931b65bdc1a.
All sources unmodified.
Diffstat (limited to 'src/ext/include.am')
| -rw-r--r-- | src/ext/include.am | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/src/ext/include.am b/src/ext/include.am index bf678f2c9d..b4281b92ca 100644 --- a/src/ext/include.am +++ b/src/ext/include.am @@ -10,6 +10,8 @@ EXTHEADERS = \ src/ext/tor_readpassphrase.h \ src/ext/strlcat.c \ src/ext/strlcpy.c \ + src/ext/timeouts/timeout.h \ + src/ext/timeouts/timeout-debug.h \ src/ext/tinytest_macros.h \ src/ext/tor_queue.h \ src/ext/siphash.h @@ -148,3 +150,26 @@ noinst_HEADERS += $(LIBKECCAK_TINY_HDRS) LIBKECCAK_TINY=src/ext/keccak-tiny/libkeccak-tiny.a noinst_LIBRARIES += $(LIBKECCAK_TINY) +EXTRA_DIST += \ + timeouts/bench/bench-add.lua \ + timeouts/bench/bench-aux.lua \ + timeouts/bench/bench.c \ + timeouts/bench/bench-del.lua \ + timeouts/bench/bench-expire.lua \ + timeouts/bench/bench.h \ + timeouts/bench/bench-heap.c \ + timeouts/bench/bench-llrb.c \ + timeouts/bench/bench.plt \ + timeouts/bench/bench-wheel.c \ + timeouts/bench/Rules.mk \ + timeouts/lua/Rules.mk \ + timeouts/lua/timeout-lua.c \ + timeouts/Makefile \ + timeouts/Rules.shrc \ + timeouts/test-timeout.c + +# XXXX Once we use timeouts, include this in an actual library. +EXTRA_DIST += \ + timeouts/timeout-bitops.c \ + timeout.c + |