diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/include/gnunet_testbed_service.h | 18 | ||||
-rw-r--r-- | src/testbed/gnunet-testbed-profiler.c | 4 | ||||
-rw-r--r-- | src/testbed/gnunet_testbed_mpi_spawn.c | 327 | ||||
-rw-r--r-- | src/testbed/testbed_api_hosts.c | 35 | ||||
-rw-r--r-- | src/testbed/testbed_api_testbed.c | 11 |
5 files changed, 0 insertions, 395 deletions
diff --git a/src/include/gnunet_testbed_service.h b/src/include/gnunet_testbed_service.h index acb444de4..888c6e391 100644 --- a/src/include/gnunet_testbed_service.h +++ b/src/include/gnunet_testbed_service.h | |||
@@ -139,24 +139,6 @@ GNUNET_TESTBED_hosts_load_from_file (const char *filename, | |||
139 | 139 | ||
140 | 140 | ||
141 | /** | 141 | /** |
142 | * Loads the set of host allocated by the LoadLeveler Job Scheduler. This | ||
143 | * function is only available when compiled with support for LoadLeveler and is | ||
144 | * used for running on the SuperMUC | ||
145 | * | ||
146 | * @param cfg the configuration to use as a template while starting a controller | ||
147 | * on any of the loaded hosts. Operation queue sizes specific to a host | ||
148 | * are also read from this configuration handle | ||
149 | * @param hosts set to the hosts found in the file; caller must free this if | ||
150 | * number of hosts returned is greater than 0 | ||
151 | * @return number of hosts returned in 'hosts', 0 on error | ||
152 | */ | ||
153 | unsigned int | ||
154 | GNUNET_TESTBED_hosts_load_from_loadleveler (const struct | ||
155 | GNUNET_CONFIGURATION_Handle *cfg, | ||
156 | struct GNUNET_TESTBED_Host | ||
157 | ***hosts); | ||
158 | |||
159 | /** | ||
160 | * Destroy a host handle. Must only be called once everything | 142 | * Destroy a host handle. Must only be called once everything |
161 | * running on that host has been stopped. | 143 | * running on that host has been stopped. |
162 | * | 144 | * |
diff --git a/src/testbed/gnunet-testbed-profiler.c b/src/testbed/gnunet-testbed-profiler.c index b07c725a3..49d975119 100644 --- a/src/testbed/gnunet-testbed-profiler.c +++ b/src/testbed/gnunet-testbed-profiler.c | |||
@@ -227,11 +227,9 @@ test_run (void *cls, | |||
227 | abort_task = NULL; | 227 | abort_task = NULL; |
228 | return; | 228 | return; |
229 | } | 229 | } |
230 | #if (! ENABLE_SUPERMUC) | ||
231 | fprintf (stdout, "Testbed running, waiting for keystroke to shut down\n"); | 230 | fprintf (stdout, "Testbed running, waiting for keystroke to shut down\n"); |
232 | fflush (stdout); | 231 | fflush (stdout); |
233 | (void) getc (stdin); | 232 | (void) getc (stdin); |
234 | #endif | ||
235 | fprintf (stdout, "Shutting down. Please wait\n"); | 233 | fprintf (stdout, "Shutting down. Please wait\n"); |
236 | fflush (stdout); | 234 | fflush (stdout); |
237 | GNUNET_SCHEDULER_shutdown (); | 235 | GNUNET_SCHEDULER_shutdown (); |
@@ -297,14 +295,12 @@ main (int argc, char *const *argv) | |||
297 | "keystroke but continues to run until a termination " | 295 | "keystroke but continues to run until a termination " |
298 | "signal is received"), | 296 | "signal is received"), |
299 | &noninteractive), | 297 | &noninteractive), |
300 | #if ! ENABLE_SUPERMUC | ||
301 | GNUNET_GETOPT_option_string ('H', | 298 | GNUNET_GETOPT_option_string ('H', |
302 | "hosts", | 299 | "hosts", |
303 | "FILENAME", | 300 | "FILENAME", |
304 | gettext_noop ( | 301 | gettext_noop ( |
305 | "name of the file with the login information for the testbed"), | 302 | "name of the file with the login information for the testbed"), |
306 | &hosts_file), | 303 | &hosts_file), |
307 | #endif | ||
308 | GNUNET_GETOPT_OPTION_END | 304 | GNUNET_GETOPT_OPTION_END |
309 | }; | 305 | }; |
310 | const char *binaryHelp = "gnunet-testbed-profiler [OPTIONS]"; | 306 | const char *binaryHelp = "gnunet-testbed-profiler [OPTIONS]"; |
diff --git a/src/testbed/gnunet_testbed_mpi_spawn.c b/src/testbed/gnunet_testbed_mpi_spawn.c deleted file mode 100644 index 577ffbeba..000000000 --- a/src/testbed/gnunet_testbed_mpi_spawn.c +++ /dev/null | |||
@@ -1,327 +0,0 @@ | |||
1 | #include "platform.h" | ||
2 | #include "gnunet_util_lib.h" | ||
3 | #include "gnunet_testbed_service.h" | ||
4 | |||
5 | |||
6 | /** | ||
7 | * Generic logging shorthand | ||
8 | */ | ||
9 | #define LOG(kind, ...) \ | ||
10 | GNUNET_log (kind, __VA_ARGS__) | ||
11 | |||
12 | /** | ||
13 | * Debug logging shorthand | ||
14 | */ | ||
15 | #define LOG_DEBUG(...) \ | ||
16 | LOG (GNUNET_ERROR_TYPE_DEBUG, __VA_ARGS__) | ||
17 | |||
18 | /** | ||
19 | * Global result | ||
20 | */ | ||
21 | static int ret; | ||
22 | |||
23 | /** | ||
24 | * The child process we spawn | ||
25 | */ | ||
26 | static struct GNUNET_OS_Process *child; | ||
27 | |||
28 | /** | ||
29 | * The arguments including the binary to spawn | ||
30 | */ | ||
31 | static char **argv2; | ||
32 | |||
33 | /** | ||
34 | * Pipe used to communicate shutdown via signal. | ||
35 | */ | ||
36 | static struct GNUNET_DISK_PipeHandle *sigpipe; | ||
37 | |||
38 | /** | ||
39 | * Filename of the unique file | ||
40 | */ | ||
41 | static char *fn; | ||
42 | |||
43 | /** | ||
44 | * Handle to the unique file | ||
45 | */ | ||
46 | static int fh; | ||
47 | |||
48 | /** | ||
49 | * The return code of the binary | ||
50 | */ | ||
51 | static unsigned long child_exit_code; | ||
52 | |||
53 | /** | ||
54 | * The process status of the child | ||
55 | */ | ||
56 | static enum GNUNET_OS_ProcessStatusType child_status; | ||
57 | |||
58 | /** | ||
59 | * Task to kill the child | ||
60 | */ | ||
61 | static struct GNUNET_SCHEDULER_Task *terminate_task_id; | ||
62 | |||
63 | /** | ||
64 | * Task to kill the child | ||
65 | */ | ||
66 | static struct GNUNET_SCHEDULER_Task *child_death_task_id; | ||
67 | |||
68 | /** | ||
69 | * The shutdown task | ||
70 | */ | ||
71 | static void | ||
72 | shutdown_task (void *cls) | ||
73 | { | ||
74 | if (0 != child_exit_code) | ||
75 | { | ||
76 | LOG (GNUNET_ERROR_TYPE_WARNING, "Child exited with error code: %lu\n", | ||
77 | child_exit_code); | ||
78 | ret = 128 + (int) child_exit_code; | ||
79 | } | ||
80 | if (0 != fh) | ||
81 | { | ||
82 | close (fh); | ||
83 | } | ||
84 | if ((NULL != fn) && (0 != unlink (fn))) | ||
85 | { | ||
86 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "open"); | ||
87 | ret = GNUNET_SYSERR; | ||
88 | } | ||
89 | } | ||
90 | |||
91 | |||
92 | static void | ||
93 | terminate_task (void *cls) | ||
94 | { | ||
95 | static int hard_kill; | ||
96 | |||
97 | GNUNET_assert (NULL != child); | ||
98 | terminate_task_id = | ||
99 | GNUNET_SCHEDULER_add_shutdown (&terminate_task, NULL); | ||
100 | if (0 != hard_kill) | ||
101 | { | ||
102 | switch (hard_kill) | ||
103 | { | ||
104 | case 1: | ||
105 | case 2: | ||
106 | LOG (GNUNET_ERROR_TYPE_WARNING, | ||
107 | "%d more interrupts needed to send SIGKILL to the child\n", | ||
108 | 3 - hard_kill); | ||
109 | hard_kill++; | ||
110 | return; | ||
111 | |||
112 | case 3: | ||
113 | GNUNET_break (0 == GNUNET_OS_process_kill (child, SIGKILL)); | ||
114 | return; | ||
115 | } | ||
116 | } | ||
117 | hard_kill++; | ||
118 | GNUNET_break (0 == GNUNET_OS_process_kill (child, GNUNET_TERM_SIG)); | ||
119 | LOG (GNUNET_ERROR_TYPE_INFO, _ ("Waiting for child to exit.\n")); | ||
120 | } | ||
121 | |||
122 | |||
123 | /** | ||
124 | * Task triggered whenever we receive a SIGCHLD (child | ||
125 | * process died). | ||
126 | * | ||
127 | * @param cls closure, NULL if we need to self-restart | ||
128 | */ | ||
129 | static void | ||
130 | child_death_task (void *cls) | ||
131 | { | ||
132 | const struct GNUNET_DISK_FileHandle *pr; | ||
133 | char c[16]; | ||
134 | const struct GNUNET_SCHEDULER_TaskContext *tc; | ||
135 | |||
136 | |||
137 | pr = GNUNET_DISK_pipe_handle (sigpipe, GNUNET_DISK_PIPE_END_READ); | ||
138 | child_death_task_id = NULL; | ||
139 | tc = GNUNET_SCHEDULER_get_task_context (); | ||
140 | if (0 == (tc->reason & GNUNET_SCHEDULER_REASON_READ_READY)) | ||
141 | { | ||
142 | child_death_task_id = | ||
143 | GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL, | ||
144 | pr, &child_death_task, NULL); | ||
145 | return; | ||
146 | } | ||
147 | /* consume the signal */ | ||
148 | GNUNET_break (0 < GNUNET_DISK_file_read (pr, &c, sizeof(c))); | ||
149 | LOG_DEBUG ("Child died\n"); | ||
150 | GNUNET_SCHEDULER_cancel (terminate_task_id); | ||
151 | terminate_task_id = NULL; | ||
152 | GNUNET_assert (GNUNET_OK == GNUNET_OS_process_status (child, &child_status, | ||
153 | &child_exit_code)); | ||
154 | GNUNET_OS_process_destroy (child); | ||
155 | child = NULL; | ||
156 | GNUNET_SCHEDULER_add_now (&shutdown_task, NULL); | ||
157 | } | ||
158 | |||
159 | |||
160 | static void | ||
161 | destroy_hosts (struct GNUNET_TESTBED_Host **hosts, unsigned int nhosts) | ||
162 | { | ||
163 | unsigned int host; | ||
164 | |||
165 | GNUNET_assert (NULL != hosts); | ||
166 | for (host = 0; host < nhosts; host++) | ||
167 | if (NULL != hosts[host]) | ||
168 | GNUNET_TESTBED_host_destroy (hosts[host]); | ||
169 | GNUNET_free (hosts); | ||
170 | hosts = NULL; | ||
171 | } | ||
172 | |||
173 | |||
174 | /** | ||
175 | * The main scheduler run task | ||
176 | * | ||
177 | * @param cls NULL | ||
178 | */ | ||
179 | static void | ||
180 | run (void *cls) | ||
181 | { | ||
182 | struct GNUNET_TESTBED_Host **hosts; | ||
183 | const struct GNUNET_CONFIGURATION_Handle *null_cfg; | ||
184 | char *tmpdir; | ||
185 | char *hostname; | ||
186 | size_t hostname_len; | ||
187 | unsigned int nhosts; | ||
188 | |||
189 | null_cfg = GNUNET_CONFIGURATION_create (); | ||
190 | nhosts = GNUNET_TESTBED_hosts_load_from_loadleveler (null_cfg, &hosts); | ||
191 | if (0 == nhosts) | ||
192 | { | ||
193 | GNUNET_break (0); | ||
194 | ret = GNUNET_SYSERR; | ||
195 | return; | ||
196 | } | ||
197 | hostname_len = GNUNET_OS_get_hostname_max_length (); | ||
198 | hostname = GNUNET_malloc (hostname_len); | ||
199 | if (0 != gethostname (hostname, hostname_len)) | ||
200 | { | ||
201 | LOG (GNUNET_ERROR_TYPE_ERROR, "Cannot get hostname. Exiting\n"); | ||
202 | GNUNET_free (hostname); | ||
203 | destroy_hosts (hosts, nhosts); | ||
204 | ret = GNUNET_SYSERR; | ||
205 | return; | ||
206 | } | ||
207 | if (NULL == strstr (GNUNET_TESTBED_host_get_hostname (hosts[0]), hostname)) | ||
208 | { | ||
209 | LOG_DEBUG ("Exiting as `%s' is not the lowest host\n", hostname); | ||
210 | GNUNET_free (hostname); | ||
211 | ret = GNUNET_OK; | ||
212 | return; | ||
213 | } | ||
214 | LOG_DEBUG ("Will be executing `%s' on host `%s'\n", argv2[0], hostname); | ||
215 | GNUNET_free (hostname); | ||
216 | destroy_hosts (hosts, nhosts); | ||
217 | tmpdir = getenv ("TMPDIR"); | ||
218 | if (NULL == tmpdir) | ||
219 | tmpdir = getenv ("TMP"); | ||
220 | if (NULL == tmpdir) | ||
221 | tmpdir = getenv ("TEMP"); | ||
222 | if (NULL == tmpdir) | ||
223 | tmpdir = "/tmp"; | ||
224 | (void) GNUNET_asprintf (&fn, "%s/gnunet-testbed-spawn.lock", tmpdir); | ||
225 | /* Open the unique file; we can create it then we can spawn the child process | ||
226 | else we exit */ | ||
227 | fh = open (fn, O_CREAT | O_EXCL | O_CLOEXEC, | ||
228 | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP); | ||
229 | if (-1 == fh) | ||
230 | { | ||
231 | if (EEXIST == errno) | ||
232 | { | ||
233 | LOG_DEBUG ("Lock file already created by other process. Exiting\n"); | ||
234 | ret = GNUNET_OK; | ||
235 | return; | ||
236 | } | ||
237 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "open"); | ||
238 | ret = GNUNET_SYSERR; | ||
239 | return; | ||
240 | } | ||
241 | /* Spawn the new process here */ | ||
242 | LOG (GNUNET_ERROR_TYPE_INFO, _ ("Spawning process `%s'\n"), argv2[0]); | ||
243 | child = GNUNET_OS_start_process_vap (GNUNET_NO, GNUNET_OS_INHERIT_STD_ALL, | ||
244 | NULL, | ||
245 | NULL, NULL, | ||
246 | argv2[0], argv2); | ||
247 | if (NULL == child) | ||
248 | { | ||
249 | GNUNET_break (0); | ||
250 | ret = GNUNET_SYSERR; | ||
251 | GNUNET_SCHEDULER_add_now (&shutdown_task, NULL); | ||
252 | return; | ||
253 | } | ||
254 | ret = GNUNET_OK; | ||
255 | terminate_task_id = | ||
256 | GNUNET_SCHEDULER_add_shutdown (&terminate_task, NULL); | ||
257 | child_death_task_id = | ||
258 | GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL, | ||
259 | GNUNET_DISK_pipe_handle (sigpipe, | ||
260 | GNUNET_DISK_PIPE_END_READ), | ||
261 | &child_death_task, NULL); | ||
262 | } | ||
263 | |||
264 | |||
265 | /** | ||
266 | * Signal handler called for SIGCHLD. | ||
267 | */ | ||
268 | static void | ||
269 | sighandler_child_death () | ||
270 | { | ||
271 | static char c; | ||
272 | int old_errno = errno; /* back-up errno */ | ||
273 | |||
274 | GNUNET_break (1 == | ||
275 | GNUNET_DISK_file_write (GNUNET_DISK_pipe_handle | ||
276 | (sigpipe, GNUNET_DISK_PIPE_END_WRITE), | ||
277 | &c, sizeof(c))); | ||
278 | errno = old_errno; /* restore errno */ | ||
279 | } | ||
280 | |||
281 | |||
282 | /** | ||
283 | * Execution start point | ||
284 | */ | ||
285 | int | ||
286 | main (int argc, char *argv[]) | ||
287 | { | ||
288 | struct GNUNET_SIGNAL_Context *shc_chld; | ||
289 | unsigned int cnt; | ||
290 | |||
291 | ret = -1; | ||
292 | if (argc < 2) | ||
293 | { | ||
294 | printf ("Need arguments: gnunet-testbed-mpi-spawn <cmd> <cmd_args>"); | ||
295 | return 1; | ||
296 | } | ||
297 | if (GNUNET_OK != GNUNET_log_setup ("gnunet-testbed-spawn", NULL, NULL)) | ||
298 | { | ||
299 | GNUNET_break (0); | ||
300 | return 1; | ||
301 | } | ||
302 | if (NULL == (sigpipe = GNUNET_DISK_pipe (GNUNET_DISK_PF_NONE))) | ||
303 | { | ||
304 | GNUNET_break (0); | ||
305 | ret = GNUNET_SYSERR; | ||
306 | return 1; | ||
307 | } | ||
308 | shc_chld = | ||
309 | GNUNET_SIGNAL_handler_install (GNUNET_SIGCHLD, &sighandler_child_death); | ||
310 | if (NULL == shc_chld) | ||
311 | { | ||
312 | LOG (GNUNET_ERROR_TYPE_ERROR, "Cannot install a signal handler\n"); | ||
313 | return 1; | ||
314 | } | ||
315 | argv2 = GNUNET_malloc (sizeof(char *) * argc); | ||
316 | for (cnt = 1; cnt < argc; cnt++) | ||
317 | argv2[cnt - 1] = argv[cnt]; | ||
318 | GNUNET_SCHEDULER_run (run, NULL); | ||
319 | GNUNET_free (argv2); | ||
320 | GNUNET_SIGNAL_handler_uninstall (shc_chld); | ||
321 | shc_chld = NULL; | ||
322 | GNUNET_DISK_pipe_close (sigpipe); | ||
323 | GNUNET_free (fn); | ||
324 | if (GNUNET_OK != ret) | ||
325 | return ret; | ||
326 | return 0; | ||
327 | } | ||
diff --git a/src/testbed/testbed_api_hosts.c b/src/testbed/testbed_api_hosts.c index 1a8d9976d..8dd0a4893 100644 --- a/src/testbed/testbed_api_hosts.c +++ b/src/testbed/testbed_api_hosts.c | |||
@@ -568,41 +568,6 @@ simple_resolve (const char *host) | |||
568 | 568 | ||
569 | 569 | ||
570 | /** | 570 | /** |
571 | * Loads the set of host allocated by the LoadLeveler Job Scheduler. This | ||
572 | * function is only available when compiled with support for LoadLeveler and is | ||
573 | * used for running on the SuperMUC | ||
574 | * | ||
575 | * @param cfg the configuration to use as a template while starting a controller | ||
576 | * on any of the loaded hosts. Operation queue sizes specific to a host | ||
577 | * are also read from this configuration handle | ||
578 | * @param hosts set to the hosts found in the file; caller must free this if | ||
579 | * number of hosts returned is greater than 0 | ||
580 | * @return number of hosts returned in 'hosts', 0 on error | ||
581 | */ | ||
582 | unsigned int | ||
583 | GNUNET_TESTBED_hosts_load_from_loadleveler ( | ||
584 | const struct GNUNET_CONFIGURATION_Handle *cfg, | ||
585 | struct GNUNET_TESTBED_Host ***hosts) | ||
586 | { | ||
587 | #if ! ENABLE_SUPERMUC | ||
588 | LOG (GNUNET_ERROR_TYPE_ERROR, | ||
589 | _ ("The function %s is only available when compiled with (--with-ll)\n"), | ||
590 | __func__); | ||
591 | GNUNET_assert (0); | ||
592 | #else | ||
593 | const char *hostfile; | ||
594 | |||
595 | if (NULL == (hostfile = getenv ("MP_SAVEHOSTFILE"))) | ||
596 | { | ||
597 | GNUNET_break (0); | ||
598 | return 0; | ||
599 | } | ||
600 | return GNUNET_TESTBED_hosts_load_from_file (hostfile, cfg, hosts); | ||
601 | #endif | ||
602 | } | ||
603 | |||
604 | |||
605 | /** | ||
606 | * Destroy a host handle. Must only be called once everything | 571 | * Destroy a host handle. Must only be called once everything |
607 | * running on that host has been stopped. | 572 | * running on that host has been stopped. |
608 | * | 573 | * |
diff --git a/src/testbed/testbed_api_testbed.c b/src/testbed/testbed_api_testbed.c index e9b9979ce..e0b76ad78 100644 --- a/src/testbed/testbed_api_testbed.c +++ b/src/testbed/testbed_api_testbed.c | |||
@@ -1265,16 +1265,6 @@ GNUNET_TESTBED_run (const char *host_filename, | |||
1265 | GNUNET_assert (num_peers > 0); | 1265 | GNUNET_assert (num_peers > 0); |
1266 | rc = GNUNET_new (struct GNUNET_TESTBED_RunHandle); | 1266 | rc = GNUNET_new (struct GNUNET_TESTBED_RunHandle); |
1267 | rc->cfg = GNUNET_CONFIGURATION_dup (cfg); | 1267 | rc->cfg = GNUNET_CONFIGURATION_dup (cfg); |
1268 | #if ENABLE_SUPERMUC | ||
1269 | rc->num_hosts = GNUNET_TESTBED_hosts_load_from_loadleveler (rc->cfg, | ||
1270 | &rc->hosts); | ||
1271 | if (0 == rc->num_hosts) | ||
1272 | { | ||
1273 | LOG (GNUNET_ERROR_TYPE_WARNING, | ||
1274 | _ ("No hosts loaded from LoadLeveler. Need at least one host\n")); | ||
1275 | goto error_cleanup; | ||
1276 | } | ||
1277 | #else | ||
1278 | if (NULL != host_filename) | 1268 | if (NULL != host_filename) |
1279 | { | 1269 | { |
1280 | rc->num_hosts = | 1270 | rc->num_hosts = |
@@ -1289,7 +1279,6 @@ GNUNET_TESTBED_run (const char *host_filename, | |||
1289 | } | 1279 | } |
1290 | else | 1280 | else |
1291 | rc->h = GNUNET_TESTBED_host_create (NULL, NULL, rc->cfg, 0); | 1281 | rc->h = GNUNET_TESTBED_host_create (NULL, NULL, rc->cfg, 0); |
1292 | #endif | ||
1293 | rc->num_peers = num_peers; | 1282 | rc->num_peers = num_peers; |
1294 | rc->event_mask = event_mask; | 1283 | rc->event_mask = event_mask; |
1295 | rc->cc = cc; | 1284 | rc->cc = cc; |