diff options
author | Sree Harsha Totakura <totakura@in.tum.de> | 2012-08-31 10:36:28 +0000 |
---|---|---|
committer | Sree Harsha Totakura <totakura@in.tum.de> | 2012-08-31 10:36:28 +0000 |
commit | a94a1861d123fe850d2ab5ae74cbb59b132a15ea (patch) | |
tree | a16d2518067d13f2463e83cd9dc66bdd6b733621 /src/testbed/test_testbed_api_testbed_run.c | |
parent | d0c55c3ee57913977b1497ea0e6f20573820b206 (diff) | |
download | gnunet-a94a1861d123fe850d2ab5ae74cbb59b132a15ea.tar.gz gnunet-a94a1861d123fe850d2ab5ae74cbb59b132a15ea.zip |
adhering to indentation standard
Diffstat (limited to 'src/testbed/test_testbed_api_testbed_run.c')
-rw-r--r-- | src/testbed/test_testbed_api_testbed_run.c | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/src/testbed/test_testbed_api_testbed_run.c b/src/testbed/test_testbed_api_testbed_run.c index 31b633032..a9a2a8192 100644 --- a/src/testbed/test_testbed_api_testbed_run.c +++ b/src/testbed/test_testbed_api_testbed_run.c | |||
@@ -21,7 +21,7 @@ | |||
21 | /** | 21 | /** |
22 | * @file testbed/test_testbed_api_testbed_run.c | 22 | * @file testbed/test_testbed_api_testbed_run.c |
23 | * @brief Test cases for testing high-level testbed management | 23 | * @brief Test cases for testing high-level testbed management |
24 | * @author Sree Harsha Totakura <sreeharsha@totakura.in> | 24 | * @author Sree Harsha Totakura <sreeharsha@totakura.in> |
25 | */ | 25 | */ |
26 | 26 | ||
27 | #include "platform.h" | 27 | #include "platform.h" |
@@ -110,7 +110,7 @@ static void | |||
110 | controller_event_cb (void *cls, | 110 | controller_event_cb (void *cls, |
111 | const struct GNUNET_TESTBED_EventInformation *event) | 111 | const struct GNUNET_TESTBED_EventInformation *event) |
112 | { | 112 | { |
113 | 113 | ||
114 | switch (event->type) | 114 | switch (event->type) |
115 | { | 115 | { |
116 | case GNUNET_TESTBED_ET_PEER_START: | 116 | case GNUNET_TESTBED_ET_PEER_START: |
@@ -125,7 +125,7 @@ controller_event_cb (void *cls, | |||
125 | 125 | ||
126 | 126 | ||
127 | /** | 127 | /** |
128 | * Main run function. | 128 | * Main run function. |
129 | * | 129 | * |
130 | * @param cls NULL | 130 | * @param cls NULL |
131 | * @param args arguments passed to GNUNET_PROGRAM_run | 131 | * @param args arguments passed to GNUNET_PROGRAM_run |
@@ -137,7 +137,7 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
137 | const struct GNUNET_CONFIGURATION_Handle *config) | 137 | const struct GNUNET_CONFIGURATION_Handle *config) |
138 | { | 138 | { |
139 | uint64_t event_mask; | 139 | uint64_t event_mask; |
140 | 140 | ||
141 | event_mask = 0; | 141 | event_mask = 0; |
142 | event_mask |= (1LL << GNUNET_TESTBED_ET_PEER_START); | 142 | event_mask |= (1LL << GNUNET_TESTBED_ET_PEER_START); |
143 | event_mask |= (1LL << GNUNET_TESTBED_ET_PEER_STOP); | 143 | event_mask |= (1LL << GNUNET_TESTBED_ET_PEER_STOP); |
@@ -146,18 +146,22 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
146 | event_mask |= (1LL << GNUNET_TESTBED_ET_OPERATION_FINISHED); | 146 | event_mask |= (1LL << GNUNET_TESTBED_ET_OPERATION_FINISHED); |
147 | GNUNET_TESTBED_run (NULL, config, NUM_PEERS, event_mask, &controller_event_cb, | 147 | GNUNET_TESTBED_run (NULL, config, NUM_PEERS, event_mask, &controller_event_cb, |
148 | NULL, &master_task, NULL); | 148 | NULL, &master_task, NULL); |
149 | abort_task = GNUNET_SCHEDULER_add_delayed | 149 | abort_task = |
150 | (GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5), &do_abort, NULL); | 150 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply |
151 | (GNUNET_TIME_UNIT_SECONDS, 5), &do_abort, | ||
152 | NULL); | ||
151 | } | 153 | } |
152 | 154 | ||
153 | 155 | ||
154 | /** | 156 | /** |
155 | * Main function | 157 | * Main function |
156 | */ | 158 | */ |
157 | int main (int argc, char **argv) | 159 | int |
160 | main (int argc, char **argv) | ||
158 | { | 161 | { |
159 | int ret; | 162 | int ret; |
160 | char *const argv2[] = { | 163 | |
164 | char *const argv2[] = { | ||
161 | "test_testbed_api_testbed_run", | 165 | "test_testbed_api_testbed_run", |
162 | "-c", "test_testbed_api.conf", | 166 | "-c", "test_testbed_api.conf", |
163 | NULL | 167 | NULL |
@@ -167,9 +171,10 @@ int main (int argc, char **argv) | |||
167 | }; | 171 | }; |
168 | 172 | ||
169 | result = GNUNET_SYSERR; | 173 | result = GNUNET_SYSERR; |
170 | ret = GNUNET_PROGRAM_run ((sizeof (argv2) / sizeof (char *)) - 1, argv2, | 174 | ret = |
171 | "test_testbed_api_testbed_run", "nohelp", options, | 175 | GNUNET_PROGRAM_run ((sizeof (argv2) / sizeof (char *)) - 1, argv2, |
172 | &run, NULL); | 176 | "test_testbed_api_testbed_run", "nohelp", options, |
177 | &run, NULL); | ||
173 | if ((GNUNET_OK != ret) || (GNUNET_OK != result)) | 178 | if ((GNUNET_OK != ret) || (GNUNET_OK != result)) |
174 | return 1; | 179 | return 1; |
175 | return 0; | 180 | return 0; |