diff options
author | Christian Grothoff <christian@grothoff.org> | 2011-08-29 10:19:43 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2011-08-29 10:19:43 +0000 |
commit | cddbdf5b928c68ab71b40c950b9f01ea68a9fbdb (patch) | |
tree | b704e00a3af618b2cd174a7f89514eaebd82a1cf /src/mesh/test_mesh_api.c | |
parent | bb4fc4f4007988874f910d4de5492f9629301641 (diff) | |
download | gnunet-cddbdf5b928c68ab71b40c950b9f01ea68a9fbdb.tar.gz gnunet-cddbdf5b928c68ab71b40c950b9f01ea68a9fbdb.zip |
run indent twice, it alternates between two 'canonical' forms, also run whitespace remover
Diffstat (limited to 'src/mesh/test_mesh_api.c')
-rw-r--r-- | src/mesh/test_mesh_api.c | 47 |
1 files changed, 26 insertions, 21 deletions
diff --git a/src/mesh/test_mesh_api.c b/src/mesh/test_mesh_api.c index af6b5e3e7..fbef7ee19 100644 --- a/src/mesh/test_mesh_api.c +++ b/src/mesh/test_mesh_api.c | |||
@@ -67,33 +67,33 @@ static struct GNUNET_MESH_MessageHandler handlers[] = { {&callback, 1, 0}, | |||
67 | static void | 67 | static void |
68 | do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 68 | do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) |
69 | { | 69 | { |
70 | fprintf(stderr, "++++++++ STARTING SHUTDOWN\n"); | 70 | fprintf (stderr, "++++++++ STARTING SHUTDOWN\n"); |
71 | fprintf(stderr, "+++++++++ ABORT TASK\n"); | 71 | fprintf (stderr, "+++++++++ ABORT TASK\n"); |
72 | if (0 != abort_task) | 72 | if (0 != abort_task) |
73 | { | 73 | { |
74 | GNUNET_SCHEDULER_cancel (abort_task); | 74 | GNUNET_SCHEDULER_cancel (abort_task); |
75 | } | 75 | } |
76 | fprintf(stderr, "+++++++++ DISCONNECT MESH\n"); | 76 | fprintf (stderr, "+++++++++ DISCONNECT MESH\n"); |
77 | if (NULL != mesh) | 77 | if (NULL != mesh) |
78 | { | 78 | { |
79 | GNUNET_MESH_disconnect (mesh); | 79 | GNUNET_MESH_disconnect (mesh); |
80 | } | 80 | } |
81 | fprintf(stderr, "+++++++++ KILL PROCESS\n"); | 81 | fprintf (stderr, "+++++++++ KILL PROCESS\n"); |
82 | if (0 != GNUNET_OS_process_kill (arm_pid, SIGTERM)) | 82 | if (0 != GNUNET_OS_process_kill (arm_pid, SIGTERM)) |
83 | { | 83 | { |
84 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); | 84 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); |
85 | } | 85 | } |
86 | fprintf(stderr, "+++++++++ WAIT\n"); | 86 | fprintf (stderr, "+++++++++ WAIT\n"); |
87 | GNUNET_assert (GNUNET_OK == GNUNET_OS_process_wait (arm_pid)); | 87 | GNUNET_assert (GNUNET_OK == GNUNET_OS_process_wait (arm_pid)); |
88 | fprintf(stderr, "+++++++++ PROCESS CLOSE\n"); | 88 | fprintf (stderr, "+++++++++ PROCESS CLOSE\n"); |
89 | GNUNET_OS_process_close (arm_pid); | 89 | GNUNET_OS_process_close (arm_pid); |
90 | fprintf(stderr, "++++++++ END SHUTDOWN\n"); | 90 | fprintf (stderr, "++++++++ END SHUTDOWN\n"); |
91 | } | 91 | } |
92 | 92 | ||
93 | static void | 93 | static void |
94 | do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 94 | do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) |
95 | { | 95 | { |
96 | fprintf(stderr, "++++++++ STARTING ABORT\n"); | 96 | fprintf (stderr, "++++++++ STARTING ABORT\n"); |
97 | if (0 != test_task) | 97 | if (0 != test_task) |
98 | { | 98 | { |
99 | GNUNET_SCHEDULER_cancel (test_task); | 99 | GNUNET_SCHEDULER_cancel (test_task); |
@@ -101,16 +101,16 @@ do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
101 | result = GNUNET_SYSERR; | 101 | result = GNUNET_SYSERR; |
102 | abort_task = 0; | 102 | abort_task = 0; |
103 | do_shutdown (cls, tc); | 103 | do_shutdown (cls, tc); |
104 | fprintf(stderr, "++++++++ END ABORT\n"); | 104 | fprintf (stderr, "++++++++ END ABORT\n"); |
105 | } | 105 | } |
106 | 106 | ||
107 | static void | 107 | static void |
108 | test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 108 | test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) |
109 | { | 109 | { |
110 | struct GNUNET_CONFIGURATION_Handle *cfg = cls; | 110 | struct GNUNET_CONFIGURATION_Handle *cfg = cls; |
111 | static const GNUNET_MESH_ApplicationType app[] = {1,2,3,0}; | 111 | static const GNUNET_MESH_ApplicationType app[] = { 1, 2, 3, 0 }; |
112 | 112 | ||
113 | fprintf(stderr, "++++++++ STARTING TEST\n"); | 113 | fprintf (stderr, "++++++++ STARTING TEST\n"); |
114 | test_task = (GNUNET_SCHEDULER_TaskIdentifier) 0; | 114 | test_task = (GNUNET_SCHEDULER_TaskIdentifier) 0; |
115 | mesh = GNUNET_MESH_connect (cfg, NULL, NULL, handlers, app); | 115 | mesh = GNUNET_MESH_connect (cfg, NULL, NULL, handlers, app); |
116 | if (NULL == mesh) | 116 | if (NULL == mesh) |
@@ -123,8 +123,10 @@ test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
123 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "YAY! CONNECTED TO MESH :D\n"); | 123 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "YAY! CONNECTED TO MESH :D\n"); |
124 | } | 124 | } |
125 | 125 | ||
126 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 3), &do_shutdown, NULL); | 126 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply |
127 | fprintf(stderr, "++++++++ END TEST\n"); | 127 | (GNUNET_TIME_UNIT_SECONDS, 3), &do_shutdown, |
128 | NULL); | ||
129 | fprintf (stderr, "++++++++ END TEST\n"); | ||
128 | } | 130 | } |
129 | 131 | ||
130 | 132 | ||
@@ -132,14 +134,14 @@ static void | |||
132 | run (void *cls, char *const *args, const char *cfgfile, | 134 | run (void *cls, char *const *args, const char *cfgfile, |
133 | const struct GNUNET_CONFIGURATION_Handle *cfg) | 135 | const struct GNUNET_CONFIGURATION_Handle *cfg) |
134 | { | 136 | { |
135 | fprintf(stderr, "++++++++ STARTING RUN\n"); | 137 | fprintf (stderr, "++++++++ STARTING RUN\n"); |
136 | GNUNET_log_setup ("test_mesh_small", | 138 | GNUNET_log_setup ("test_mesh_small", |
137 | #if VERBOSE | 139 | #if VERBOSE |
138 | "DEBUG", | 140 | "DEBUG", |
139 | #else | 141 | #else |
140 | "WARNING", | 142 | "WARNING", |
141 | #endif | 143 | #endif |
142 | NULL); | 144 | NULL); |
143 | arm_pid = | 145 | arm_pid = |
144 | GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm", | 146 | GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm", |
145 | "gnunet-service-arm", | 147 | "gnunet-service-arm", |
@@ -152,10 +154,12 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
152 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply | 154 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply |
153 | (GNUNET_TIME_UNIT_SECONDS, 20), &do_abort, | 155 | (GNUNET_TIME_UNIT_SECONDS, 20), &do_abort, |
154 | NULL); | 156 | NULL); |
155 | test_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &test, (void *)cfg); | 157 | test_task = |
158 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &test, | ||
159 | (void *) cfg); | ||
156 | // GNUNET_SCHEDULER_add_now (&test, (void *)cfg); | 160 | // GNUNET_SCHEDULER_add_now (&test, (void *)cfg); |
157 | 161 | ||
158 | fprintf(stderr, "++++++++ END RUN\n"); | 162 | fprintf (stderr, "++++++++ END RUN\n"); |
159 | } | 163 | } |
160 | 164 | ||
161 | 165 | ||
@@ -163,6 +167,7 @@ int | |||
163 | main (int argc, char *argv[]) | 167 | main (int argc, char *argv[]) |
164 | { | 168 | { |
165 | int ret; | 169 | int ret; |
170 | |||
166 | char *const argv2[] = { "test-mesh-api", | 171 | char *const argv2[] = { "test-mesh-api", |
167 | "-c", "test_mesh.conf", | 172 | "-c", "test_mesh.conf", |
168 | #if VERBOSE | 173 | #if VERBOSE |
@@ -174,7 +179,7 @@ main (int argc, char *argv[]) | |||
174 | GNUNET_GETOPT_OPTION_END | 179 | GNUNET_GETOPT_OPTION_END |
175 | }; | 180 | }; |
176 | 181 | ||
177 | fprintf(stderr, "++++++++ STARTING TEST_API\n"); | 182 | fprintf (stderr, "++++++++ STARTING TEST_API\n"); |
178 | ret = | 183 | ret = |
179 | GNUNET_PROGRAM_run ((sizeof (argv2) / sizeof (char *)) - 1, argv2, | 184 | GNUNET_PROGRAM_run ((sizeof (argv2) / sizeof (char *)) - 1, argv2, |
180 | "test-mesh-api", "nohelp", options, &run, NULL); | 185 | "test-mesh-api", "nohelp", options, &run, NULL); |
@@ -191,6 +196,6 @@ main (int argc, char *argv[]) | |||
191 | return 1; | 196 | return 1; |
192 | } | 197 | } |
193 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test ok\n"); | 198 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test ok\n"); |
194 | fprintf(stderr, "++++++++ END TEST_API\n"); | 199 | fprintf (stderr, "++++++++ END TEST_API\n"); |
195 | return 0; | 200 | return 0; |
196 | } | 201 | } |