aboutsummaryrefslogtreecommitdiff
path: root/src/testbed
diff options
context:
space:
mode:
authorSree Harsha Totakura <totakura@in.tum.de>2012-10-26 12:58:46 +0000
committerSree Harsha Totakura <totakura@in.tum.de>2012-10-26 12:58:46 +0000
commit82bc20a8bcbfb269da4dd54476382c924497e7ec (patch)
tree6c64f597dcbecbf53118d6710bc02ec51da4a4b7 /src/testbed
parent0c1b1c5380cfff0a8e0e3adae4df2ee048a5fe88 (diff)
downloadgnunet-82bc20a8bcbfb269da4dd54476382c924497e7ec.tar.gz
gnunet-82bc20a8bcbfb269da4dd54476382c924497e7ec.zip
removed GNUNET_TESTBED_operation_cancel
Diffstat (limited to 'src/testbed')
-rw-r--r--src/testbed/gnunet-service-testbed.c2
-rw-r--r--src/testbed/gnunet-testbed-profiler.c4
-rw-r--r--src/testbed/testbed_api_testbed.c2
-rw-r--r--src/testbed/testbed_api_topology.c2
4 files changed, 5 insertions, 5 deletions
diff --git a/src/testbed/gnunet-service-testbed.c b/src/testbed/gnunet-service-testbed.c
index 81cf29c5f..1ece6c6bb 100644
--- a/src/testbed/gnunet-service-testbed.c
+++ b/src/testbed/gnunet-service-testbed.c
@@ -3672,7 +3672,7 @@ reghost_free_iterator (void *cls,
3672 cleanup_focc (focc); 3672 cleanup_focc (focc);
3673 } 3673 }
3674 if (NULL != rhc->sub_op) 3674 if (NULL != rhc->sub_op)
3675 GNUNET_TESTBED_operation_cancel (rhc->sub_op); 3675 GNUNET_TESTBED_operation_done (rhc->sub_op);
3676 if (NULL != rhc->client) 3676 if (NULL != rhc->client)
3677 GNUNET_SERVER_client_drop (rhc->client); 3677 GNUNET_SERVER_client_drop (rhc->client);
3678 GNUNET_free (value); 3678 GNUNET_free (value);
diff --git a/src/testbed/gnunet-testbed-profiler.c b/src/testbed/gnunet-testbed-profiler.c
index 4168408e9..0d9143a86 100644
--- a/src/testbed/gnunet-testbed-profiler.c
+++ b/src/testbed/gnunet-testbed-profiler.c
@@ -258,14 +258,14 @@ do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
258 if (NULL != reg_handle) 258 if (NULL != reg_handle)
259 GNUNET_TESTBED_cancel_registration (reg_handle); 259 GNUNET_TESTBED_cancel_registration (reg_handle);
260 if (NULL != topology_op) 260 if (NULL != topology_op)
261 GNUNET_TESTBED_operation_cancel (topology_op); 261 GNUNET_TESTBED_operation_done (topology_op);
262 for (nhost = 0; nhost < num_hosts; nhost++) 262 for (nhost = 0; nhost < num_hosts; nhost++)
263 if (NULL != hosts[nhost]) 263 if (NULL != hosts[nhost])
264 GNUNET_TESTBED_host_destroy (hosts[nhost]); 264 GNUNET_TESTBED_host_destroy (hosts[nhost]);
265 GNUNET_free_non_null (hosts); 265 GNUNET_free_non_null (hosts);
266 while (NULL != (dll_op = dll_op_head)) 266 while (NULL != (dll_op = dll_op_head))
267 { 267 {
268 GNUNET_TESTBED_operation_cancel (dll_op->op); 268 GNUNET_TESTBED_operation_done (dll_op->op);
269 GNUNET_CONTAINER_DLL_remove (dll_op_head, dll_op_tail, dll_op); 269 GNUNET_CONTAINER_DLL_remove (dll_op_head, dll_op_tail, dll_op);
270 GNUNET_free (dll_op); 270 GNUNET_free (dll_op);
271 } 271 }
diff --git a/src/testbed/testbed_api_testbed.c b/src/testbed/testbed_api_testbed.c
index 02b20d214..96ac22c2b 100644
--- a/src/testbed/testbed_api_testbed.c
+++ b/src/testbed/testbed_api_testbed.c
@@ -271,7 +271,7 @@ cleanup_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
271 _("Some operations are still pending. Cancelling them\n")); 271 _("Some operations are still pending. Cancelling them\n"));
272 while (NULL != (dll_op = rc->dll_op_head)) 272 while (NULL != (dll_op = rc->dll_op_head))
273 { 273 {
274 GNUNET_TESTBED_operation_cancel (dll_op->op); 274 GNUNET_TESTBED_operation_done (dll_op->op);
275 GNUNET_CONTAINER_DLL_remove (rc->dll_op_head, rc->dll_op_tail, dll_op); 275 GNUNET_CONTAINER_DLL_remove (rc->dll_op_head, rc->dll_op_tail, dll_op);
276 GNUNET_free (dll_op); 276 GNUNET_free (dll_op);
277 } 277 }
diff --git a/src/testbed/testbed_api_topology.c b/src/testbed/testbed_api_topology.c
index 84202ec8c..edf0f5d3f 100644
--- a/src/testbed/testbed_api_topology.c
+++ b/src/testbed/testbed_api_topology.c
@@ -177,7 +177,7 @@ oprelease_overlay_configure_topology (void *cls)
177 { 177 {
178 for (p = 0; p < tc->link_array_size; p++) 178 for (p = 0; p < tc->link_array_size; p++)
179 if (NULL != tc->link_array[p].op) 179 if (NULL != tc->link_array[p].op)
180 GNUNET_TESTBED_operation_cancel (tc->link_array[p].op); 180 GNUNET_TESTBED_operation_done (tc->link_array[p].op);
181 GNUNET_free (tc->link_array); 181 GNUNET_free (tc->link_array);
182 } 182 }
183 GNUNET_free (tc); 183 GNUNET_free (tc);