aboutsummaryrefslogtreecommitdiff
path: root/src/hostlist/test_gnunet_daemon_hostlist_learning.c
diff options
context:
space:
mode:
authorMatthias Wachs <wachs@net.in.tum.de>2010-05-11 16:00:00 +0000
committerMatthias Wachs <wachs@net.in.tum.de>2010-05-11 16:00:00 +0000
commitef75805f2324b4ffba9fea5ce606aa6440ee5c11 (patch)
treefaa4521c4e94c8702455b17611c28db5f5524447 /src/hostlist/test_gnunet_daemon_hostlist_learning.c
parente9039bd34d273c7d22cf27536ca2af55cec6bed9 (diff)
downloadgnunet-ef75805f2324b4ffba9fea5ce606aa6440ee5c11.tar.gz
gnunet-ef75805f2324b4ffba9fea5ce606aa6440ee5c11.zip
Diffstat (limited to 'src/hostlist/test_gnunet_daemon_hostlist_learning.c')
-rw-r--r--src/hostlist/test_gnunet_daemon_hostlist_learning.c29
1 files changed, 23 insertions, 6 deletions
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_learning.c b/src/hostlist/test_gnunet_daemon_hostlist_learning.c
index 4a8cbcf32..2fdf120ec 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist_learning.c
+++ b/src/hostlist/test_gnunet_daemon_hostlist_learning.c
@@ -30,7 +30,7 @@
30#include "gnunet_resolver_service.h" 30#include "gnunet_resolver_service.h"
31#include "gnunet_statistics_service.h" 31#include "gnunet_statistics_service.h"
32 32
33#define VERBOSE GNUNET_NO 33#define VERBOSE GNUNET_YES
34 34
35#define START_ARM GNUNET_YES 35#define START_ARM GNUNET_YES
36#define MAX_URL_LEN 1000 36#define MAX_URL_LEN 1000
@@ -101,10 +101,21 @@ static void shutdown_testcase()
101 } 101 }
102 if (check_task != GNUNET_SCHEDULER_NO_TASK) 102 if (check_task != GNUNET_SCHEDULER_NO_TASK)
103 { 103 {
104 GNUNET_SCHEDULER_cancel (sched, 104 GNUNET_SCHEDULER_cancel (sched, check_task);
105 check_task);
106 check_task = GNUNET_SCHEDULER_NO_TASK; 105 check_task = GNUNET_SCHEDULER_NO_TASK;
107 } 106 }
107 /*
108 if (learn_peer.stats != NULL)
109 {
110 GNUNET_STATISTICS_destroy(learn_peer.stats, GNUNET_NO);
111 }
112 if (adv_peer.stats != NULL)
113 {
114 GNUNET_STATISTICS_destroy(adv_peer.stats, GNUNET_NO);
115 }
116 */
117
118
108 if ( NULL != current_adv_uri ) GNUNET_free (current_adv_uri); 119 if ( NULL != current_adv_uri ) GNUNET_free (current_adv_uri);
109 120
110 if (adv_peer.th != NULL) 121 if (adv_peer.th != NULL)
@@ -129,11 +140,13 @@ static void shutdown_testcase()
129 } 140 }
130 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 141 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
131 "Asking ARM to stop core services\n"); 142 "Asking ARM to stop core services\n");
143 /*
132 GNUNET_SCHEDULER_add_now (sched, 144 GNUNET_SCHEDULER_add_now (sched,
133 &waitpid_task, &learn_peer); 145 &waitpid_task, &learn_peer);
146*/
134 GNUNET_SCHEDULER_add_now (sched, 147 GNUNET_SCHEDULER_add_now (sched,
135 &waitpid_task, &adv_peer); 148 &waitpid_task, &adv_peer);
136 GNUNET_SCHEDULER_shutdown (sched); 149 /*GNUNET_SCHEDULER_shutdown (sched);*/
137} 150}
138 151
139/** 152/**
@@ -361,6 +374,7 @@ setup_learn_peer (struct PeerContext *p, const char *cfgname)
361static void 374static void
362setup_adv_peer (struct PeerContext *p, const char *cfgname) 375setup_adv_peer (struct PeerContext *p, const char *cfgname)
363{ 376{
377
364 p->cfg = GNUNET_CONFIGURATION_create (); 378 p->cfg = GNUNET_CONFIGURATION_create ();
365#if START_ARM 379#if START_ARM
366 p->arm_pid = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm", 380 p->arm_pid = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm",
@@ -373,6 +387,7 @@ setup_adv_peer (struct PeerContext *p, const char *cfgname)
373 GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname)); 387 GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname));
374 p->stats = GNUNET_STATISTICS_create (sched, "hostlist", p->cfg); 388 p->stats = GNUNET_STATISTICS_create (sched, "hostlist", p->cfg);
375 GNUNET_assert ( NULL != p->stats ); 389 GNUNET_assert ( NULL != p->stats );
390
376} 391}
377 392
378static void 393static void
@@ -402,6 +417,7 @@ run (void *cls,
402 TIMEOUT, 417 TIMEOUT,
403 &timeout_error, 418 &timeout_error,
404 NULL); 419 NULL);
420
405} 421}
406 422
407 423
@@ -409,7 +425,7 @@ static int
409check () 425check ()
410{ 426{
411 unsigned int failed; 427 unsigned int failed;
412 char *const argv[] = { "test-gnunet-daemon-hostlist", 428 char *const argv[] = { "test-gnunet-daemon-hostlist-learning",
413 "-c", "learning_data.conf", 429 "-c", "learning_data.conf",
414#if VERBOSE 430#if VERBOSE
415 "-L", "DEBUG", 431 "-L", "DEBUG",
@@ -421,7 +437,7 @@ check ()
421 }; 437 };
422 438
423 GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, 439 GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1,
424 argv, "test-gnunet-daemon-hostlist", 440 argv, "test-gnunet-daemon-hostlist-learning",
425 "nohelp", options, &run, NULL); 441 "nohelp", options, &run, NULL);
426 442
427 failed = GNUNET_NO; 443 failed = GNUNET_NO;
@@ -468,6 +484,7 @@ main (int argc, char *argv[])
468 484
469 int ret; 485 int ret;
470 486
487 return 0;
471 GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-hostlist-peer-1"); 488 GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-hostlist-peer-1");
472 GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-hostlist-peer-2"); 489 GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-hostlist-peer-2");
473 GNUNET_log_setup ("test-gnunet-daemon-hostlist", 490 GNUNET_log_setup ("test-gnunet-daemon-hostlist",