diff options
author | Nathan S. Evans <evans@in.tum.de> | 2010-02-08 16:51:20 +0000 |
---|---|---|
committer | Nathan S. Evans <evans@in.tum.de> | 2010-02-08 16:51:20 +0000 |
commit | cb01deba9af1ccd46b7d5bd0a9efc5a900ee0e64 (patch) | |
tree | b5a59675768ed8a72585afd513c1972ef4de7b21 /src/testing/test_testing_group.c | |
parent | 19b13a33872cef3616e188daade61fc8b662ea35 (diff) | |
download | gnunet-cb01deba9af1ccd46b7d5bd0a9efc5a900ee0e64.tar.gz gnunet-cb01deba9af1ccd46b7d5bd0a9efc5a900ee0e64.zip |
testing changes, beginning of topology stuff
Diffstat (limited to 'src/testing/test_testing_group.c')
-rw-r--r-- | src/testing/test_testing_group.c | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/src/testing/test_testing_group.c b/src/testing/test_testing_group.c index 1d38ef5ec..2b6df732e 100644 --- a/src/testing/test_testing_group.c +++ b/src/testing/test_testing_group.c | |||
@@ -42,11 +42,11 @@ static struct GNUNET_TESTING_PeerGroup *pg; | |||
42 | static struct GNUNET_SCHEDULER_Handle *sched; | 42 | static struct GNUNET_SCHEDULER_Handle *sched; |
43 | 43 | ||
44 | 44 | ||
45 | static void my_cb(void *cls, | 45 | static void |
46 | const struct GNUNET_PeerIdentity *id, | 46 | my_cb (void *cls, |
47 | const struct GNUNET_CONFIGURATION_Handle *cfg, | 47 | const struct GNUNET_PeerIdentity *id, |
48 | struct GNUNET_TESTING_Daemon *d, | 48 | const struct GNUNET_CONFIGURATION_Handle *cfg, |
49 | const char *emsg) | 49 | struct GNUNET_TESTING_Daemon *d, const char *emsg) |
50 | { | 50 | { |
51 | GNUNET_assert (id != NULL); | 51 | GNUNET_assert (id != NULL); |
52 | peers_left--; | 52 | peers_left--; |
@@ -62,19 +62,17 @@ static void | |||
62 | run (void *cls, | 62 | run (void *cls, |
63 | struct GNUNET_SCHEDULER_Handle *s, | 63 | struct GNUNET_SCHEDULER_Handle *s, |
64 | char *const *args, | 64 | char *const *args, |
65 | const char *cfgfile, | 65 | const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg) |
66 | const struct GNUNET_CONFIGURATION_Handle *cfg) | ||
67 | { | 66 | { |
68 | sched = s; | 67 | sched = s; |
69 | ok = 1; | 68 | ok = 1; |
70 | #if VERBOSE | 69 | #if VERBOSE |
71 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 70 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting daemons.\n"); |
72 | "Starting daemons.\n"); | ||
73 | #endif | 71 | #endif |
74 | peers_left = 4; | 72 | peers_left = 8; |
75 | pg = GNUNET_TESTING_daemons_start (sched, cfg, | 73 | pg = GNUNET_TESTING_daemons_start (sched, cfg, |
76 | peers_left, | 74 | peers_left, |
77 | &my_cb, NULL, NULL); | 75 | &my_cb, NULL, NULL, NULL, NULL); |
78 | GNUNET_assert (pg != NULL); | 76 | GNUNET_assert (pg != NULL); |
79 | } | 77 | } |
80 | 78 | ||