diff options
author | Christian Grothoff <christian@grothoff.org> | 2017-01-22 00:46:03 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2017-01-22 00:46:03 +0100 |
commit | 7e9e4e320d6eee5bf6afd876b282609712cb72db (patch) | |
tree | eda9315b99a026c9033d2db0ed7993d4e524700d /src | |
parent | 542bf871c6eebdc645884960559e15ce400939e6 (diff) | |
download | gnunet-7e9e4e320d6eee5bf6afd876b282609712cb72db.tar.gz gnunet-7e9e4e320d6eee5bf6afd876b282609712cb72db.zip |
use new SCHEDULER_add_at API where applicable
Diffstat (limited to 'src')
-rw-r--r-- | src/cadet/gnunet-service-cadet-new_tunnels.c | 6 | ||||
-rw-r--r-- | src/core/gnunet-service-core_sessions.c | 12 | ||||
-rw-r--r-- | src/dht/gnunet-service-dht_clients.c | 15 | ||||
-rw-r--r-- | src/fragmentation/fragmentation.c | 5 | ||||
-rw-r--r-- | src/fs/gnunet-service-fs_pe.c | 8 | ||||
-rw-r--r-- | src/nse/gnunet-service-nse.c | 34 | ||||
-rw-r--r-- | src/topology/gnunet-daemon-topology.c | 6 | ||||
-rw-r--r-- | src/transport/gnunet-service-transport_manipulation.c | 20 | ||||
-rw-r--r-- | src/transport/gnunet-service-transport_neighbours.c | 6 |
9 files changed, 55 insertions, 57 deletions
diff --git a/src/cadet/gnunet-service-cadet-new_tunnels.c b/src/cadet/gnunet-service-cadet-new_tunnels.c index 111adffde..178577b46 100644 --- a/src/cadet/gnunet-service-cadet-new_tunnels.c +++ b/src/cadet/gnunet-service-cadet-new_tunnels.c | |||
@@ -1673,9 +1673,9 @@ connection_ready_cb (void *cls, | |||
1673 | if (NULL == t->kx_task) | 1673 | if (NULL == t->kx_task) |
1674 | { | 1674 | { |
1675 | t->kx_task | 1675 | t->kx_task |
1676 | = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_absolute_get_remaining (t->next_kx_attempt), | 1676 | = GNUNET_SCHEDULER_add_at (t->next_kx_attempt, |
1677 | &retry_kx, | 1677 | &retry_kx, |
1678 | t); | 1678 | t); |
1679 | } | 1679 | } |
1680 | break; | 1680 | break; |
1681 | case CADET_TUNNEL_KEY_OK: | 1681 | case CADET_TUNNEL_KEY_OK: |
diff --git a/src/core/gnunet-service-core_sessions.c b/src/core/gnunet-service-core_sessions.c index 036fd1425..6687b4819 100644 --- a/src/core/gnunet-service-core_sessions.c +++ b/src/core/gnunet-service-core_sessions.c | |||
@@ -90,9 +90,9 @@ struct Session | |||
90 | 90 | ||
91 | /** | 91 | /** |
92 | * Key exchange state for this peer. | 92 | * Key exchange state for this peer. |
93 | */ | 93 | */ |
94 | struct GSC_KeyExchangeInfo *kx; | 94 | struct GSC_KeyExchangeInfo *kx; |
95 | 95 | ||
96 | /** | 96 | /** |
97 | * Head of list of requests from clients for transmission to | 97 | * Head of list of requests from clients for transmission to |
98 | * this peer. | 98 | * this peer. |
@@ -725,10 +725,10 @@ try_transmission (struct Session *session) | |||
725 | GNUNET_YES)); | 725 | GNUNET_YES)); |
726 | if (NULL != session->cork_task) | 726 | if (NULL != session->cork_task) |
727 | GNUNET_SCHEDULER_cancel (session->cork_task); | 727 | GNUNET_SCHEDULER_cancel (session->cork_task); |
728 | session->cork_task = | 728 | session->cork_task |
729 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_absolute_get_remaining (min_deadline), | 729 | = GNUNET_SCHEDULER_add_at (min_deadline, |
730 | &pop_cork_task, | 730 | &pop_cork_task, |
731 | session); | 731 | session); |
732 | } | 732 | } |
733 | else | 733 | else |
734 | { | 734 | { |
diff --git a/src/dht/gnunet-service-dht_clients.c b/src/dht/gnunet-service-dht_clients.c index df56c010a..5ba4e5820 100644 --- a/src/dht/gnunet-service-dht_clients.c +++ b/src/dht/gnunet-service-dht_clients.c | |||
@@ -426,19 +426,20 @@ transmit_next_request_task (void *cls) | |||
426 | delay = GNUNET_TIME_absolute_get_remaining (cqr->retry_time); | 426 | delay = GNUNET_TIME_absolute_get_remaining (cqr->retry_time); |
427 | if (delay.rel_value_us > 0) | 427 | if (delay.rel_value_us > 0) |
428 | { | 428 | { |
429 | cqr->hnode = | 429 | cqr->hnode |
430 | GNUNET_CONTAINER_heap_insert (retry_heap, | 430 | = GNUNET_CONTAINER_heap_insert (retry_heap, |
431 | cqr, | 431 | cqr, |
432 | cqr->retry_time.abs_value_us); | 432 | cqr->retry_time.abs_value_us); |
433 | retry_task = | 433 | retry_task |
434 | GNUNET_SCHEDULER_add_delayed (delay, | 434 | = GNUNET_SCHEDULER_add_at (cqr->retry_time, |
435 | &transmit_next_request_task, | 435 | &transmit_next_request_task, |
436 | NULL); | 436 | NULL); |
437 | return; | 437 | return; |
438 | } | 438 | } |
439 | transmit_request (cqr); | 439 | transmit_request (cqr); |
440 | cqr->hnode | 440 | cqr->hnode |
441 | = GNUNET_CONTAINER_heap_insert (retry_heap, cqr, | 441 | = GNUNET_CONTAINER_heap_insert (retry_heap, |
442 | cqr, | ||
442 | cqr->retry_time.abs_value_us); | 443 | cqr->retry_time.abs_value_us); |
443 | } | 444 | } |
444 | } | 445 | } |
diff --git a/src/fragmentation/fragmentation.c b/src/fragmentation/fragmentation.c index 02444cf14..f68635100 100644 --- a/src/fragmentation/fragmentation.c +++ b/src/fragmentation/fragmentation.c | |||
@@ -373,8 +373,9 @@ GNUNET_FRAGMENT_context_transmission_done (struct GNUNET_FRAGMENT_Context *fc) | |||
373 | fc->proc_busy = GNUNET_NO; | 373 | fc->proc_busy = GNUNET_NO; |
374 | GNUNET_assert (fc->task == NULL); | 374 | GNUNET_assert (fc->task == NULL); |
375 | fc->task = | 375 | fc->task = |
376 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_absolute_get_remaining | 376 | GNUNET_SCHEDULER_add_at (fc->delay_until, |
377 | (fc->delay_until), &transmit_next, fc); | 377 | &transmit_next, |
378 | fc); | ||
378 | } | 379 | } |
379 | 380 | ||
380 | 381 | ||
diff --git a/src/fs/gnunet-service-fs_pe.c b/src/fs/gnunet-service-fs_pe.c index e8ce77904..12b04dcd1 100644 --- a/src/fs/gnunet-service-fs_pe.c +++ b/src/fs/gnunet-service-fs_pe.c | |||
@@ -427,10 +427,10 @@ schedule_peer_transmission (void *cls) | |||
427 | gettext_noop ("# delay heap timeout (ms)"), | 427 | gettext_noop ("# delay heap timeout (ms)"), |
428 | delay.rel_value_us / 1000LL, GNUNET_NO); | 428 | delay.rel_value_us / 1000LL, GNUNET_NO); |
429 | 429 | ||
430 | pp->task = | 430 | pp->task |
431 | GNUNET_SCHEDULER_add_delayed (delay, | 431 | = GNUNET_SCHEDULER_add_at (rp->earliest_transmission, |
432 | &schedule_peer_transmission, | 432 | &schedule_peer_transmission, |
433 | pp); | 433 | pp); |
434 | return; | 434 | return; |
435 | } | 435 | } |
436 | #if INSANE_STATISTICS | 436 | #if INSANE_STATISTICS |
diff --git a/src/nse/gnunet-service-nse.c b/src/nse/gnunet-service-nse.c index 4d54a740b..e35115e31 100644 --- a/src/nse/gnunet-service-nse.c +++ b/src/nse/gnunet-service-nse.c | |||
@@ -437,7 +437,7 @@ handle_start (void *cls, | |||
437 | GNUNET_notification_context_add (nc, | 437 | GNUNET_notification_context_add (nc, |
438 | mq); | 438 | mq); |
439 | setup_estimate_message (&em); | 439 | setup_estimate_message (&em); |
440 | env = GNUNET_MQ_msg_copy (&em.header); | 440 | env = GNUNET_MQ_msg_copy (&em.header); |
441 | GNUNET_MQ_send (mq, | 441 | GNUNET_MQ_send (mq, |
442 | env); | 442 | env); |
443 | GNUNET_SERVICE_client_continue (client); | 443 | GNUNET_SERVICE_client_continue (client); |
@@ -607,14 +607,14 @@ transmit_task_cb (void *cls) | |||
607 | struct NSEPeerEntry *peer_entry = cls; | 607 | struct NSEPeerEntry *peer_entry = cls; |
608 | unsigned int idx; | 608 | unsigned int idx; |
609 | struct GNUNET_MQ_Envelope *env; | 609 | struct GNUNET_MQ_Envelope *env; |
610 | 610 | ||
611 | peer_entry->transmit_task = NULL; | 611 | peer_entry->transmit_task = NULL; |
612 | idx = estimate_index; | 612 | idx = estimate_index; |
613 | if (GNUNET_NO == peer_entry->previous_round) | 613 | if (GNUNET_NO == peer_entry->previous_round) |
614 | { | 614 | { |
615 | idx = (idx + HISTORY_SIZE - 1) % HISTORY_SIZE; | 615 | idx = (idx + HISTORY_SIZE - 1) % HISTORY_SIZE; |
616 | peer_entry->previous_round = GNUNET_YES; | 616 | peer_entry->previous_round = GNUNET_YES; |
617 | peer_entry->transmit_task | 617 | peer_entry->transmit_task |
618 | = GNUNET_SCHEDULER_add_delayed (get_transmit_delay (0), | 618 | = GNUNET_SCHEDULER_add_delayed (get_transmit_delay (0), |
619 | &transmit_task_cb, | 619 | &transmit_task_cb, |
620 | peer_entry); | 620 | peer_entry); |
@@ -652,12 +652,12 @@ transmit_task_cb (void *cls) | |||
652 | GNUNET_NO); | 652 | GNUNET_NO); |
653 | #if ENABLE_NSE_HISTOGRAM | 653 | #if ENABLE_NSE_HISTOGRAM |
654 | peer_entry->transmitted_messages++; | 654 | peer_entry->transmitted_messages++; |
655 | peer_entry->last_transmitted_size | 655 | peer_entry->last_transmitted_size |
656 | = ntohl(size_estimate_messages[idx].matching_bits); | 656 | = ntohl(size_estimate_messages[idx].matching_bits); |
657 | #endif | 657 | #endif |
658 | env = GNUNET_MQ_msg_copy (&size_estimate_messages[idx].header); | 658 | env = GNUNET_MQ_msg_copy (&size_estimate_messages[idx].header); |
659 | GNUNET_MQ_send (peer_entry->mq, | 659 | GNUNET_MQ_send (peer_entry->mq, |
660 | env); | 660 | env); |
661 | } | 661 | } |
662 | 662 | ||
663 | 663 | ||
@@ -811,11 +811,10 @@ update_flood_message (void *cls) | |||
811 | GNUNET_CONTAINER_multipeermap_iterate (peers, | 811 | GNUNET_CONTAINER_multipeermap_iterate (peers, |
812 | &schedule_current_round, | 812 | &schedule_current_round, |
813 | NULL); | 813 | NULL); |
814 | flood_task = | 814 | flood_task |
815 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_absolute_get_remaining | 815 | = GNUNET_SCHEDULER_add_at (next_timestamp, |
816 | (next_timestamp), | 816 | &update_flood_message, |
817 | &update_flood_message, | 817 | NULL); |
818 | NULL); | ||
819 | } | 818 | } |
820 | 819 | ||
821 | 820 | ||
@@ -1012,7 +1011,7 @@ update_flood_times (void *cls, | |||
1012 | { | 1011 | { |
1013 | /* still stuck in previous round, no point to update, check that | 1012 | /* still stuck in previous round, no point to update, check that |
1014 | * we are active here though... */ | 1013 | * we are active here though... */ |
1015 | if (NULL == peer_entry->transmit_task) | 1014 | if (NULL == peer_entry->transmit_task) |
1016 | { | 1015 | { |
1017 | GNUNET_break (0); | 1016 | GNUNET_break (0); |
1018 | } | 1017 | } |
@@ -1034,7 +1033,7 @@ update_flood_times (void *cls, | |||
1034 | /** | 1033 | /** |
1035 | * Core handler for size estimate flooding messages. | 1034 | * Core handler for size estimate flooding messages. |
1036 | * | 1035 | * |
1037 | * @param cls peer this message is from | 1036 | * @param cls peer this message is from |
1038 | * @param incoming_flood received message | 1037 | * @param incoming_flood received message |
1039 | */ | 1038 | */ |
1040 | static void | 1039 | static void |
@@ -1169,7 +1168,7 @@ handle_p2p_estimate (void *cls, | |||
1169 | /* push back our result now, that peer is spreading bad information... */ | 1168 | /* push back our result now, that peer is spreading bad information... */ |
1170 | if (NULL != peer_entry->transmit_task) | 1169 | if (NULL != peer_entry->transmit_task) |
1171 | GNUNET_SCHEDULER_cancel (peer_entry->transmit_task); | 1170 | GNUNET_SCHEDULER_cancel (peer_entry->transmit_task); |
1172 | peer_entry->transmit_task | 1171 | peer_entry->transmit_task |
1173 | = GNUNET_SCHEDULER_add_now (&transmit_task_cb, | 1172 | = GNUNET_SCHEDULER_add_now (&transmit_task_cb, |
1174 | peer_entry); | 1173 | peer_entry); |
1175 | /* Not closer than our most recent message, no need to do work here */ | 1174 | /* Not closer than our most recent message, no need to do work here */ |
@@ -1431,11 +1430,10 @@ core_init (void *cls, | |||
1431 | current_timestamp); | 1430 | current_timestamp); |
1432 | estimate_count++; | 1431 | estimate_count++; |
1433 | } | 1432 | } |
1434 | flood_task = | 1433 | flood_task |
1435 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_absolute_get_remaining | 1434 | = GNUNET_SCHEDULER_add_at (next_timestamp, |
1436 | (next_timestamp), | 1435 | &update_flood_message, |
1437 | &update_flood_message, | 1436 | NULL); |
1438 | NULL); | ||
1439 | } | 1437 | } |
1440 | 1438 | ||
1441 | 1439 | ||
diff --git a/src/topology/gnunet-daemon-topology.c b/src/topology/gnunet-daemon-topology.c index d48f07e71..067ebce23 100644 --- a/src/topology/gnunet-daemon-topology.c +++ b/src/topology/gnunet-daemon-topology.c | |||
@@ -534,10 +534,10 @@ schedule_next_hello (void *cls) | |||
534 | 1, | 534 | 1, |
535 | GNUNET_NO); | 535 | GNUNET_NO); |
536 | /* prepare to send the next one */ | 536 | /* prepare to send the next one */ |
537 | if (NULL != pl->hello_delay_task) | ||
538 | GNUNET_SCHEDULER_cancel (pl->hello_delay_task); | ||
539 | pl->next_hello_allowed | 537 | pl->next_hello_allowed |
540 | = GNUNET_TIME_relative_to_absolute (HELLO_ADVERTISEMENT_MIN_FREQUENCY); | 538 | = GNUNET_TIME_relative_to_absolute (HELLO_ADVERTISEMENT_MIN_FREQUENCY); |
539 | if (NULL != pl->hello_delay_task) | ||
540 | GNUNET_SCHEDULER_cancel (pl->hello_delay_task); | ||
541 | pl->hello_delay_task | 541 | pl->hello_delay_task |
542 | = GNUNET_SCHEDULER_add_now (&schedule_next_hello, | 542 | = GNUNET_SCHEDULER_add_now (&schedule_next_hello, |
543 | pl); | 543 | pl); |
@@ -1022,7 +1022,7 @@ check_hello (void *cls, | |||
1022 | const struct GNUNET_HELLO_Message *message) | 1022 | const struct GNUNET_HELLO_Message *message) |
1023 | { | 1023 | { |
1024 | struct GNUNET_PeerIdentity pid; | 1024 | struct GNUNET_PeerIdentity pid; |
1025 | 1025 | ||
1026 | if (GNUNET_OK != | 1026 | if (GNUNET_OK != |
1027 | GNUNET_HELLO_get_id (message, | 1027 | GNUNET_HELLO_get_id (message, |
1028 | &pid)) | 1028 | &pid)) |
diff --git a/src/transport/gnunet-service-transport_manipulation.c b/src/transport/gnunet-service-transport_manipulation.c index f198d6e49..e68753583 100644 --- a/src/transport/gnunet-service-transport_manipulation.c +++ b/src/transport/gnunet-service-transport_manipulation.c | |||
@@ -219,7 +219,6 @@ send_delayed (void *cls) | |||
219 | struct DelayQueueEntry *dqe = cls; | 219 | struct DelayQueueEntry *dqe = cls; |
220 | struct DelayQueueEntry *next; | 220 | struct DelayQueueEntry *next; |
221 | struct TM_Peer *tmp = dqe->tmp; | 221 | struct TM_Peer *tmp = dqe->tmp; |
222 | struct GNUNET_TIME_Relative delay; | ||
223 | 222 | ||
224 | GNUNET_break (GNUNET_YES == | 223 | GNUNET_break (GNUNET_YES == |
225 | GST_neighbours_test_connected (&dqe->id)); | 224 | GST_neighbours_test_connected (&dqe->id)); |
@@ -233,9 +232,9 @@ send_delayed (void *cls) | |||
233 | if (NULL != next) | 232 | if (NULL != next) |
234 | { | 233 | { |
235 | /* More delayed messages */ | 234 | /* More delayed messages */ |
236 | delay = GNUNET_TIME_absolute_get_remaining(next->sent_at); | 235 | tmp->send_delay_task = GNUNET_SCHEDULER_add_at (next->sent_at, |
237 | tmp->send_delay_task = GNUNET_SCHEDULER_add_delayed(delay, | 236 | &send_delayed, |
238 | &send_delayed, next); | 237 | next); |
239 | } | 238 | } |
240 | } | 239 | } |
241 | else | 240 | else |
@@ -249,10 +248,9 @@ send_delayed (void *cls) | |||
249 | if (NULL != next) | 248 | if (NULL != next) |
250 | { | 249 | { |
251 | /* More delayed messages */ | 250 | /* More delayed messages */ |
252 | delay = GNUNET_TIME_absolute_get_remaining(next->sent_at); | 251 | generic_send_delay_task = GNUNET_SCHEDULER_add_at (next->sent_at, |
253 | generic_send_delay_task = GNUNET_SCHEDULER_add_delayed (delay, | 252 | &send_delayed, |
254 | &send_delayed, | 253 | next); |
255 | next); | ||
256 | } | 254 | } |
257 | } | 255 | } |
258 | GST_neighbours_send (&dqe->id, | 256 | GST_neighbours_send (&dqe->id, |
@@ -503,9 +501,9 @@ GST_manipulation_peer_disconnect (const struct GNUNET_PeerIdentity *peer) | |||
503 | generic_send_delay_task = NULL; | 501 | generic_send_delay_task = NULL; |
504 | if (NULL != generic_dqe_head) | 502 | if (NULL != generic_dqe_head) |
505 | generic_send_delay_task | 503 | generic_send_delay_task |
506 | = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_absolute_get_remaining(generic_dqe_head->sent_at), | 504 | = GNUNET_SCHEDULER_add_at (generic_dqe_head->sent_at, |
507 | &send_delayed, | 505 | &send_delayed, |
508 | generic_dqe_head); | 506 | generic_dqe_head); |
509 | } | 507 | } |
510 | } | 508 | } |
511 | 509 | ||
diff --git a/src/transport/gnunet-service-transport_neighbours.c b/src/transport/gnunet-service-transport_neighbours.c index e1e4f56f8..3952a728e 100644 --- a/src/transport/gnunet-service-transport_neighbours.c +++ b/src/transport/gnunet-service-transport_neighbours.c | |||
@@ -735,9 +735,9 @@ set_state_and_timeout (struct NeighbourMapEntry *n, | |||
735 | { | 735 | { |
736 | /* new timeout is earlier, reschedule master task */ | 736 | /* new timeout is earlier, reschedule master task */ |
737 | GNUNET_SCHEDULER_cancel (n->task); | 737 | GNUNET_SCHEDULER_cancel (n->task); |
738 | n->task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_absolute_get_remaining (timeout), | 738 | n->task = GNUNET_SCHEDULER_add_at (timeout, |
739 | &master_task, | 739 | &master_task, |
740 | n); | 740 | n); |
741 | } | 741 | } |
742 | n->timeout = timeout; | 742 | n->timeout = timeout; |
743 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 743 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |