diff options
author | lurchi <lurchi@strangeplace.net> | 2017-08-09 13:28:45 +0200 |
---|---|---|
committer | lurchi <lurchi@strangeplace.net> | 2017-08-09 13:28:45 +0200 |
commit | 8bff0082dd564946d184b5eb8f7e2b253e65aeee (patch) | |
tree | 2eb82988bf2ec51a5a08d06ab3e6545216aed1fc /src | |
parent | 99603b4ebf07ea30130514f9b8770d22f2bee3fd (diff) | |
download | gnunet-8bff0082dd564946d184b5eb8f7e2b253e65aeee.tar.gz gnunet-8bff0082dd564946d184b5eb8f7e2b253e65aeee.zip |
fix indentation; remove unneeded set_wakeup call
Diffstat (limited to 'src')
-rw-r--r-- | src/util/scheduler.c | 32 |
1 files changed, 14 insertions, 18 deletions
diff --git a/src/util/scheduler.c b/src/util/scheduler.c index 68143d051..8a7155d07 100644 --- a/src/util/scheduler.c +++ b/src/util/scheduler.c | |||
@@ -1238,7 +1238,6 @@ add_without_sets (struct GNUNET_TIME_Relative delay, | |||
1238 | } | 1238 | } |
1239 | } | 1239 | } |
1240 | #endif | 1240 | #endif |
1241 | |||
1242 | #if PROFILE_DELAYS | 1241 | #if PROFILE_DELAYS |
1243 | t->start_time = GNUNET_TIME_absolute_get (); | 1242 | t->start_time = GNUNET_TIME_absolute_get (); |
1244 | #endif | 1243 | #endif |
@@ -1619,7 +1618,7 @@ GNUNET_SCHEDULER_task_ready (struct GNUNET_SCHEDULER_Task *task, | |||
1619 | reason |= GNUNET_SCHEDULER_REASON_WRITE_READY; | 1618 | reason |= GNUNET_SCHEDULER_REASON_WRITE_READY; |
1620 | reason |= GNUNET_SCHEDULER_REASON_PREREQ_DONE; | 1619 | reason |= GNUNET_SCHEDULER_REASON_PREREQ_DONE; |
1621 | task->reason = reason; | 1620 | task->reason = reason; |
1622 | task->fds = &task->fdx; | 1621 | task->fds = &task->fdx; // FIXME: if task contains a list of fds, this is wrong! |
1623 | task->fdx.et = et; | 1622 | task->fdx.et = et; |
1624 | task->fds_len = 1; | 1623 | task->fds_len = 1; |
1625 | GNUNET_CONTAINER_DLL_remove (pending_head, | 1624 | GNUNET_CONTAINER_DLL_remove (pending_head, |
@@ -1666,9 +1665,6 @@ GNUNET_SCHEDULER_run_from_driver (struct GNUNET_SCHEDULER_Handle *sh) | |||
1666 | pos); | 1665 | pos); |
1667 | if (pending_timeout_last == pos) | 1666 | if (pending_timeout_last == pos) |
1668 | pending_timeout_last = NULL; | 1667 | pending_timeout_last = NULL; |
1669 | else | ||
1670 | scheduler_driver->set_wakeup(scheduler_driver->cls,pending_timeout_head->timeout); | ||
1671 | |||
1672 | queue_ready_task (pos); | 1668 | queue_ready_task (pos); |
1673 | } | 1669 | } |
1674 | 1670 | ||
@@ -1701,13 +1697,13 @@ GNUNET_SCHEDULER_run_from_driver (struct GNUNET_SCHEDULER_Handle *sh) | |||
1701 | active_task = pos; | 1697 | active_task = pos; |
1702 | #if PROFILE_DELAYS | 1698 | #if PROFILE_DELAYS |
1703 | if (GNUNET_TIME_absolute_get_duration (pos->start_time).rel_value_us > | 1699 | if (GNUNET_TIME_absolute_get_duration (pos->start_time).rel_value_us > |
1704 | DELAY_THRESHOLD.rel_value_us) | 1700 | DELAY_THRESHOLD.rel_value_us) |
1705 | { | 1701 | { |
1706 | LOG (GNUNET_ERROR_TYPE_WARNING, | 1702 | LOG (GNUNET_ERROR_TYPE_WARNING, |
1707 | "Task %p took %s to be scheduled\n", | 1703 | "Task %p took %s to be scheduled\n", |
1708 | pos, | 1704 | pos, |
1709 | GNUNET_STRINGS_relative_time_to_string (GNUNET_TIME_absolute_get_duration (pos->start_time), | 1705 | GNUNET_STRINGS_relative_time_to_string (GNUNET_TIME_absolute_get_duration (pos->start_time), |
1710 | GNUNET_YES)); | 1706 | GNUNET_YES)); |
1711 | } | 1707 | } |
1712 | #endif | 1708 | #endif |
1713 | tc.reason = pos->reason; | 1709 | tc.reason = pos->reason; |
@@ -1717,17 +1713,17 @@ GNUNET_SCHEDULER_run_from_driver (struct GNUNET_SCHEDULER_Handle *sh) | |||
1717 | tc.fds = pos->fds; | 1713 | tc.fds = pos->fds; |
1718 | tc.read_ready = (NULL == pos->read_set) ? sh->rs : pos->read_set; | 1714 | tc.read_ready = (NULL == pos->read_set) ? sh->rs : pos->read_set; |
1719 | if ( (-1 != pos->read_fd) && | 1715 | if ( (-1 != pos->read_fd) && |
1720 | (0 != (pos->reason & GNUNET_SCHEDULER_REASON_READ_READY)) ) | 1716 | (0 != (pos->reason & GNUNET_SCHEDULER_REASON_READ_READY)) ) |
1721 | GNUNET_NETWORK_fdset_set_native (sh->rs, | 1717 | GNUNET_NETWORK_fdset_set_native (sh->rs, |
1722 | pos->read_fd); | 1718 | pos->read_fd); |
1723 | tc.write_ready = (NULL == pos->write_set) ? sh->ws : pos->write_set; | 1719 | tc.write_ready = (NULL == pos->write_set) ? sh->ws : pos->write_set; |
1724 | if ((-1 != pos->write_fd) && | 1720 | if ( (-1 != pos->write_fd) && |
1725 | (0 != (pos->reason & GNUNET_SCHEDULER_REASON_WRITE_READY))) | 1721 | (0 != (pos->reason & GNUNET_SCHEDULER_REASON_WRITE_READY)) ) |
1726 | GNUNET_NETWORK_fdset_set_native (sh->ws, | 1722 | GNUNET_NETWORK_fdset_set_native (sh->ws, |
1727 | pos->write_fd); | 1723 | pos->write_fd); |
1728 | LOG (GNUNET_ERROR_TYPE_WARNING, | 1724 | LOG (GNUNET_ERROR_TYPE_WARNING, |
1729 | "Running task from driver: %p\n", | 1725 | "Running task from driver: %p\n", |
1730 | pos); | 1726 | pos); |
1731 | pos->callback (pos->callback_cls); | 1727 | pos->callback (pos->callback_cls); |
1732 | active_task = NULL; | 1728 | active_task = NULL; |
1733 | dump_backtrace (pos); | 1729 | dump_backtrace (pos); |
@@ -1832,7 +1828,7 @@ GNUNET_SCHEDULER_run_with_driver (const struct GNUNET_SCHEDULER_Driver *driver, | |||
1832 | /* begin main event loop */ | 1828 | /* begin main event loop */ |
1833 | sh.rs = GNUNET_NETWORK_fdset_create (); | 1829 | sh.rs = GNUNET_NETWORK_fdset_create (); |
1834 | sh.ws = GNUNET_NETWORK_fdset_create (); | 1830 | sh.ws = GNUNET_NETWORK_fdset_create (); |
1835 | //GNUNET_NETWORK_fdset_handle_set (sh.rs, pr); | 1831 | GNUNET_NETWORK_fdset_handle_set (sh.rs, pr); |
1836 | ret = driver->loop (driver->cls, | 1832 | ret = driver->loop (driver->cls, |
1837 | &sh); | 1833 | &sh); |
1838 | LOG (GNUNET_ERROR_TYPE_WARNING, | 1834 | LOG (GNUNET_ERROR_TYPE_WARNING, |