aboutsummaryrefslogtreecommitdiff
path: root/src/util/scheduler.c
diff options
context:
space:
mode:
authorlurchi <lurchi@strangeplace.net>2018-01-04 20:27:19 +0100
committerlurchi <lurchi@strangeplace.net>2018-01-04 20:27:19 +0100
commit89e31e95490e3221f464b870e608f01cc72389d1 (patch)
tree387ec77cdf9732ebf385d7a6d3abf7e7e9b7714c /src/util/scheduler.c
parent0baf3c103e55a8227de32a6d43afd749538bb1a5 (diff)
downloadgnunet-89e31e95490e3221f464b870e608f01cc72389d1.tar.gz
gnunet-89e31e95490e3221f464b870e608f01cc72389d1.zip
simplify driver_add_multiple
Diffstat (limited to 'src/util/scheduler.c')
-rw-r--r--src/util/scheduler.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/util/scheduler.c b/src/util/scheduler.c
index 7bd19df7a..fecbc0de5 100644
--- a/src/util/scheduler.c
+++ b/src/util/scheduler.c
@@ -848,8 +848,7 @@ init_fd_info (struct GNUNET_SCHEDULER_Task *t,
848 * @a driver_func on it, or -1 if no updating not desired. 848 * @a driver_func on it, or -1 if no updating not desired.
849 */ 849 */
850static void 850static void
851driver_add_multiple (struct GNUNET_SCHEDULER_Task *t, 851driver_add_multiple (struct GNUNET_SCHEDULER_Task *t)
852 enum GNUNET_SCHEDULER_EventType et)
853{ 852{
854 struct GNUNET_SCHEDULER_FdInfo *fdi; 853 struct GNUNET_SCHEDULER_FdInfo *fdi;
855 int success = GNUNET_YES; 854 int success = GNUNET_YES;
@@ -860,10 +859,7 @@ driver_add_multiple (struct GNUNET_SCHEDULER_Task *t,
860 success = scheduler_driver->add (scheduler_driver->cls, 859 success = scheduler_driver->add (scheduler_driver->cls,
861 t, 860 t,
862 fdi) && success; 861 fdi) && success;
863 if (et != -1) 862 fdi->et = GNUNET_SCHEDULER_ET_NONE;
864 {
865 fdi->et = et;
866 }
867 } 863 }
868 if (GNUNET_YES != success) 864 if (GNUNET_YES != success)
869 { 865 {
@@ -1381,7 +1377,7 @@ add_without_sets (struct GNUNET_TIME_Relative delay,
1381 GNUNET_CONTAINER_DLL_insert (pending_head, 1377 GNUNET_CONTAINER_DLL_insert (pending_head,
1382 pending_tail, 1378 pending_tail,
1383 t); 1379 t);
1384 driver_add_multiple (t, GNUNET_SCHEDULER_ET_NONE); 1380 driver_add_multiple (t);
1385 max_priority_added = GNUNET_MAX (max_priority_added, 1381 max_priority_added = GNUNET_MAX (max_priority_added,
1386 t->priority); 1382 t->priority);
1387 init_backtrace (t); 1383 init_backtrace (t);
@@ -1823,7 +1819,7 @@ GNUNET_SCHEDULER_add_select (enum GNUNET_SCHEDULER_Priority prio,
1823 GNUNET_CONTAINER_DLL_insert (pending_head, 1819 GNUNET_CONTAINER_DLL_insert (pending_head,
1824 pending_tail, 1820 pending_tail,
1825 t); 1821 t);
1826 driver_add_multiple (t, GNUNET_SCHEDULER_ET_NONE); 1822 driver_add_multiple (t);
1827 max_priority_added = GNUNET_MAX (max_priority_added, 1823 max_priority_added = GNUNET_MAX (max_priority_added,
1828 t->priority); 1824 t->priority);
1829 LOG (GNUNET_ERROR_TYPE_DEBUG, 1825 LOG (GNUNET_ERROR_TYPE_DEBUG,