diff options
author | Christian Grothoff <christian@grothoff.org> | 2012-05-15 00:56:10 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2012-05-15 00:56:10 +0000 |
commit | bd3fc41cb8814ac41386be8f455de685f6cd1ffe (patch) | |
tree | 972acedeca658ead8117e2223fa889e52e483f5c | |
parent | 1f09f4f7716db5939ec1c9a278b5661616dd72d6 (diff) | |
download | gnunet-bd3fc41cb8814ac41386be8f455de685f6cd1ffe.tar.gz gnunet-bd3fc41cb8814ac41386be8f455de685f6cd1ffe.zip |
-help seaspider some more
-rw-r--r-- | src/ats/gnunet-service-ats_addresses_mlp.c | 4 | ||||
-rw-r--r-- | src/ats/perf_ats_mlp.c | 12 | ||||
-rw-r--r-- | src/mesh/gnunet-service-mesh.c | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/ats/gnunet-service-ats_addresses_mlp.c b/src/ats/gnunet-service-ats_addresses_mlp.c index 532fadadf..196ebaba8 100644 --- a/src/ats/gnunet-service-ats_addresses_mlp.c +++ b/src/ats/gnunet-service-ats_addresses_mlp.c | |||
@@ -1317,8 +1317,8 @@ GAS_mlp_init (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
1317 | /* Check if defined quota could make problem unsolvable */ | 1317 | /* Check if defined quota could make problem unsolvable */ |
1318 | if (((n_min * b_min) > quota_out) && (GNUNET_ATS_NET_UNSPECIFIED != quotas[c])) | 1318 | if (((n_min * b_min) > quota_out) && (GNUNET_ATS_NET_UNSPECIFIED != quotas[c])) |
1319 | { | 1319 | { |
1320 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Inconsistent quota configuration value `%s': " \ | 1320 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Inconsistent quota configuration value `%s': " |
1321 | "outbound quota (%u Bps) too small for combination of minimum connections and minimum bandwidth per peer (%u * %u Bps = %u)\n", entry_out, quota_out, n_min, b_min, n_min * b_min); | 1321 | "outbound quota (%u Bps) too small for combination of minimum connections and minimum bandwidth per peer (%u * %u Bps = %u)\n", entry_out, quota_out, n_min, b_min, n_min * b_min); |
1322 | 1322 | ||
1323 | GAS_mlp_done(mlp); | 1323 | GAS_mlp_done(mlp); |
1324 | mlp = NULL; | 1324 | mlp = NULL; |
diff --git a/src/ats/perf_ats_mlp.c b/src/ats/perf_ats_mlp.c index bace9809f..b9ee5e4dc 100644 --- a/src/ats/perf_ats_mlp.c +++ b/src/ats/perf_ats_mlp.c | |||
@@ -178,7 +178,7 @@ update_addresses (struct ATS_Address * a, unsigned int addrs, unsigned int perce | |||
178 | 178 | ||
179 | static void | 179 | static void |
180 | check (void *cls, char *const *args, const char *cfgfile, | 180 | check (void *cls, char *const *args, const char *cfgfile, |
181 | const struct GNUNET_CONFIGURATION_Handle *cfg) | 181 | const struct GNUNET_CONFIGURATION_Handle *cfg) |
182 | { | 182 | { |
183 | unsigned int c = 0; | 183 | unsigned int c = 0; |
184 | unsigned int c2 = 0; | 184 | unsigned int c2 = 0; |
@@ -289,7 +289,7 @@ check (void *cls, char *const *args, const char *cfgfile, | |||
289 | GNUNET_assert (GNUNET_OK == ctx.lp_result); | 289 | GNUNET_assert (GNUNET_OK == ctx.lp_result); |
290 | GNUNET_assert (GNUNET_OK == ctx.mlp_result); | 290 | GNUNET_assert (GNUNET_OK == ctx.mlp_result); |
291 | if (GNUNET_YES == numeric) | 291 | if (GNUNET_YES == numeric) |
292 | printf ("%u;%u;%llu;%llu\n",mlp->c_p, mlp->addr_in_problem, (long long unsigned int) ctx.lp_duration.rel_value, (long long unsigned int) ctx.mlp_duration.rel_value); | 292 | printf ("%u;%u;%llu;%llu\n",mlp->c_p, mlp->addr_in_problem, (unsigned long long) ctx.lp_duration.rel_value, (unsigned long long) ctx.mlp_duration.rel_value); |
293 | else | 293 | else |
294 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Problem solved for %u peers with %u address successfully (LP: %llu ms / MLP: %llu ms)\n", | 294 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Problem solved for %u peers with %u address successfully (LP: %llu ms / MLP: %llu ms)\n", |
295 | mlp->c_p, mlp->addr_in_problem, ctx.lp_duration.rel_value, ctx.mlp_duration.rel_value); | 295 | mlp->c_p, mlp->addr_in_problem, ctx.lp_duration.rel_value, ctx.mlp_duration.rel_value); |
@@ -312,13 +312,13 @@ check (void *cls, char *const *args, const char *cfgfile, | |||
312 | GNUNET_assert (GNUNET_OK == uctx.mlp_result); | 312 | GNUNET_assert (GNUNET_OK == uctx.mlp_result); |
313 | if (GNUNET_YES == numeric) | 313 | if (GNUNET_YES == numeric) |
314 | printf ("%u;%u;%llu;%llu;%llu;%llu\n",mlp->c_p, mlp->addr_in_problem, | 314 | printf ("%u;%u;%llu;%llu;%llu;%llu\n",mlp->c_p, mlp->addr_in_problem, |
315 | (long long unsigned int) ctx.lp_duration.rel_value, (long long unsigned int) ctx.mlp_duration.rel_value, | 315 | (unsigned long long) ctx.lp_duration.rel_value, (unsigned long long) ctx.mlp_duration.rel_value, |
316 | (long long unsigned int) uctx.lp_duration.rel_value, (long long unsigned int) uctx.mlp_duration.rel_value); | 316 | (unsigned long long) uctx.lp_duration.rel_value, (unsigned long long) uctx.mlp_duration.rel_value); |
317 | else | 317 | else |
318 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Updated problem solved for %u peers with %u address successfully (Initial: LP/MLP: %llu/%llu ms, Update: %llu/%llu ms)\n", | 318 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Updated problem solved for %u peers with %u address successfully (Initial: LP/MLP: %llu/%llu ms, Update: %llu/%llu ms)\n", |
319 | mlp->c_p, mlp->addr_in_problem, | 319 | mlp->c_p, mlp->addr_in_problem, |
320 | (long long unsigned int) ctx.lp_duration.rel_value, (long long unsigned int) ctx.mlp_duration.rel_value, | 320 | (unsigned long long) ctx.lp_duration.rel_value, (unsigned long long) ctx.mlp_duration.rel_value, |
321 | (long long unsigned int) uctx.lp_duration.rel_value, (long long unsigned int) uctx.mlp_duration.rel_value); | 321 | (unsigned long long) uctx.lp_duration.rel_value, (unsigned long long) uctx.mlp_duration.rel_value); |
322 | } | 322 | } |
323 | else | 323 | else |
324 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Solving updated problem with %u peers and %u addresses failed\n", c, c2); | 324 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Solving updated problem with %u peers and %u addresses failed\n", c, c2); |
diff --git a/src/mesh/gnunet-service-mesh.c b/src/mesh/gnunet-service-mesh.c index aa9ae888c..ada034043 100644 --- a/src/mesh/gnunet-service-mesh.c +++ b/src/mesh/gnunet-service-mesh.c | |||
@@ -685,7 +685,7 @@ announce_id (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
685 | 685 | ||
686 | GNUNET_DHT_put (dht_handle, /* DHT handle */ | 686 | GNUNET_DHT_put (dht_handle, /* DHT handle */ |
687 | &my_full_id.hashPubKey, /* Key to use */ | 687 | &my_full_id.hashPubKey, /* Key to use */ |
688 | 10U, /* Replication level */ | 688 | 10, /* Replication level */ |
689 | GNUNET_DHT_RO_RECORD_ROUTE | GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE, /* DHT options */ | 689 | GNUNET_DHT_RO_RECORD_ROUTE | GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE, /* DHT options */ |
690 | GNUNET_BLOCK_TYPE_TEST, /* Block type */ | 690 | GNUNET_BLOCK_TYPE_TEST, /* Block type */ |
691 | sizeof (my_full_id), /* Size of the data */ | 691 | sizeof (my_full_id), /* Size of the data */ |