diff options
Diffstat (limited to 'src')
-rwxr-xr-x | src/transport/ats_benchmark.sh | 4 | ||||
-rw-r--r-- | src/transport/test_transport_ats.conf | 16 | ||||
-rw-r--r-- | src/transport/transport.h | 4 |
3 files changed, 18 insertions, 6 deletions
diff --git a/src/transport/ats_benchmark.sh b/src/transport/ats_benchmark.sh index 5c7ed2f38..f2df8a879 100755 --- a/src/transport/ats_benchmark.sh +++ b/src/transport/ats_benchmark.sh | |||
@@ -1,6 +1,7 @@ | |||
1 | #/bin/bash | 1 | #/bin/bash |
2 | start=1 | 2 | start=1 |
3 | end=500 | 3 | end=500 |
4 | rm test.ats | ||
4 | 5 | ||
5 | if [ ! $1 = "" ]; then | 6 | if [ ! $1 = "" ]; then |
6 | start=$1 | 7 | start=$1 |
@@ -20,5 +21,6 @@ do | |||
20 | killall -s 31 gnunet-service-core 2> /dev/null | 21 | killall -s 31 gnunet-service-core 2> /dev/null |
21 | killall -s 31 gnunet-service-peerinfo 2> /dev/null | 22 | killall -s 31 gnunet-service-peerinfo 2> /dev/null |
22 | #sleep 1 | 23 | #sleep 1 |
23 | ./test_transport_ats $c | 24 | echo "$c peers" |
25 | ./test_transport_ats $c 2>> test.ats | ||
24 | done | 26 | done |
diff --git a/src/transport/test_transport_ats.conf b/src/transport/test_transport_ats.conf index 9159a4c59..cb3ab0166 100644 --- a/src/transport/test_transport_ats.conf +++ b/src/transport/test_transport_ats.conf | |||
@@ -7,7 +7,7 @@ PORT = 2564 | |||
7 | 7 | ||
8 | [transport] | 8 | [transport] |
9 | PORT = 2565 | 9 | PORT = 2565 |
10 | PLUGINS = udp tcp | 10 | PLUGINS = tcp |
11 | #DEBUG = YES | 11 | #DEBUG = YES |
12 | #PREFIX = xterm -e xterm -T transport -e gdb -x cmd --args | 12 | #PREFIX = xterm -e xterm -T transport -e gdb -x cmd --args |
13 | #PREFIX = valgrind --tool=memcheck --log-file=logs%p | 13 | #PREFIX = valgrind --tool=memcheck --log-file=logs%p |
@@ -17,7 +17,7 @@ PLUGINS = udp tcp | |||
17 | #LAN_BW_LIMIT_UP = 100000000 | 17 | #LAN_BW_LIMIT_UP = 100000000 |
18 | #WLAN_ENERGY_DOWN_LIMIT = 0 | 18 | #WLAN_ENERGY_DOWN_LIMIT = 0 |
19 | #WLAN_ENERGY_UP_LIMIT = 30 | 19 | #WLAN_ENERGY_UP_LIMIT = 30 |
20 | #DUMP_MLP = NO | 20 | #DUMP_MLP = YES |
21 | #DUMP_SOLUTION = YES | 21 | #DUMP_SOLUTION = YES |
22 | 22 | ||
23 | [arm] | 23 | [arm] |
@@ -28,7 +28,17 @@ DEFAULTSERVICES = core | |||
28 | PORT = 2567 | 28 | PORT = 2567 |
29 | 29 | ||
30 | [transport-tcp] | 30 | [transport-tcp] |
31 | PORT = 2568 | 31 | DISABLEV6 = YES |
32 | BINDTO = 127.0.0.1 | ||
33 | BEHIND_NAT = NO | ||
34 | ALLOW_NAT = NO | ||
35 | ENABLE_UPNP = NO | ||
36 | EXTERNAL_ADDRESS = 127.0.0.1 | ||
37 | INTERNAL_ADDRESS = 127.0.0.1 | ||
38 | |||
39 | [transport-unix] | ||
40 | PORT = 2572 | ||
41 | |||
32 | 42 | ||
33 | [transport-udp] | 43 | [transport-udp] |
34 | PORT = 2571 | 44 | PORT = 2571 |
diff --git a/src/transport/transport.h b/src/transport/transport.h index 4eb14c851..1cc1f8729 100644 --- a/src/transport/transport.h +++ b/src/transport/transport.h | |||
@@ -31,8 +31,8 @@ | |||
31 | #include "gnunet_transport_service.h" | 31 | #include "gnunet_transport_service.h" |
32 | 32 | ||
33 | /* Minimum time between to calculations*/ | 33 | /* Minimum time between to calculations*/ |
34 | #define ATS_MIN_INTERVAL GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MILLISECONDS, 1000) | 34 | #define ATS_MIN_INTERVAL GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 1) |
35 | #define ATS_EXEC_INTERVAL GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MILLISECONDS, 1500) | 35 | #define ATS_EXEC_INTERVAL GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 2) |
36 | #define ATS_MAX_EXEC_DURATION GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MILLISECONDS, 100) | 36 | #define ATS_MAX_EXEC_DURATION GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MILLISECONDS, 100) |
37 | #define ATS_MAX_ITERATIONS INT_MAX | 37 | #define ATS_MAX_ITERATIONS INT_MAX |
38 | 38 | ||