aboutsummaryrefslogtreecommitdiff
path: root/src/ats/perf_ats_solver.c
diff options
context:
space:
mode:
authorMatthias Wachs <wachs@net.in.tum.de>2013-10-30 09:39:20 +0000
committerMatthias Wachs <wachs@net.in.tum.de>2013-10-30 09:39:20 +0000
commit8b6e1176088d20068cc0de0db8ba0b1006329969 (patch)
treef90666b719d801f6b132e2ebbcd3e2ca86892ed0 /src/ats/perf_ats_solver.c
parent054ef9143e7ce6af94239d513d7f3f6925377533 (diff)
downloadgnunet-8b6e1176088d20068cc0de0db8ba0b1006329969.tar.gz
gnunet-8b6e1176088d20068cc0de0db8ba0b1006329969.zip
minor fixes and log level changes
Diffstat (limited to 'src/ats/perf_ats_solver.c')
-rw-r--r--src/ats/perf_ats_solver.c16
1 files changed, 9 insertions, 7 deletions
diff --git a/src/ats/perf_ats_solver.c b/src/ats/perf_ats_solver.c
index 6f275b0cc..a9f92a6e7 100644
--- a/src/ats/perf_ats_solver.c
+++ b/src/ats/perf_ats_solver.c
@@ -32,9 +32,9 @@
32#include "gnunet_ats_plugin.h" 32#include "gnunet_ats_plugin.h"
33#include "test_ats_api_common.h" 33#include "test_ats_api_common.h"
34 34
35#define DEFAULT_PEERS_START 100 35#define DEFAULT_PEERS_START 1
36#define DEFAULT_PEERS_END 100 36#define DEFAULT_PEERS_END 1
37#define DEFAULT_ADDRESSES 10 37#define DEFAULT_ADDRESSES 1
38#define DEFAULT_ATS_COUNT 2 38#define DEFAULT_ATS_COUNT 2
39 39
40/** 40/**
@@ -308,6 +308,8 @@ check ()
308 308
309 for (cp = 0; cp < count_p; cp++) 309 for (cp = 0; cp < count_p; cp++)
310 perf_create_peer (cp); 310 perf_create_peer (cp);
311 GNUNET_log(GNUNET_ERROR_TYPE_INFO,
312 "Added %u peers\n", cp);
311 313
312 /* Set initial bulk start to not solve */ 314 /* Set initial bulk start to not solve */
313 ph.env.sf.s_bulk_start (ph.solver); 315 ph.env.sf.s_bulk_start (ph.solver);
@@ -321,7 +323,7 @@ check ()
321 /* add address */ 323 /* add address */
322 ph.env.sf.s_add (ph.solver, cur_addr, GNUNET_ATS_NET_LAN); 324 ph.env.sf.s_add (ph.solver, cur_addr, GNUNET_ATS_NET_LAN);
323 address_initial_update (ph.solver, ph.addresses, cur_addr); 325 address_initial_update (ph.solver, ph.addresses, cur_addr);
324 GNUNET_log(GNUNET_ERROR_TYPE_INFO, 326 GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
325 "Adding address for peer %u address %u\n", cp, ca); 327 "Adding address for peer %u address %u\n", cp, ca);
326 } 328 }
327 ph.env.sf.s_get (ph.solver, &ph.peers[cp].id); 329 ph.env.sf.s_get (ph.solver, &ph.peers[cp].id);
@@ -380,7 +382,7 @@ static void
380run (void *cls, char * const *args, const char *cfgfile, 382run (void *cls, char * const *args, const char *cfgfile,
381 const struct GNUNET_CONFIGURATION_Handle *cfg) 383 const struct GNUNET_CONFIGURATION_Handle *cfg)
382{ 384{
383 GNUNET_log_setup ("perf-ats", "WARNING", NULL); 385 GNUNET_log_setup ("perf-ats-solver", "WARNING", NULL);
384 char *sep; 386 char *sep;
385 char *src_filename = GNUNET_strdup (__FILE__); 387 char *src_filename = GNUNET_strdup (__FILE__);
386 char *test_filename = cls; 388 char *test_filename = cls;
@@ -490,9 +492,8 @@ run (void *cls, char * const *args, const char *cfgfile,
490 } 492 }
491 GAS_normalization_start (NULL, NULL, &normalized_property_changed_cb, NULL ); 493 GAS_normalization_start (NULL, NULL, &normalized_property_changed_cb, NULL );
492 494
493
494 GNUNET_asprintf (&plugin, "libgnunet_plugin_ats_%s", ph.ats_string); 495 GNUNET_asprintf (&plugin, "libgnunet_plugin_ats_%s", ph.ats_string);
495 GNUNET_log(GNUNET_ERROR_TYPE_INFO, _("Initializing solver `%s' `%s'\n"), ph.ats_string, plugin); 496 GNUNET_log(GNUNET_ERROR_TYPE_INFO, _("Initializing solver `%s'\n"), ph.ats_string);
496 if (NULL == (ph.solver = GNUNET_PLUGIN_load (plugin, &ph.env))) 497 if (NULL == (ph.solver = GNUNET_PLUGIN_load (plugin, &ph.env)))
497 { 498 {
498 GNUNET_log(GNUNET_ERROR_TYPE_ERROR, _("Failed to initialize solver `%s'!\n"), plugin); 499 GNUNET_log(GNUNET_ERROR_TYPE_ERROR, _("Failed to initialize solver `%s'!\n"), plugin);
@@ -504,6 +505,7 @@ run (void *cls, char * const *args, const char *cfgfile,
504 check (); 505 check ();
505 506
506 /* Unload solver*/ 507 /* Unload solver*/
508 GNUNET_log(GNUNET_ERROR_TYPE_INFO, _("Unloading solver `%s'\n"), ph.ats_string);
507 GNUNET_PLUGIN_unload (plugin, ph.solver); 509 GNUNET_PLUGIN_unload (plugin, ph.solver);
508 GNUNET_free (plugin); 510 GNUNET_free (plugin);
509 ph.solver = NULL; 511 ph.solver = NULL;