diff options
author | Christian Grothoff <christian@grothoff.org> | 2012-05-27 19:50:28 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2012-05-27 19:50:28 +0000 |
commit | ced6bf19685b9c9af19da50a021ca8ff169e7c77 (patch) | |
tree | bf0b6e89047ff49ab607c3d94d802f399ebf70f2 | |
parent | f472d7ba8cddab2559d1de2a68e8fbc4e26649da (diff) | |
download | gnunet-ced6bf19685b9c9af19da50a021ca8ff169e7c77.tar.gz gnunet-ced6bf19685b9c9af19da50a021ca8ff169e7c77.zip |
-more uniform naming of statisitcs
15 files changed, 46 insertions, 46 deletions
diff --git a/bin/rename.sh b/bin/rename.sh index 7d5790b41..178b44081 100755 --- a/bin/rename.sh +++ b/bin/rename.sh | |||
@@ -1,5 +1,5 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | for n in `find * -name "*.c"` `find * -name "*.h"` | 2 | for n in `find * -name "*.c"` `find * -name "*.h"` `find * -name "*.in"` |
3 | do | 3 | do |
4 | cat $n | sed -e "s/$1/$2/g" > $n.new | 4 | cat $n | sed -e "s/$1/$2/g" > $n.new |
5 | mv $n.new $n || echo "Move failed: $n.new to $n" | 5 | mv $n.new $n || echo "Move failed: $n.new to $n" |
diff --git a/src/dht/test_dht_multipeer.c b/src/dht/test_dht_multipeer.c index 9649405b1..2be938c96 100644 --- a/src/dht/test_dht_multipeer.c +++ b/src/dht/test_dht_multipeer.c | |||
@@ -276,7 +276,7 @@ static struct StatValues stats[] = { | |||
276 | {"core", "# bytes encrypted", 0}, | 276 | {"core", "# bytes encrypted", 0}, |
277 | {"core", "# type maps received", 0}, | 277 | {"core", "# type maps received", 0}, |
278 | {"core", "# session keys confirmed via PONG", 0}, | 278 | {"core", "# session keys confirmed via PONG", 0}, |
279 | {"core", "# entries in session map", 0}, | 279 | {"core", "# peers connected", 0}, |
280 | {"core", "# key exchanges initiated", 0}, | 280 | {"core", "# key exchanges initiated", 0}, |
281 | {"core", "# send requests dropped (disconnected)", 0}, | 281 | {"core", "# send requests dropped (disconnected)", 0}, |
282 | {"core", "# transmissions delayed due to corking", 0}, | 282 | {"core", "# transmissions delayed due to corking", 0}, |
diff --git a/src/integration-tests/connection_watchdog.c b/src/integration-tests/connection_watchdog.c index 709ca4eeb..592947694 100644 --- a/src/integration-tests/connection_watchdog.c +++ b/src/integration-tests/connection_watchdog.c | |||
@@ -499,7 +499,7 @@ stats_check (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
499 | 499 | ||
500 | GNUNET_STATISTICS_get (stats, "transport", "# peers connected", GNUNET_TIME_UNIT_MINUTES, NULL, &stats_check_cb, &statistics_transport_connections); | 500 | GNUNET_STATISTICS_get (stats, "transport", "# peers connected", GNUNET_TIME_UNIT_MINUTES, NULL, &stats_check_cb, &statistics_transport_connections); |
501 | GNUNET_STATISTICS_get (stats, "core", "# neighbour entries allocated", GNUNET_TIME_UNIT_MINUTES, NULL, &stats_check_cb, &statistics_core_neighbour_entries); | 501 | GNUNET_STATISTICS_get (stats, "core", "# neighbour entries allocated", GNUNET_TIME_UNIT_MINUTES, NULL, &stats_check_cb, &statistics_core_neighbour_entries); |
502 | GNUNET_STATISTICS_get (stats, "core", "# entries in session map", GNUNET_TIME_UNIT_MINUTES, NULL, &stats_check_cb, &statistics_core_entries_session_map); | 502 | GNUNET_STATISTICS_get (stats, "core", "# peers connected", GNUNET_TIME_UNIT_MINUTES, NULL, &stats_check_cb, &statistics_core_entries_session_map); |
503 | 503 | ||
504 | /* TCP plugin specific checks */ | 504 | /* TCP plugin specific checks */ |
505 | if (GNUNET_YES == have_tcp) | 505 | if (GNUNET_YES == have_tcp) |
diff --git a/src/integration-tests/test_integration_bootstrap_and_connect.py.in b/src/integration-tests/test_integration_bootstrap_and_connect.py.in index b1743774e..1e71488dc 100755 --- a/src/integration-tests/test_integration_bootstrap_and_connect.py.in +++ b/src/integration-tests/test_integration_bootstrap_and_connect.py.in | |||
@@ -74,14 +74,14 @@ def check (): | |||
74 | check = Check (test) | 74 | check = Check (test) |
75 | check.add (StatisticsCondition (client, 'transport', '# peers connected',1)) | 75 | check.add (StatisticsCondition (client, 'transport', '# peers connected',1)) |
76 | check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',1)) | 76 | check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',1)) |
77 | check.add (StatisticsCondition (client, 'core', '# entries in session map',1)) | 77 | check.add (StatisticsCondition (client, 'core', '# peers connected',1)) |
78 | check.add (StatisticsCondition (client, 'topology', '# peers connected',1)) | 78 | check.add (StatisticsCondition (client, 'topology', '# peers connected',1)) |
79 | check.add (StatisticsCondition (client, 'fs', '# peers connected',1)) | 79 | check.add (StatisticsCondition (client, 'fs', '# peers connected',1)) |
80 | 80 | ||
81 | 81 | ||
82 | check.add (StatisticsCondition (server, 'transport', '# peers connected',1)) | 82 | check.add (StatisticsCondition (server, 'transport', '# peers connected',1)) |
83 | check.add (StatisticsCondition (server, 'core', '# neighbour entries allocated',1)) | 83 | check.add (StatisticsCondition (server, 'core', '# neighbour entries allocated',1)) |
84 | check.add (StatisticsCondition (server, 'core', '# entries in session map',1)) | 84 | check.add (StatisticsCondition (server, 'core', '# peers connected',1)) |
85 | check.add (StatisticsCondition (server, 'topology', '# peers connected',1)) | 85 | check.add (StatisticsCondition (server, 'topology', '# peers connected',1)) |
86 | check.add (StatisticsCondition (server, 'fs', '# peers connected',1)) | 86 | check.add (StatisticsCondition (server, 'fs', '# peers connected',1)) |
87 | 87 | ||
diff --git a/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect.py.in b/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect.py.in index 0346fd66c..aefb9cd8f 100755 --- a/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect.py.in +++ b/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect.py.in | |||
@@ -71,7 +71,7 @@ def success_cont (check): | |||
71 | check = Check (test) | 71 | check = Check (test) |
72 | check.add (StatisticsCondition (client, 'transport', '# peers connected',0)) | 72 | check.add (StatisticsCondition (client, 'transport', '# peers connected',0)) |
73 | check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',0)) | 73 | check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',0)) |
74 | check.add (StatisticsCondition (client, 'core', '# entries in session map',0)) | 74 | check.add (StatisticsCondition (client, 'core', '# peers connected',0)) |
75 | check.add (StatisticsCondition (client, 'topology', '# peers connected',0)) | 75 | check.add (StatisticsCondition (client, 'topology', '# peers connected',0)) |
76 | check.add (StatisticsCondition (client, 'fs', '# peers connected',0)) | 76 | check.add (StatisticsCondition (client, 'fs', '# peers connected',0)) |
77 | 77 | ||
@@ -86,14 +86,14 @@ def check (): | |||
86 | check = Check (test) | 86 | check = Check (test) |
87 | check.add (StatisticsCondition (client, 'transport', '# peers connected',1)) | 87 | check.add (StatisticsCondition (client, 'transport', '# peers connected',1)) |
88 | check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',1)) | 88 | check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',1)) |
89 | check.add (StatisticsCondition (client, 'core', '# entries in session map',1)) | 89 | check.add (StatisticsCondition (client, 'core', '# peers connected',1)) |
90 | check.add (StatisticsCondition (client, 'topology', '# peers connected',1)) | 90 | check.add (StatisticsCondition (client, 'topology', '# peers connected',1)) |
91 | check.add (StatisticsCondition (client, 'fs', '# peers connected',1)) | 91 | check.add (StatisticsCondition (client, 'fs', '# peers connected',1)) |
92 | 92 | ||
93 | 93 | ||
94 | check.add (StatisticsCondition (server, 'transport', '# peers connected',1)) | 94 | check.add (StatisticsCondition (server, 'transport', '# peers connected',1)) |
95 | check.add (StatisticsCondition (server, 'core', '# neighbour entries allocated',1)) | 95 | check.add (StatisticsCondition (server, 'core', '# neighbour entries allocated',1)) |
96 | check.add (StatisticsCondition (server, 'core', '# entries in session map',1)) | 96 | check.add (StatisticsCondition (server, 'core', '# peers connected',1)) |
97 | check.add (StatisticsCondition (server, 'topology', '# peers connected',1)) | 97 | check.add (StatisticsCondition (server, 'topology', '# peers connected',1)) |
98 | check.add (StatisticsCondition (server, 'fs', '# peers connected',1)) | 98 | check.add (StatisticsCondition (server, 'fs', '# peers connected',1)) |
99 | 99 | ||
diff --git a/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect_nat.py.in b/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect_nat.py.in index 6b720cbb1..88327bfa1 100755 --- a/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect_nat.py.in +++ b/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect_nat.py.in | |||
@@ -71,7 +71,7 @@ def success_cont (check): | |||
71 | check = Check (test) | 71 | check = Check (test) |
72 | check.add (StatisticsCondition (client, 'transport', '# peers connected',0)) | 72 | check.add (StatisticsCondition (client, 'transport', '# peers connected',0)) |
73 | check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',0)) | 73 | check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',0)) |
74 | check.add (StatisticsCondition (client, 'core', '# entries in session map',0)) | 74 | check.add (StatisticsCondition (client, 'core', '# peers connected',0)) |
75 | check.add (StatisticsCondition (client, 'topology', '# peers connected',0)) | 75 | check.add (StatisticsCondition (client, 'topology', '# peers connected',0)) |
76 | check.add (StatisticsCondition (client, 'fs', '# peers connected',0)) | 76 | check.add (StatisticsCondition (client, 'fs', '# peers connected',0)) |
77 | 77 | ||
@@ -86,14 +86,14 @@ def check (): | |||
86 | check = Check (test) | 86 | check = Check (test) |
87 | check.add (StatisticsCondition (client, 'transport', '# peers connected',1)) | 87 | check.add (StatisticsCondition (client, 'transport', '# peers connected',1)) |
88 | check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',1)) | 88 | check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',1)) |
89 | check.add (StatisticsCondition (client, 'core', '# entries in session map',1)) | 89 | check.add (StatisticsCondition (client, 'core', '# peers connected',1)) |
90 | check.add (StatisticsCondition (client, 'topology', '# peers connected',1)) | 90 | check.add (StatisticsCondition (client, 'topology', '# peers connected',1)) |
91 | check.add (StatisticsCondition (client, 'fs', '# peers connected',1)) | 91 | check.add (StatisticsCondition (client, 'fs', '# peers connected',1)) |
92 | 92 | ||
93 | 93 | ||
94 | check.add (StatisticsCondition (server, 'transport', '# peers connected',1)) | 94 | check.add (StatisticsCondition (server, 'transport', '# peers connected',1)) |
95 | check.add (StatisticsCondition (server, 'core', '# neighbour entries allocated',1)) | 95 | check.add (StatisticsCondition (server, 'core', '# neighbour entries allocated',1)) |
96 | check.add (StatisticsCondition (server, 'core', '# entries in session map',1)) | 96 | check.add (StatisticsCondition (server, 'core', '# peers connected',1)) |
97 | check.add (StatisticsCondition (server, 'topology', '# peers connected',1)) | 97 | check.add (StatisticsCondition (server, 'topology', '# peers connected',1)) |
98 | check.add (StatisticsCondition (server, 'fs', '# peers connected',1)) | 98 | check.add (StatisticsCondition (server, 'fs', '# peers connected',1)) |
99 | 99 | ||
diff --git a/src/integration-tests/test_integration_clique.py.in b/src/integration-tests/test_integration_clique.py.in index 82a406d0b..65c934121 100755 --- a/src/integration-tests/test_integration_clique.py.in +++ b/src/integration-tests/test_integration_clique.py.in | |||
@@ -73,7 +73,7 @@ def check_disconnect_client (): | |||
73 | 73 | ||
74 | check.add (StatisticsCondition (client2, 'transport', '# peers connected',0)) | 74 | check.add (StatisticsCondition (client2, 'transport', '# peers connected',0)) |
75 | check.add (StatisticsCondition (client2, 'core', '# neighbour entries allocated',0)) | 75 | check.add (StatisticsCondition (client2, 'core', '# neighbour entries allocated',0)) |
76 | check.add (StatisticsCondition (client2, 'core', '# entries in session map',0)) | 76 | check.add (StatisticsCondition (client2, 'core', '# peers connected',0)) |
77 | check.add (StatisticsCondition (client2, 'topology', '# peers connected',0)) | 77 | check.add (StatisticsCondition (client2, 'topology', '# peers connected',0)) |
78 | check.add (StatisticsCondition (client2, 'fs', '# peers connected',0)) | 78 | check.add (StatisticsCondition (client2, 'fs', '# peers connected',0)) |
79 | 79 | ||
@@ -96,13 +96,13 @@ def check_disconnect_server (): | |||
96 | check = Check (test) | 96 | check = Check (test) |
97 | check.add (StatisticsCondition (client, 'transport', '# peers connected',1)) | 97 | check.add (StatisticsCondition (client, 'transport', '# peers connected',1)) |
98 | check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',1)) | 98 | check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',1)) |
99 | check.add (StatisticsCondition (client, 'core', '# entries in session map',1)) | 99 | check.add (StatisticsCondition (client, 'core', '# peers connected',1)) |
100 | check.add (StatisticsCondition (client, 'topology', '# peers connected',1)) | 100 | check.add (StatisticsCondition (client, 'topology', '# peers connected',1)) |
101 | check.add (StatisticsCondition (client, 'fs', '# peers connected',1)) | 101 | check.add (StatisticsCondition (client, 'fs', '# peers connected',1)) |
102 | 102 | ||
103 | check.add (StatisticsCondition (client2, 'transport', '# peers connected',1)) | 103 | check.add (StatisticsCondition (client2, 'transport', '# peers connected',1)) |
104 | check.add (StatisticsCondition (client2, 'core', '# neighbour entries allocated',1)) | 104 | check.add (StatisticsCondition (client2, 'core', '# neighbour entries allocated',1)) |
105 | check.add (StatisticsCondition (client2, 'core', '# entries in session map',1)) | 105 | check.add (StatisticsCondition (client2, 'core', '# peers connected',1)) |
106 | check.add (StatisticsCondition (client2, 'topology', '# peers connected',1)) | 106 | check.add (StatisticsCondition (client2, 'topology', '# peers connected',1)) |
107 | check.add (StatisticsCondition (client2, 'fs', '# peers connected',1)) | 107 | check.add (StatisticsCondition (client2, 'fs', '# peers connected',1)) |
108 | 108 | ||
@@ -123,19 +123,19 @@ def check_connect (): | |||
123 | check = Check (test) | 123 | check = Check (test) |
124 | check.add (StatisticsCondition (client, 'transport', '# peers connected',2)) | 124 | check.add (StatisticsCondition (client, 'transport', '# peers connected',2)) |
125 | check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',2)) | 125 | check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',2)) |
126 | check.add (StatisticsCondition (client, 'core', '# entries in session map',2)) | 126 | check.add (StatisticsCondition (client, 'core', '# peers connected',2)) |
127 | check.add (StatisticsCondition (client, 'topology', '# peers connected',2)) | 127 | check.add (StatisticsCondition (client, 'topology', '# peers connected',2)) |
128 | check.add (StatisticsCondition (client, 'fs', '# peers connected',2)) | 128 | check.add (StatisticsCondition (client, 'fs', '# peers connected',2)) |
129 | 129 | ||
130 | check.add (StatisticsCondition (client2, 'transport', '# peers connected',2)) | 130 | check.add (StatisticsCondition (client2, 'transport', '# peers connected',2)) |
131 | check.add (StatisticsCondition (client2, 'core', '# neighbour entries allocated',2)) | 131 | check.add (StatisticsCondition (client2, 'core', '# neighbour entries allocated',2)) |
132 | check.add (StatisticsCondition (client2, 'core', '# entries in session map',2)) | 132 | check.add (StatisticsCondition (client2, 'core', '# peers connected',2)) |
133 | check.add (StatisticsCondition (client2, 'topology', '# peers connected',2)) | 133 | check.add (StatisticsCondition (client2, 'topology', '# peers connected',2)) |
134 | check.add (StatisticsCondition (client2, 'fs', '# peers connected',2)) | 134 | check.add (StatisticsCondition (client2, 'fs', '# peers connected',2)) |
135 | 135 | ||
136 | check.add (StatisticsCondition (server, 'transport', '# peers connected',2)) | 136 | check.add (StatisticsCondition (server, 'transport', '# peers connected',2)) |
137 | check.add (StatisticsCondition (server, 'core', '# neighbour entries allocated',2)) | 137 | check.add (StatisticsCondition (server, 'core', '# neighbour entries allocated',2)) |
138 | check.add (StatisticsCondition (server, 'core', '# entries in session map',2)) | 138 | check.add (StatisticsCondition (server, 'core', '# peers connected',2)) |
139 | check.add (StatisticsCondition (server, 'topology', '# peers connected',2)) | 139 | check.add (StatisticsCondition (server, 'topology', '# peers connected',2)) |
140 | check.add (StatisticsCondition (server, 'fs', '# peers connected',2)) | 140 | check.add (StatisticsCondition (server, 'fs', '# peers connected',2)) |
141 | 141 | ||
diff --git a/src/integration-tests/test_integration_clique_nat.py.in b/src/integration-tests/test_integration_clique_nat.py.in index 82d85f530..59d117949 100755 --- a/src/integration-tests/test_integration_clique_nat.py.in +++ b/src/integration-tests/test_integration_clique_nat.py.in | |||
@@ -73,7 +73,7 @@ def check_disconnect_client (): | |||
73 | 73 | ||
74 | check.add (StatisticsCondition (client2, 'transport', '# peers connected',0)) | 74 | check.add (StatisticsCondition (client2, 'transport', '# peers connected',0)) |
75 | check.add (StatisticsCondition (client2, 'core', '# neighbour entries allocated',0)) | 75 | check.add (StatisticsCondition (client2, 'core', '# neighbour entries allocated',0)) |
76 | check.add (StatisticsCondition (client2, 'core', '# entries in session map',0)) | 76 | check.add (StatisticsCondition (client2, 'core', '# peers connected',0)) |
77 | check.add (StatisticsCondition (client2, 'topology', '# peers connected',0)) | 77 | check.add (StatisticsCondition (client2, 'topology', '# peers connected',0)) |
78 | check.add (StatisticsCondition (client2, 'fs', '# peers connected',0)) | 78 | check.add (StatisticsCondition (client2, 'fs', '# peers connected',0)) |
79 | 79 | ||
@@ -96,13 +96,13 @@ def check_disconnect_server (): | |||
96 | check = Check (test) | 96 | check = Check (test) |
97 | check.add (StatisticsCondition (client, 'transport', '# peers connected',1)) | 97 | check.add (StatisticsCondition (client, 'transport', '# peers connected',1)) |
98 | check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',1)) | 98 | check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',1)) |
99 | check.add (StatisticsCondition (client, 'core', '# entries in session map',1)) | 99 | check.add (StatisticsCondition (client, 'core', '# peers connected',1)) |
100 | check.add (StatisticsCondition (client, 'topology', '# peers connected',1)) | 100 | check.add (StatisticsCondition (client, 'topology', '# peers connected',1)) |
101 | check.add (StatisticsCondition (client, 'fs', '# peers connected',1)) | 101 | check.add (StatisticsCondition (client, 'fs', '# peers connected',1)) |
102 | 102 | ||
103 | check.add (StatisticsCondition (client2, 'transport', '# peers connected',1)) | 103 | check.add (StatisticsCondition (client2, 'transport', '# peers connected',1)) |
104 | check.add (StatisticsCondition (client2, 'core', '# neighbour entries allocated',1)) | 104 | check.add (StatisticsCondition (client2, 'core', '# neighbour entries allocated',1)) |
105 | check.add (StatisticsCondition (client2, 'core', '# entries in session map',1)) | 105 | check.add (StatisticsCondition (client2, 'core', '# peers connected',1)) |
106 | check.add (StatisticsCondition (client2, 'topology', '# peers connected',1)) | 106 | check.add (StatisticsCondition (client2, 'topology', '# peers connected',1)) |
107 | check.add (StatisticsCondition (client2, 'fs', '# peers connected',1)) | 107 | check.add (StatisticsCondition (client2, 'fs', '# peers connected',1)) |
108 | 108 | ||
@@ -123,19 +123,19 @@ def check_connect (): | |||
123 | check = Check (test) | 123 | check = Check (test) |
124 | check.add (StatisticsCondition (client, 'transport', '# peers connected',2)) | 124 | check.add (StatisticsCondition (client, 'transport', '# peers connected',2)) |
125 | check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',2)) | 125 | check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',2)) |
126 | check.add (StatisticsCondition (client, 'core', '# entries in session map',2)) | 126 | check.add (StatisticsCondition (client, 'core', '# peers connected',2)) |
127 | check.add (StatisticsCondition (client, 'topology', '# peers connected',2)) | 127 | check.add (StatisticsCondition (client, 'topology', '# peers connected',2)) |
128 | check.add (StatisticsCondition (client, 'fs', '# peers connected',2)) | 128 | check.add (StatisticsCondition (client, 'fs', '# peers connected',2)) |
129 | 129 | ||
130 | check.add (StatisticsCondition (client2, 'transport', '# peers connected',2)) | 130 | check.add (StatisticsCondition (client2, 'transport', '# peers connected',2)) |
131 | check.add (StatisticsCondition (client2, 'core', '# neighbour entries allocated',2)) | 131 | check.add (StatisticsCondition (client2, 'core', '# neighbour entries allocated',2)) |
132 | check.add (StatisticsCondition (client2, 'core', '# entries in session map',2)) | 132 | check.add (StatisticsCondition (client2, 'core', '# peers connected',2)) |
133 | check.add (StatisticsCondition (client2, 'topology', '# peers connected',2)) | 133 | check.add (StatisticsCondition (client2, 'topology', '# peers connected',2)) |
134 | check.add (StatisticsCondition (client2, 'fs', '# peers connected',2)) | 134 | check.add (StatisticsCondition (client2, 'fs', '# peers connected',2)) |
135 | 135 | ||
136 | check.add (StatisticsCondition (server, 'transport', '# peers connected',2)) | 136 | check.add (StatisticsCondition (server, 'transport', '# peers connected',2)) |
137 | check.add (StatisticsCondition (server, 'core', '# neighbour entries allocated',2)) | 137 | check.add (StatisticsCondition (server, 'core', '# neighbour entries allocated',2)) |
138 | check.add (StatisticsCondition (server, 'core', '# entries in session map',2)) | 138 | check.add (StatisticsCondition (server, 'core', '# peers connected',2)) |
139 | check.add (StatisticsCondition (server, 'topology', '# peers connected',2)) | 139 | check.add (StatisticsCondition (server, 'topology', '# peers connected',2)) |
140 | check.add (StatisticsCondition (server, 'fs', '# peers connected',2)) | 140 | check.add (StatisticsCondition (server, 'fs', '# peers connected',2)) |
141 | 141 | ||
diff --git a/src/integration-tests/test_integration_connect_on_restart.py.in b/src/integration-tests/test_integration_connect_on_restart.py.in index 536ffd886..f77fd1c32 100755 --- a/src/integration-tests/test_integration_connect_on_restart.py.in +++ b/src/integration-tests/test_integration_connect_on_restart.py.in | |||
@@ -82,13 +82,13 @@ def success_connect_cont (check): | |||
82 | check = Check (test) | 82 | check = Check (test) |
83 | check.add (StatisticsCondition (client, 'transport', '# peers connected',1)) | 83 | check.add (StatisticsCondition (client, 'transport', '# peers connected',1)) |
84 | check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',1)) | 84 | check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',1)) |
85 | check.add (StatisticsCondition (client, 'core', '# entries in session map',1)) | 85 | check.add (StatisticsCondition (client, 'core', '# peers connected',1)) |
86 | check.add (StatisticsCondition (client, 'topology', '# peers connected',1)) | 86 | check.add (StatisticsCondition (client, 'topology', '# peers connected',1)) |
87 | check.add (StatisticsCondition (client, 'fs', '# peers connected',1)) | 87 | check.add (StatisticsCondition (client, 'fs', '# peers connected',1)) |
88 | 88 | ||
89 | check.add (StatisticsCondition (client2, 'transport', '# peers connected',1)) | 89 | check.add (StatisticsCondition (client2, 'transport', '# peers connected',1)) |
90 | check.add (StatisticsCondition (client2, 'core', '# neighbour entries allocated',1)) | 90 | check.add (StatisticsCondition (client2, 'core', '# neighbour entries allocated',1)) |
91 | check.add (StatisticsCondition (client2, 'core', '# entries in session map',1)) | 91 | check.add (StatisticsCondition (client2, 'core', '# peers connected',1)) |
92 | check.add (StatisticsCondition (client2, 'topology', '# peers connected',1)) | 92 | check.add (StatisticsCondition (client2, 'topology', '# peers connected',1)) |
93 | check.add (StatisticsCondition (client2, 'fs', '# peers connected',1)) | 93 | check.add (StatisticsCondition (client2, 'fs', '# peers connected',1)) |
94 | 94 | ||
@@ -106,19 +106,19 @@ def check_connect (): | |||
106 | check = Check (test) | 106 | check = Check (test) |
107 | check.add (StatisticsCondition (client, 'transport', '# peers connected',2)) | 107 | check.add (StatisticsCondition (client, 'transport', '# peers connected',2)) |
108 | check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',2)) | 108 | check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',2)) |
109 | check.add (StatisticsCondition (client, 'core', '# entries in session map',2)) | 109 | check.add (StatisticsCondition (client, 'core', '# peers connected',2)) |
110 | check.add (StatisticsCondition (client, 'topology', '# peers connected',2)) | 110 | check.add (StatisticsCondition (client, 'topology', '# peers connected',2)) |
111 | check.add (StatisticsCondition (client, 'fs', '# peers connected',2)) | 111 | check.add (StatisticsCondition (client, 'fs', '# peers connected',2)) |
112 | 112 | ||
113 | check.add (StatisticsCondition (client2, 'transport', '# peers connected',2)) | 113 | check.add (StatisticsCondition (client2, 'transport', '# peers connected',2)) |
114 | check.add (StatisticsCondition (client2, 'core', '# neighbour entries allocated',2)) | 114 | check.add (StatisticsCondition (client2, 'core', '# neighbour entries allocated',2)) |
115 | check.add (StatisticsCondition (client2, 'core', '# entries in session map',2)) | 115 | check.add (StatisticsCondition (client2, 'core', '# peers connected',2)) |
116 | check.add (StatisticsCondition (client2, 'topology', '# peers connected',2)) | 116 | check.add (StatisticsCondition (client2, 'topology', '# peers connected',2)) |
117 | check.add (StatisticsCondition (client2, 'fs', '# peers connected',2)) | 117 | check.add (StatisticsCondition (client2, 'fs', '# peers connected',2)) |
118 | 118 | ||
119 | check.add (StatisticsCondition (server, 'transport', '# peers connected',2)) | 119 | check.add (StatisticsCondition (server, 'transport', '# peers connected',2)) |
120 | check.add (StatisticsCondition (server, 'core', '# neighbour entries allocated',2)) | 120 | check.add (StatisticsCondition (server, 'core', '# neighbour entries allocated',2)) |
121 | check.add (StatisticsCondition (server, 'core', '# entries in session map',2)) | 121 | check.add (StatisticsCondition (server, 'core', '# peers connected',2)) |
122 | check.add (StatisticsCondition (server, 'topology', '# peers connected',2)) | 122 | check.add (StatisticsCondition (server, 'topology', '# peers connected',2)) |
123 | check.add (StatisticsCondition (server, 'fs', '# peers connected',2)) | 123 | check.add (StatisticsCondition (server, 'fs', '# peers connected',2)) |
124 | 124 | ||
diff --git a/src/integration-tests/test_integration_connection_values_tcp.py.in b/src/integration-tests/test_integration_connection_values_tcp.py.in index 7b71abcd1..d8a92bad4 100755 --- a/src/integration-tests/test_integration_connection_values_tcp.py.in +++ b/src/integration-tests/test_integration_connection_values_tcp.py.in | |||
@@ -65,10 +65,10 @@ def fail_cont (check): | |||
65 | def check_connect (): | 65 | def check_connect (): |
66 | check = Check (test) | 66 | check = Check (test) |
67 | check.add (EqualStatisticsCondition (client, 'transport', '# peers connected', client, 'core', '# neighbour entries allocated')) | 67 | check.add (EqualStatisticsCondition (client, 'transport', '# peers connected', client, 'core', '# neighbour entries allocated')) |
68 | check.add (EqualStatisticsCondition (client, 'transport', '# peers connected', client, 'core', '# entries in session map')) | 68 | check.add (EqualStatisticsCondition (client, 'transport', '# peers connected', client, 'core', '# peers connected')) |
69 | check.add (EqualStatisticsCondition (client, 'core', '# neighbour entries allocated', client, 'core', '# entries in session map')) | 69 | check.add (EqualStatisticsCondition (client, 'core', '# neighbour entries allocated', client, 'core', '# peers connected')) |
70 | check.add (EqualStatisticsCondition (client, 'transport', '# peers connected', client, 'topology', '# peers connected')) | 70 | check.add (EqualStatisticsCondition (client, 'transport', '# peers connected', client, 'topology', '# peers connected')) |
71 | check.add (EqualStatisticsCondition (client, 'topology', '# peers connected', client, 'core', '# entries in session map')) | 71 | check.add (EqualStatisticsCondition (client, 'topology', '# peers connected', client, 'core', '# peers connected')) |
72 | 72 | ||
73 | while True: | 73 | while True: |
74 | check.reset() | 74 | check.reset() |
diff --git a/src/integration-tests/test_integration_connection_values_tcp_udp.py.in b/src/integration-tests/test_integration_connection_values_tcp_udp.py.in index 70877cca1..11b8266d1 100755 --- a/src/integration-tests/test_integration_connection_values_tcp_udp.py.in +++ b/src/integration-tests/test_integration_connection_values_tcp_udp.py.in | |||
@@ -65,10 +65,10 @@ def fail_cont (check): | |||
65 | def check_connect (): | 65 | def check_connect (): |
66 | check = Check (test) | 66 | check = Check (test) |
67 | check.add (EqualStatisticsCondition (client, 'transport', '# peers connected', client, 'core', '# neighbour entries allocated')) | 67 | check.add (EqualStatisticsCondition (client, 'transport', '# peers connected', client, 'core', '# neighbour entries allocated')) |
68 | check.add (EqualStatisticsCondition (client, 'transport', '# peers connected', client, 'core', '# entries in session map')) | 68 | check.add (EqualStatisticsCondition (client, 'transport', '# peers connected', client, 'core', '# peers connected')) |
69 | check.add (EqualStatisticsCondition (client, 'core', '# neighbour entries allocated', client, 'core', '# entries in session map')) | 69 | check.add (EqualStatisticsCondition (client, 'core', '# neighbour entries allocated', client, 'core', '# peers connected')) |
70 | check.add (EqualStatisticsCondition (client, 'transport', '# peers connected', client, 'topology', '# peers connected')) | 70 | check.add (EqualStatisticsCondition (client, 'transport', '# peers connected', client, 'topology', '# peers connected')) |
71 | check.add (EqualStatisticsCondition (client, 'topology', '# peers connected', client, 'core', '# entries in session map')) | 71 | check.add (EqualStatisticsCondition (client, 'topology', '# peers connected', client, 'core', '# peers connected')) |
72 | 72 | ||
73 | while True: | 73 | while True: |
74 | check.reset() | 74 | check.reset() |
diff --git a/src/integration-tests/test_integration_connection_values_tcp_udp_http.py.in b/src/integration-tests/test_integration_connection_values_tcp_udp_http.py.in index cd4cc9d2e..69184a2e9 100755 --- a/src/integration-tests/test_integration_connection_values_tcp_udp_http.py.in +++ b/src/integration-tests/test_integration_connection_values_tcp_udp_http.py.in | |||
@@ -65,10 +65,10 @@ def fail_cont (check): | |||
65 | def check_connect (): | 65 | def check_connect (): |
66 | check = Check (test) | 66 | check = Check (test) |
67 | check.add (EqualStatisticsCondition (client, 'transport', '# peers connected', client, 'core', '# neighbour entries allocated')) | 67 | check.add (EqualStatisticsCondition (client, 'transport', '# peers connected', client, 'core', '# neighbour entries allocated')) |
68 | check.add (EqualStatisticsCondition (client, 'transport', '# peers connected', client, 'core', '# entries in session map')) | 68 | check.add (EqualStatisticsCondition (client, 'transport', '# peers connected', client, 'core', '# peers connected')) |
69 | check.add (EqualStatisticsCondition (client, 'core', '# neighbour entries allocated', client, 'core', '# entries in session map')) | 69 | check.add (EqualStatisticsCondition (client, 'core', '# neighbour entries allocated', client, 'core', '# peers connected')) |
70 | check.add (EqualStatisticsCondition (client, 'transport', '# peers connected', client, 'topology', '# peers connected')) | 70 | check.add (EqualStatisticsCondition (client, 'transport', '# peers connected', client, 'topology', '# peers connected')) |
71 | check.add (EqualStatisticsCondition (client, 'topology', '# peers connected', client, 'core', '# entries in session map')) | 71 | check.add (EqualStatisticsCondition (client, 'topology', '# peers connected', client, 'core', '# peers connected')) |
72 | 72 | ||
73 | while True: | 73 | while True: |
74 | check.reset() | 74 | check.reset() |
diff --git a/src/integration-tests/test_integration_disconnect.py.in b/src/integration-tests/test_integration_disconnect.py.in index bd6bc121f..6f84f37e0 100755 --- a/src/integration-tests/test_integration_disconnect.py.in +++ b/src/integration-tests/test_integration_disconnect.py.in | |||
@@ -73,7 +73,7 @@ def check_disconnect (): | |||
73 | check = Check (test) | 73 | check = Check (test) |
74 | check.add (StatisticsCondition (client, 'transport', '# peers connected',0)) | 74 | check.add (StatisticsCondition (client, 'transport', '# peers connected',0)) |
75 | check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',0)) | 75 | check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',0)) |
76 | check.add (StatisticsCondition (client, 'core', '# entries in session map',0)) | 76 | check.add (StatisticsCondition (client, 'core', '# peers connected',0)) |
77 | check.add (StatisticsCondition (client, 'topology', '# peers connected',0)) | 77 | check.add (StatisticsCondition (client, 'topology', '# peers connected',0)) |
78 | check.add (StatisticsCondition (client, 'fs', '# peers connected',0)) | 78 | check.add (StatisticsCondition (client, 'fs', '# peers connected',0)) |
79 | check.run_blocking (check_timeout, success_disconnect_cont, fail_disconnect_cont) | 79 | check.run_blocking (check_timeout, success_disconnect_cont, fail_disconnect_cont) |
@@ -93,13 +93,13 @@ def check_connect (): | |||
93 | check = Check (test) | 93 | check = Check (test) |
94 | check.add (StatisticsCondition (client, 'transport', '# peers connected',1)) | 94 | check.add (StatisticsCondition (client, 'transport', '# peers connected',1)) |
95 | check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',1)) | 95 | check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',1)) |
96 | check.add (StatisticsCondition (client, 'core', '# entries in session map',1)) | 96 | check.add (StatisticsCondition (client, 'core', '# peers connected',1)) |
97 | check.add (StatisticsCondition (client, 'topology', '# peers connected',1)) | 97 | check.add (StatisticsCondition (client, 'topology', '# peers connected',1)) |
98 | check.add (StatisticsCondition (client, 'fs', '# peers connected',1)) | 98 | check.add (StatisticsCondition (client, 'fs', '# peers connected',1)) |
99 | 99 | ||
100 | check.add (StatisticsCondition (server, 'transport', '# peers connected',1)) | 100 | check.add (StatisticsCondition (server, 'transport', '# peers connected',1)) |
101 | check.add (StatisticsCondition (server, 'core', '# neighbour entries allocated',1)) | 101 | check.add (StatisticsCondition (server, 'core', '# neighbour entries allocated',1)) |
102 | check.add (StatisticsCondition (server, 'core', '# entries in session map',1)) | 102 | check.add (StatisticsCondition (server, 'core', '# peers connected',1)) |
103 | check.add (StatisticsCondition (server, 'topology', '# peers connected',1)) | 103 | check.add (StatisticsCondition (server, 'topology', '# peers connected',1)) |
104 | check.add (StatisticsCondition (server, 'fs', '# peers connected',1)) | 104 | check.add (StatisticsCondition (server, 'fs', '# peers connected',1)) |
105 | 105 | ||
diff --git a/src/integration-tests/test_integration_restart.py.in b/src/integration-tests/test_integration_restart.py.in index aadfec5b9..26917d0a0 100755 --- a/src/integration-tests/test_integration_restart.py.in +++ b/src/integration-tests/test_integration_restart.py.in | |||
@@ -85,13 +85,13 @@ def success_connect_cont (check): | |||
85 | check = Check (test) | 85 | check = Check (test) |
86 | check.add (StatisticsCondition (client, 'transport', '# peers connected',1)) | 86 | check.add (StatisticsCondition (client, 'transport', '# peers connected',1)) |
87 | check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',1)) | 87 | check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',1)) |
88 | check.add (StatisticsCondition (client, 'core', '# entries in session map',1)) | 88 | check.add (StatisticsCondition (client, 'core', '# peers connected',1)) |
89 | check.add (StatisticsCondition (client, 'topology', '# peers connected',1)) | 89 | check.add (StatisticsCondition (client, 'topology', '# peers connected',1)) |
90 | check.add (StatisticsCondition (client, 'fs', '# peers connected',1)) | 90 | check.add (StatisticsCondition (client, 'fs', '# peers connected',1)) |
91 | 91 | ||
92 | check.add (StatisticsCondition (server, 'transport', '# peers connected',1)) | 92 | check.add (StatisticsCondition (server, 'transport', '# peers connected',1)) |
93 | check.add (StatisticsCondition (server, 'core', '# neighbour entries allocated',1)) | 93 | check.add (StatisticsCondition (server, 'core', '# neighbour entries allocated',1)) |
94 | check.add (StatisticsCondition (server, 'core', '# entries in session map',1)) | 94 | check.add (StatisticsCondition (server, 'core', '# peers connected',1)) |
95 | check.add (StatisticsCondition (server, 'topology', '# peers connected',1)) | 95 | check.add (StatisticsCondition (server, 'topology', '# peers connected',1)) |
96 | check.add (StatisticsCondition (server, 'fs', '# peers connected',1)) | 96 | check.add (StatisticsCondition (server, 'fs', '# peers connected',1)) |
97 | 97 | ||
@@ -108,13 +108,13 @@ def check_connect (): | |||
108 | check = Check (test) | 108 | check = Check (test) |
109 | check.add (StatisticsCondition (client, 'transport', '# peers connected',1)) | 109 | check.add (StatisticsCondition (client, 'transport', '# peers connected',1)) |
110 | check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',1)) | 110 | check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',1)) |
111 | check.add (StatisticsCondition (client, 'core', '# entries in session map',1)) | 111 | check.add (StatisticsCondition (client, 'core', '# peers connected',1)) |
112 | check.add (StatisticsCondition (client, 'topology', '# peers connected',1)) | 112 | check.add (StatisticsCondition (client, 'topology', '# peers connected',1)) |
113 | check.add (StatisticsCondition (client, 'fs', '# peers connected',1)) | 113 | check.add (StatisticsCondition (client, 'fs', '# peers connected',1)) |
114 | 114 | ||
115 | check.add (StatisticsCondition (server, 'transport', '# peers connected',1)) | 115 | check.add (StatisticsCondition (server, 'transport', '# peers connected',1)) |
116 | check.add (StatisticsCondition (server, 'core', '# neighbour entries allocated',1)) | 116 | check.add (StatisticsCondition (server, 'core', '# neighbour entries allocated',1)) |
117 | check.add (StatisticsCondition (server, 'core', '# entries in session map',1)) | 117 | check.add (StatisticsCondition (server, 'core', '# peers connected',1)) |
118 | check.add (StatisticsCondition (server, 'topology', '# peers connected',1)) | 118 | check.add (StatisticsCondition (server, 'topology', '# peers connected',1)) |
119 | check.add (StatisticsCondition (server, 'fs', '# peers connected',1)) | 119 | check.add (StatisticsCondition (server, 'fs', '# peers connected',1)) |
120 | 120 | ||
diff --git a/src/vpn/gnunet-service-vpn.c b/src/vpn/gnunet-service-vpn.c index 324671b0c..b7756a35a 100644 --- a/src/vpn/gnunet-service-vpn.c +++ b/src/vpn/gnunet-service-vpn.c | |||
@@ -605,7 +605,7 @@ tunnel_peer_disconnect_handler (void *cls, | |||
605 | "Peer %s disconnected from tunnel.\n", | 605 | "Peer %s disconnected from tunnel.\n", |
606 | GNUNET_i2s (peer)); | 606 | GNUNET_i2s (peer)); |
607 | GNUNET_STATISTICS_update (stats, | 607 | GNUNET_STATISTICS_update (stats, |
608 | gettext_noop ("# Peers connected to mesh tunnels"), | 608 | gettext_noop ("# peers connected to mesh tunnels"), |
609 | -1, GNUNET_NO); | 609 | -1, GNUNET_NO); |
610 | if (NULL != ts->th) | 610 | if (NULL != ts->th) |
611 | { | 611 | { |
@@ -642,7 +642,7 @@ tunnel_peer_connect_handler (void *cls, | |||
642 | "Peer %s connected to tunnel.\n", | 642 | "Peer %s connected to tunnel.\n", |
643 | GNUNET_i2s (peer)); | 643 | GNUNET_i2s (peer)); |
644 | GNUNET_STATISTICS_update (stats, | 644 | GNUNET_STATISTICS_update (stats, |
645 | gettext_noop ("# Peers connected to mesh tunnels"), | 645 | gettext_noop ("# peers connected to mesh tunnels"), |
646 | 1, GNUNET_NO); | 646 | 1, GNUNET_NO); |
647 | if (NULL == ts->client) | 647 | if (NULL == ts->client) |
648 | return; /* nothing to do */ | 648 | return; /* nothing to do */ |