diff options
author | Bart Polot <bart@net.in.tum.de> | 2012-12-13 11:42:14 +0000 |
---|---|---|
committer | Bart Polot <bart@net.in.tum.de> | 2012-12-13 11:42:14 +0000 |
commit | d09cb2025a9309d26b8ffb4bfa62e78110142743 (patch) | |
tree | 1754b76fdad8aacd71224ce1833c131f1be2e3cc /src/mesh/gnunet-regex-profiler.c | |
parent | cd5607e7d8566687aa0ac1ca10b91543ebd16c89 (diff) | |
download | gnunet-d09cb2025a9309d26b8ffb4bfa62e78110142743.tar.gz gnunet-d09cb2025a9309d26b8ffb4bfa62e78110142743.zip |
- feedback about abort cause
Diffstat (limited to 'src/mesh/gnunet-regex-profiler.c')
-rw-r--r-- | src/mesh/gnunet-regex-profiler.c | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/src/mesh/gnunet-regex-profiler.c b/src/mesh/gnunet-regex-profiler.c index 14fadd89a..f431d6484 100644 --- a/src/mesh/gnunet-regex-profiler.c +++ b/src/mesh/gnunet-regex-profiler.c | |||
@@ -584,7 +584,9 @@ do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
584 | static void | 584 | static void |
585 | do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 585 | do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) |
586 | { | 586 | { |
587 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Aborting...\n"); | 587 | unsigned long i = (unsigned long) cls; |
588 | |||
589 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Aborting %lu...\n", i); | ||
588 | abort_task = GNUNET_SCHEDULER_NO_TASK; | 590 | abort_task = GNUNET_SCHEDULER_NO_TASK; |
589 | result = GNUNET_SYSERR; | 591 | result = GNUNET_SYSERR; |
590 | if (GNUNET_SCHEDULER_NO_TASK != shutdown_task) | 592 | if (GNUNET_SCHEDULER_NO_TASK != shutdown_task) |
@@ -1161,7 +1163,7 @@ peer_churn_cb (void *cls, const char *emsg) | |||
1161 | GNUNET_TESTBED_operation_done (op); | 1163 | GNUNET_TESTBED_operation_done (op); |
1162 | if (GNUNET_SCHEDULER_NO_TASK != abort_task) | 1164 | if (GNUNET_SCHEDULER_NO_TASK != abort_task) |
1163 | GNUNET_SCHEDULER_cancel (abort_task); | 1165 | GNUNET_SCHEDULER_cancel (abort_task); |
1164 | abort_task = GNUNET_SCHEDULER_add_now (&do_abort, NULL); | 1166 | abort_task = GNUNET_SCHEDULER_add_now (&do_abort, (void*) __LINE__); |
1165 | return; | 1167 | return; |
1166 | } | 1168 | } |
1167 | GNUNET_TESTBED_operation_done (op); | 1169 | GNUNET_TESTBED_operation_done (op); |
@@ -1209,7 +1211,7 @@ peer_create_cb (void *cls, struct GNUNET_TESTBED_Peer *peer, const char *emsg) | |||
1209 | GNUNET_free (dll_op); | 1211 | GNUNET_free (dll_op); |
1210 | if (GNUNET_SCHEDULER_NO_TASK != abort_task) | 1212 | if (GNUNET_SCHEDULER_NO_TASK != abort_task) |
1211 | GNUNET_SCHEDULER_cancel (abort_task); | 1213 | GNUNET_SCHEDULER_cancel (abort_task); |
1212 | abort_task = GNUNET_SCHEDULER_add_now (&do_abort, NULL); | 1214 | abort_task = GNUNET_SCHEDULER_add_now (&do_abort, (void*) __LINE__); |
1213 | return; | 1215 | return; |
1214 | } | 1216 | } |
1215 | 1217 | ||
@@ -1334,7 +1336,7 @@ controller_event_cb (void *cls, | |||
1334 | GNUNET_TESTBED_operation_done (op); | 1336 | GNUNET_TESTBED_operation_done (op); |
1335 | if (GNUNET_SCHEDULER_NO_TASK != abort_task) | 1337 | if (GNUNET_SCHEDULER_NO_TASK != abort_task) |
1336 | GNUNET_SCHEDULER_cancel (abort_task); | 1338 | GNUNET_SCHEDULER_cancel (abort_task); |
1337 | abort_task = GNUNET_SCHEDULER_add_now (&do_abort, NULL); | 1339 | abort_task = GNUNET_SCHEDULER_add_now (&do_abort, (void*) __LINE__); |
1338 | return; | 1340 | return; |
1339 | } | 1341 | } |
1340 | GNUNET_TESTBED_operation_done (op); | 1342 | GNUNET_TESTBED_operation_done (op); |
@@ -1521,7 +1523,7 @@ host_registration_completion (void *cls, const char *emsg) | |||
1521 | _("Host registration failed for a host. Error: %s\n"), emsg); | 1523 | _("Host registration failed for a host. Error: %s\n"), emsg); |
1522 | if (GNUNET_SCHEDULER_NO_TASK != abort_task) | 1524 | if (GNUNET_SCHEDULER_NO_TASK != abort_task) |
1523 | GNUNET_SCHEDULER_cancel (abort_task); | 1525 | GNUNET_SCHEDULER_cancel (abort_task); |
1524 | abort_task = GNUNET_SCHEDULER_add_now (&do_abort, NULL); | 1526 | abort_task = GNUNET_SCHEDULER_add_now (&do_abort, (void*) __LINE__); |
1525 | return; | 1527 | return; |
1526 | } | 1528 | } |
1527 | register_hosts_task = GNUNET_SCHEDULER_add_now (®ister_hosts, NULL); | 1529 | register_hosts_task = GNUNET_SCHEDULER_add_now (®ister_hosts, NULL); |
@@ -1584,7 +1586,8 @@ status_cb (void *cls, const struct GNUNET_CONFIGURATION_Handle *config, int stat | |||
1584 | if (GNUNET_OK != status) | 1586 | if (GNUNET_OK != status) |
1585 | { | 1587 | { |
1586 | mc_proc = NULL; | 1588 | mc_proc = NULL; |
1587 | abort_task = GNUNET_SCHEDULER_add_now (&do_abort, NULL); | 1589 | printf("CRAPPP\n"); |
1590 | abort_task = GNUNET_SCHEDULER_add_now (&do_abort, (void*) __LINE__); | ||
1588 | return; | 1591 | return; |
1589 | } | 1592 | } |
1590 | event_mask = 0; | 1593 | event_mask = 0; |
@@ -1599,12 +1602,12 @@ status_cb (void *cls, const struct GNUNET_CONFIGURATION_Handle *config, int stat | |||
1599 | { | 1602 | { |
1600 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 1603 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, |
1601 | _("Unable to connect to master controller -- Check config\n")); | 1604 | _("Unable to connect to master controller -- Check config\n")); |
1602 | abort_task = GNUNET_SCHEDULER_add_now (&do_abort, NULL); | 1605 | abort_task = GNUNET_SCHEDULER_add_now (&do_abort, (void*) __LINE__); |
1603 | return; | 1606 | return; |
1604 | } | 1607 | } |
1605 | register_hosts_task = GNUNET_SCHEDULER_add_now (®ister_hosts, NULL); | 1608 | register_hosts_task = GNUNET_SCHEDULER_add_now (®ister_hosts, NULL); |
1606 | abort_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, | 1609 | abort_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, |
1607 | &do_abort, NULL); | 1610 | &do_abort, (void*) __LINE__); |
1608 | } | 1611 | } |
1609 | 1612 | ||
1610 | 1613 | ||
@@ -1705,7 +1708,7 @@ host_habitable_cb (void *cls, const struct GNUNET_TESTBED_Host *host, int status | |||
1705 | else | 1708 | else |
1706 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Testbed cannot be started on localhost\n")); | 1709 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Testbed cannot be started on localhost\n")); |
1707 | GNUNET_SCHEDULER_cancel (abort_task); | 1710 | GNUNET_SCHEDULER_cancel (abort_task); |
1708 | abort_task = GNUNET_SCHEDULER_add_now (&do_abort, NULL); | 1711 | abort_task = GNUNET_SCHEDULER_add_now (&do_abort, (void*) __LINE__); |
1709 | return; | 1712 | return; |
1710 | } | 1713 | } |
1711 | hosts_checked++; | 1714 | hosts_checked++; |
@@ -1843,7 +1846,7 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
1843 | abort_task = | 1846 | abort_task = |
1844 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply | 1847 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply |
1845 | (GNUNET_TIME_UNIT_SECONDS, 5), &do_abort, | 1848 | (GNUNET_TIME_UNIT_SECONDS, 5), &do_abort, |
1846 | NULL); | 1849 | (void*) __LINE__); |
1847 | } | 1850 | } |
1848 | 1851 | ||
1849 | 1852 | ||