diff options
author | Christian Grothoff <christian@grothoff.org> | 2010-08-29 20:55:42 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2010-08-29 20:55:42 +0000 |
commit | 3cee2da4ecd71be065d3d6b0e3c25db45a13af4a (patch) | |
tree | 53f2a02d4e66a1191531c46c5ff15ad65e639bc6 /src/peerinfo/perf_peerinfo_api.c | |
parent | 57924abe125fa52dce4dc2e84cb0a7c4dcd04579 (diff) | |
download | gnunet-3cee2da4ecd71be065d3d6b0e3c25db45a13af4a.tar.gz gnunet-3cee2da4ecd71be065d3d6b0e3c25db45a13af4a.zip |
do not fail
Diffstat (limited to 'src/peerinfo/perf_peerinfo_api.c')
-rwxr-xr-x | src/peerinfo/perf_peerinfo_api.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/src/peerinfo/perf_peerinfo_api.c b/src/peerinfo/perf_peerinfo_api.c index 1c0df0332..c9d8cb4d4 100755 --- a/src/peerinfo/perf_peerinfo_api.c +++ b/src/peerinfo/perf_peerinfo_api.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of GNUnet. | 2 | This file is part of GNUnet. |
3 | (C) 2004, 2009 Christian Grothoff (and other contributing authors) | 3 | (C) 2004, 2009, 2010 Christian Grothoff (and other contributing authors) |
4 | 4 | ||
5 | GNUnet is free software; you can redistribute it and/or modify | 5 | GNUnet is free software; you can redistribute it and/or modify |
6 | it under the terms of the GNU General Public License as published | 6 | it under the terms of the GNU General Public License as published |
@@ -53,15 +53,15 @@ check_it (void *cls, | |||
53 | struct GNUNET_TIME_Absolute expiration, | 53 | struct GNUNET_TIME_Absolute expiration, |
54 | const void *addr, uint16_t addrlen) | 54 | const void *addr, uint16_t addrlen) |
55 | { | 55 | { |
56 | #if DEBUG | ||
56 | if (addrlen > 0) | 57 | if (addrlen > 0) |
57 | { | 58 | { |
58 | #if DEBUG | ||
59 | fprintf (stderr, | 59 | fprintf (stderr, |
60 | "name: %s, addr: %s\n", | 60 | "name: %s, addr: %s\n", |
61 | tname, | 61 | tname, |
62 | (const char*) addr); | 62 | (const char*) addr); |
63 | #endif | ||
64 | } | 63 | } |
64 | #endif | ||
65 | return GNUNET_OK; | 65 | return GNUNET_OK; |
66 | } | 66 | } |
67 | 67 | ||
@@ -80,8 +80,10 @@ address_generator (void *cls, size_t max, void *buf) | |||
80 | 80 | ||
81 | ret = GNUNET_HELLO_add_address ("peerinfotest", | 81 | ret = GNUNET_HELLO_add_address ("peerinfotest", |
82 | GNUNET_TIME_relative_to_absolute | 82 | GNUNET_TIME_relative_to_absolute |
83 | (GNUNET_TIME_UNIT_HOURS), address, strlen(address) + 1, | 83 | (GNUNET_TIME_UNIT_HOURS), |
84 | address, strlen(address) + 1, | ||
84 | buf, max); | 85 | buf, max); |
86 | GNUNET_free (address); | ||
85 | *agc = 0; | 87 | *agc = 0; |
86 | return ret; | 88 | return ret; |
87 | } | 89 | } |
@@ -149,15 +151,12 @@ run (void *cls, | |||
149 | (GNUNET_TIME_UNIT_SECONDS, 30), | 151 | (GNUNET_TIME_UNIT_SECONDS, 30), |
150 | &process, cls); | 152 | &process, cls); |
151 | } | 153 | } |
152 | fprintf (stderr, | ||
153 | "Issued %u requests\n", | ||
154 | NUM_REQUESTS); | ||
155 | } | 154 | } |
156 | 155 | ||
157 | static int | 156 | static int |
158 | check () | 157 | check () |
159 | { | 158 | { |
160 | int ok = 3; | 159 | int ok = 0; |
161 | char *const argv[] = { "test-peerinfo-hammer", | 160 | char *const argv[] = { "test-peerinfo-hammer", |
162 | "-c", | 161 | "-c", |
163 | "test_peerinfo_api_data.conf", | 162 | "test_peerinfo_api_data.conf", |
@@ -182,9 +181,9 @@ check () | |||
182 | argv, "test-peerinfo-api", "nohelp", | 181 | argv, "test-peerinfo-api", "nohelp", |
183 | options, &run, &ok); | 182 | options, &run, &ok); |
184 | fprintf (stderr, | 183 | fprintf (stderr, |
185 | "Processed %u/%u peers\n", | 184 | "Received %u/%u calls before timeout\n", |
186 | numpeers, | 185 | numpeers, |
187 | NUM_REQUESTS); | 186 | NUM_REQUESTS * NUM_REQUESTS / 2); |
188 | #if START_SERVICE | 187 | #if START_SERVICE |
189 | if (0 != PLIBC_KILL (pid, SIGTERM)) | 188 | if (0 != PLIBC_KILL (pid, SIGTERM)) |
190 | { | 189 | { |
@@ -206,7 +205,7 @@ main (int argc, char *argv[]) | |||
206 | #if DEBUG_PEERINFO | 205 | #if DEBUG_PEERINFO |
207 | "DEBUG", | 206 | "DEBUG", |
208 | #else | 207 | #else |
209 | "WARNING", | 208 | "ERROR", |
210 | #endif | 209 | #endif |
211 | NULL); | 210 | NULL); |
212 | ret = check (); | 211 | ret = check (); |