diff options
author | Christian Grothoff <christian@grothoff.org> | 2020-07-18 00:44:39 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2020-07-18 00:44:39 +0200 |
commit | 7f4ddbcab8598e3d5e29c23ce883cdfa664408f1 (patch) | |
tree | 5f1b18463f641f24fad519e0aefb60b97d707b52 /src/testbed | |
parent | 28ab2c446fba4980a8295d59fdf203a028a35dd6 (diff) | |
download | gnunet-7f4ddbcab8598e3d5e29c23ce883cdfa664408f1.tar.gz gnunet-7f4ddbcab8598e3d5e29c23ce883cdfa664408f1.zip |
merge flags into enum for GNUNET_DISK_pipe() API, fixing #6188
Diffstat (limited to 'src/testbed')
-rw-r--r-- | src/testbed/generate-underlay-topology.c | 12 | ||||
-rw-r--r-- | src/testbed/gnunet-daemon-latency-logger.c | 4 | ||||
-rw-r--r-- | src/testbed/gnunet-daemon-testbed-underlay.c | 4 | ||||
-rw-r--r-- | src/testbed/gnunet-helper-testbed.c | 2 | ||||
-rw-r--r-- | src/testbed/gnunet-service-testbed.h | 2 | ||||
-rw-r--r-- | src/testbed/gnunet_testbed_mpi_spawn.c | 3 | ||||
-rw-r--r-- | src/testbed/test_testbed_api.c | 2 | ||||
-rw-r--r-- | src/testbed/test_testbed_api_2peers_1controller.c | 2 | ||||
-rw-r--r-- | src/testbed/test_testbed_api_controllerlink.c | 2 | ||||
-rw-r--r-- | src/testbed/test_testbed_api_peer_reconfiguration.c | 2 | ||||
-rw-r--r-- | src/testbed/test_testbed_api_peers_manage_services.c | 2 | ||||
-rw-r--r-- | src/testbed/test_testbed_api_statistics.c | 2 | ||||
-rw-r--r-- | src/testbed/test_testbed_api_test.c | 4 | ||||
-rw-r--r-- | src/testbed/testbed_api_hosts.c | 2 |
14 files changed, 22 insertions, 23 deletions
diff --git a/src/testbed/generate-underlay-topology.c b/src/testbed/generate-underlay-topology.c index 726bed179..97c3c1e67 100644 --- a/src/testbed/generate-underlay-topology.c +++ b/src/testbed/generate-underlay-topology.c | |||
@@ -51,12 +51,12 @@ | |||
51 | __LINE__, \ | 51 | __LINE__, \ |
52 | sqlite3_errmsg (db)); \ | 52 | sqlite3_errmsg (db)); \ |
53 | if (msg != NULL) \ | 53 | if (msg != NULL) \ |
54 | GNUNET_asprintf (msg, \ | 54 | GNUNET_asprintf (msg, \ |
55 | _ ("`%s' failed at %s:%u with error: %s"), \ | 55 | _ ("`%s' failed at %s:%u with error: %s"), \ |
56 | cmd, \ | 56 | cmd, \ |
57 | __FILE__, \ | 57 | __FILE__, \ |
58 | __LINE__, \ | 58 | __LINE__, \ |
59 | sqlite3_errmsg (db)); \ | 59 | sqlite3_errmsg (db)); \ |
60 | } while (0) | 60 | } while (0) |
61 | 61 | ||
62 | 62 | ||
diff --git a/src/testbed/gnunet-daemon-latency-logger.c b/src/testbed/gnunet-daemon-latency-logger.c index c13750db7..cbc9cfdbf 100644 --- a/src/testbed/gnunet-daemon-latency-logger.c +++ b/src/testbed/gnunet-daemon-latency-logger.c | |||
@@ -53,8 +53,8 @@ | |||
53 | "`%s' failed at %s:%d with error: %s\n"), \ | 53 | "`%s' failed at %s:%d with error: %s\n"), \ |
54 | cmd, __FILE__, __LINE__, sqlite3_errmsg (db)); \ | 54 | cmd, __FILE__, __LINE__, sqlite3_errmsg (db)); \ |
55 | if (msg != NULL) \ | 55 | if (msg != NULL) \ |
56 | GNUNET_asprintf (msg, _ ("`%s' failed at %s:%u with error: %s"), cmd, \ | 56 | GNUNET_asprintf (msg, _ ("`%s' failed at %s:%u with error: %s"), cmd, \ |
57 | __FILE__, __LINE__, sqlite3_errmsg (db)); \ | 57 | __FILE__, __LINE__, sqlite3_errmsg (db)); \ |
58 | } while (0) | 58 | } while (0) |
59 | 59 | ||
60 | 60 | ||
diff --git a/src/testbed/gnunet-daemon-testbed-underlay.c b/src/testbed/gnunet-daemon-testbed-underlay.c index 2bff7cdd4..c3b424c9b 100644 --- a/src/testbed/gnunet-daemon-testbed-underlay.c +++ b/src/testbed/gnunet-daemon-testbed-underlay.c | |||
@@ -57,8 +57,8 @@ | |||
57 | "`%s' failed at %s:%d with error: %s\n"), \ | 57 | "`%s' failed at %s:%d with error: %s\n"), \ |
58 | cmd, __FILE__, __LINE__, sqlite3_errmsg (db)); \ | 58 | cmd, __FILE__, __LINE__, sqlite3_errmsg (db)); \ |
59 | if (msg != NULL) \ | 59 | if (msg != NULL) \ |
60 | GNUNET_asprintf (msg, _ ("`%s' failed at %s:%u with error: %s"), cmd, \ | 60 | GNUNET_asprintf (msg, _ ("`%s' failed at %s:%u with error: %s"), cmd, \ |
61 | __FILE__, __LINE__, sqlite3_errmsg (db)); \ | 61 | __FILE__, __LINE__, sqlite3_errmsg (db)); \ |
62 | } while (0) | 62 | } while (0) |
63 | 63 | ||
64 | 64 | ||
diff --git a/src/testbed/gnunet-helper-testbed.c b/src/testbed/gnunet-helper-testbed.c index 03be376fe..5d0c3b048 100644 --- a/src/testbed/gnunet-helper-testbed.c +++ b/src/testbed/gnunet-helper-testbed.c | |||
@@ -587,7 +587,7 @@ main (int argc, char **argv) | |||
587 | 587 | ||
588 | status = GNUNET_OK; | 588 | status = GNUNET_OK; |
589 | if (NULL == | 589 | if (NULL == |
590 | (sigpipe = GNUNET_DISK_pipe (GNUNET_NO, GNUNET_NO, GNUNET_NO, GNUNET_NO))) | 590 | (sigpipe = GNUNET_DISK_pipe (GNUNET_DISK_PF_NONE))) |
591 | { | 591 | { |
592 | GNUNET_break (0); | 592 | GNUNET_break (0); |
593 | return 1; | 593 | return 1; |
diff --git a/src/testbed/gnunet-service-testbed.h b/src/testbed/gnunet-service-testbed.h index 03955327c..ae477ccb4 100644 --- a/src/testbed/gnunet-service-testbed.h +++ b/src/testbed/gnunet-service-testbed.h | |||
@@ -498,7 +498,7 @@ extern char *GST_stats_dir; | |||
498 | GNUNET_assert (size <= accommodate_size); \ | 498 | GNUNET_assert (size <= accommodate_size); \ |
499 | growth_size = size; \ | 499 | growth_size = size; \ |
500 | while (growth_size <= accommodate_size) \ | 500 | while (growth_size <= accommodate_size) \ |
501 | growth_size += LIST_GROW_STEP; \ | 501 | growth_size += LIST_GROW_STEP; \ |
502 | GNUNET_array_grow (ptr, size, growth_size); \ | 502 | GNUNET_array_grow (ptr, size, growth_size); \ |
503 | GNUNET_assert (size > accommodate_size); \ | 503 | GNUNET_assert (size > accommodate_size); \ |
504 | } while (0) | 504 | } while (0) |
diff --git a/src/testbed/gnunet_testbed_mpi_spawn.c b/src/testbed/gnunet_testbed_mpi_spawn.c index 353cc2881..577ffbeba 100644 --- a/src/testbed/gnunet_testbed_mpi_spawn.c +++ b/src/testbed/gnunet_testbed_mpi_spawn.c | |||
@@ -299,8 +299,7 @@ main (int argc, char *argv[]) | |||
299 | GNUNET_break (0); | 299 | GNUNET_break (0); |
300 | return 1; | 300 | return 1; |
301 | } | 301 | } |
302 | if (NULL == (sigpipe = GNUNET_DISK_pipe (GNUNET_NO, GNUNET_NO, | 302 | if (NULL == (sigpipe = GNUNET_DISK_pipe (GNUNET_DISK_PF_NONE))) |
303 | GNUNET_NO, GNUNET_NO))) | ||
304 | { | 303 | { |
305 | GNUNET_break (0); | 304 | GNUNET_break (0); |
306 | ret = GNUNET_SYSERR; | 305 | ret = GNUNET_SYSERR; |
diff --git a/src/testbed/test_testbed_api.c b/src/testbed/test_testbed_api.c index dd270df17..49f1d9ae9 100644 --- a/src/testbed/test_testbed_api.c +++ b/src/testbed/test_testbed_api.c | |||
@@ -163,7 +163,7 @@ do_shutdown (void *cls) | |||
163 | if (! (cond)) { \ | 163 | if (! (cond)) { \ |
164 | GNUNET_break (0); \ | 164 | GNUNET_break (0); \ |
165 | if (NULL != abort_task) \ | 165 | if (NULL != abort_task) \ |
166 | GNUNET_SCHEDULER_cancel (abort_task); \ | 166 | GNUNET_SCHEDULER_cancel (abort_task); \ |
167 | abort_task = NULL; \ | 167 | abort_task = NULL; \ |
168 | GNUNET_SCHEDULER_add_now (do_shutdown, NULL); \ | 168 | GNUNET_SCHEDULER_add_now (do_shutdown, NULL); \ |
169 | ret; \ | 169 | ret; \ |
diff --git a/src/testbed/test_testbed_api_2peers_1controller.c b/src/testbed/test_testbed_api_2peers_1controller.c index c854d1ccc..4a8b8a584 100644 --- a/src/testbed/test_testbed_api_2peers_1controller.c +++ b/src/testbed/test_testbed_api_2peers_1controller.c | |||
@@ -173,7 +173,7 @@ static enum Stage result; | |||
173 | if (! (cond)) { \ | 173 | if (! (cond)) { \ |
174 | GNUNET_break (0); \ | 174 | GNUNET_break (0); \ |
175 | if (NULL != abort_task) \ | 175 | if (NULL != abort_task) \ |
176 | GNUNET_SCHEDULER_cancel (abort_task); \ | 176 | GNUNET_SCHEDULER_cancel (abort_task); \ |
177 | abort_task = NULL; \ | 177 | abort_task = NULL; \ |
178 | GNUNET_SCHEDULER_add_now (do_shutdown, NULL); \ | 178 | GNUNET_SCHEDULER_add_now (do_shutdown, NULL); \ |
179 | return; \ | 179 | return; \ |
diff --git a/src/testbed/test_testbed_api_controllerlink.c b/src/testbed/test_testbed_api_controllerlink.c index 16a3f7b91..784407520 100644 --- a/src/testbed/test_testbed_api_controllerlink.c +++ b/src/testbed/test_testbed_api_controllerlink.c | |||
@@ -298,7 +298,7 @@ static enum Stage result; | |||
298 | { \ | 298 | { \ |
299 | GNUNET_break (0); \ | 299 | GNUNET_break (0); \ |
300 | if (NULL != abort_task) \ | 300 | if (NULL != abort_task) \ |
301 | GNUNET_SCHEDULER_cancel (abort_task); \ | 301 | GNUNET_SCHEDULER_cancel (abort_task); \ |
302 | abort_task = NULL; \ | 302 | abort_task = NULL; \ |
303 | GNUNET_SCHEDULER_shutdown (); \ | 303 | GNUNET_SCHEDULER_shutdown (); \ |
304 | return; \ | 304 | return; \ |
diff --git a/src/testbed/test_testbed_api_peer_reconfiguration.c b/src/testbed/test_testbed_api_peer_reconfiguration.c index 91955c13d..22dd46b53 100644 --- a/src/testbed/test_testbed_api_peer_reconfiguration.c +++ b/src/testbed/test_testbed_api_peer_reconfiguration.c | |||
@@ -77,7 +77,7 @@ enum | |||
77 | if (! (cond)) { \ | 77 | if (! (cond)) { \ |
78 | GNUNET_break (0); \ | 78 | GNUNET_break (0); \ |
79 | if (NULL != abort_task) \ | 79 | if (NULL != abort_task) \ |
80 | GNUNET_SCHEDULER_cancel (abort_task); \ | 80 | GNUNET_SCHEDULER_cancel (abort_task); \ |
81 | abort_task = GNUNET_SCHEDULER_add_now (&do_abort, NULL); \ | 81 | abort_task = GNUNET_SCHEDULER_add_now (&do_abort, NULL); \ |
82 | ret; \ | 82 | ret; \ |
83 | } \ | 83 | } \ |
diff --git a/src/testbed/test_testbed_api_peers_manage_services.c b/src/testbed/test_testbed_api_peers_manage_services.c index 6d4f8196a..93b0da550 100644 --- a/src/testbed/test_testbed_api_peers_manage_services.c +++ b/src/testbed/test_testbed_api_peers_manage_services.c | |||
@@ -92,7 +92,7 @@ enum | |||
92 | if (! (cond)) { \ | 92 | if (! (cond)) { \ |
93 | GNUNET_break (0); \ | 93 | GNUNET_break (0); \ |
94 | if (NULL != abort_task) \ | 94 | if (NULL != abort_task) \ |
95 | GNUNET_SCHEDULER_cancel (abort_task); \ | 95 | GNUNET_SCHEDULER_cancel (abort_task); \ |
96 | abort_task = GNUNET_SCHEDULER_add_now (&do_abort, NULL); \ | 96 | abort_task = GNUNET_SCHEDULER_add_now (&do_abort, NULL); \ |
97 | ret; \ | 97 | ret; \ |
98 | } \ | 98 | } \ |
diff --git a/src/testbed/test_testbed_api_statistics.c b/src/testbed/test_testbed_api_statistics.c index dc305d008..4d42cda6a 100644 --- a/src/testbed/test_testbed_api_statistics.c +++ b/src/testbed/test_testbed_api_statistics.c | |||
@@ -76,7 +76,7 @@ static unsigned int num_seen_peers; | |||
76 | if (! (cond)) { \ | 76 | if (! (cond)) { \ |
77 | GNUNET_break (0); \ | 77 | GNUNET_break (0); \ |
78 | if (NULL != abort_task) \ | 78 | if (NULL != abort_task) \ |
79 | GNUNET_SCHEDULER_cancel (abort_task); \ | 79 | GNUNET_SCHEDULER_cancel (abort_task); \ |
80 | abort_task = GNUNET_SCHEDULER_add_now (&do_abort, NULL); \ | 80 | abort_task = GNUNET_SCHEDULER_add_now (&do_abort, NULL); \ |
81 | ret; \ | 81 | ret; \ |
82 | } \ | 82 | } \ |
diff --git a/src/testbed/test_testbed_api_test.c b/src/testbed/test_testbed_api_test.c index d3fec78d9..aefbd340e 100644 --- a/src/testbed/test_testbed_api_test.c +++ b/src/testbed/test_testbed_api_test.c | |||
@@ -90,10 +90,10 @@ do_shutdown (void *cls) | |||
90 | if (! (cond)) { \ | 90 | if (! (cond)) { \ |
91 | GNUNET_break (0); \ | 91 | GNUNET_break (0); \ |
92 | if (NULL != abort_task) \ | 92 | if (NULL != abort_task) \ |
93 | GNUNET_SCHEDULER_cancel (abort_task); \ | 93 | GNUNET_SCHEDULER_cancel (abort_task); \ |
94 | abort_task = NULL; \ | 94 | abort_task = NULL; \ |
95 | if (NULL == shutdown_task) \ | 95 | if (NULL == shutdown_task) \ |
96 | shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL); \ | 96 | shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL); \ |
97 | return; \ | 97 | return; \ |
98 | } \ | 98 | } \ |
99 | } while (0) | 99 | } while (0) |
diff --git a/src/testbed/testbed_api_hosts.c b/src/testbed/testbed_api_hosts.c index 152762280..95a6bf76f 100644 --- a/src/testbed/testbed_api_hosts.c +++ b/src/testbed/testbed_api_hosts.c | |||
@@ -56,7 +56,7 @@ | |||
56 | do \ | 56 | do \ |
57 | { \ | 57 | { \ |
58 | if (cond) \ | 58 | if (cond) \ |
59 | break; \ | 59 | break; \ |
60 | LOG (GNUNET_ERROR_TYPE_ERROR, "API violation detected: %s\n", errstr); \ | 60 | LOG (GNUNET_ERROR_TYPE_ERROR, "API violation detected: %s\n", errstr); \ |
61 | GNUNET_assert (0); \ | 61 | GNUNET_assert (0); \ |
62 | } while (0) | 62 | } while (0) |