diff options
Diffstat (limited to 'src/transport/gnunet-service-tng.c')
-rw-r--r-- | src/transport/gnunet-service-tng.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/src/transport/gnunet-service-tng.c b/src/transport/gnunet-service-tng.c index 66a836b84..8d68d90a6 100644 --- a/src/transport/gnunet-service-tng.c +++ b/src/transport/gnunet-service-tng.c | |||
@@ -4734,8 +4734,7 @@ consider_sending_fc (void *cls) | |||
4734 | then. See vl->last_fc_rtt! NOTE: to do this properly, we also | 4734 | then. See vl->last_fc_rtt! NOTE: to do this properly, we also |
4735 | need an estimate for the bandwidth-delay-product for the entire | 4735 | need an estimate for the bandwidth-delay-product for the entire |
4736 | VL, as that determines "significantly". We have the delay, but | 4736 | VL, as that determines "significantly". We have the delay, but |
4737 | the bandwidth statistics need to be added for the VL!*/ | 4737 | the bandwidth statistics need to be added for the VL!*/(void) duration; |
4738 | (void) duration; | ||
4739 | 4738 | ||
4740 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 4739 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
4741 | "Sending FC seq %u to %s with new window %llu\n", | 4740 | "Sending FC seq %u to %s with new window %llu\n", |
@@ -5218,8 +5217,7 @@ handle_raw_message (void *cls, const struct GNUNET_MessageHeader *mh) | |||
5218 | we pass this on, CORE would be confused (link down, messages | 5217 | we pass this on, CORE would be confused (link down, messages |
5219 | arrive). We should investigate more if this happens often, | 5218 | arrive). We should investigate more if this happens often, |
5220 | or in a persistent manner, and possibly do "something" about | 5219 | or in a persistent manner, and possibly do "something" about |
5221 | it. Thus logging as error for now. */ | 5220 | it. Thus logging as error for now. */GNUNET_break_op (0); |
5222 | GNUNET_break_op (0); | ||
5223 | GNUNET_STATISTICS_update (GST_stats, | 5221 | GNUNET_STATISTICS_update (GST_stats, |
5224 | "# CORE messages droped (virtual link still down)", | 5222 | "# CORE messages droped (virtual link still down)", |
5225 | 1, | 5223 | 1, |
@@ -8643,8 +8641,7 @@ select_best_pending_from_link (struct PendingMessageScoreContext *sc, | |||
8643 | given message fits _this_ queue, and do not consider how well other | 8641 | given message fits _this_ queue, and do not consider how well other |
8644 | queues might suit the message. Taking other queues into consideration | 8642 | queues might suit the message. Taking other queues into consideration |
8645 | may further improve the result, but could also be expensive | 8643 | may further improve the result, but could also be expensive |
8646 | in terms of CPU time. */ | 8644 | in terms of CPU time. */long long sc_score = sc->frag * 40 + sc->relb * 20 + sc->real_overhead; |
8647 | long long sc_score = sc->frag * 40 + sc->relb * 20 + sc->real_overhead; | ||
8648 | long long pm_score = frag * 40 + relb * 20 + real_overhead; | 8645 | long long pm_score = frag * 40 + relb * 20 + real_overhead; |
8649 | long long time_delta = | 8646 | long long time_delta = |
8650 | (sc->best->next_attempt.abs_value_us - pos->next_attempt.abs_value_us) | 8647 | (sc->best->next_attempt.abs_value_us - pos->next_attempt.abs_value_us) |
@@ -8848,8 +8845,7 @@ transmit_on_queue (void *cls) | |||
8848 | via DV (and thus the ultimate target of the pending message is for | 8845 | via DV (and thus the ultimate target of the pending message is for |
8849 | a different virtual link than the one of the queue), then we need | 8846 | a different virtual link than the one of the queue), then we need |
8850 | to use up not only the window of the direct link but also the | 8847 | to use up not only the window of the direct link but also the |
8851 | flow control window for the DV link! */ | 8848 | flow control window for the DV link! */pm->vl->outbound_fc_window_size_used += pm->bytes_msg; |
8852 | pm->vl->outbound_fc_window_size_used += pm->bytes_msg; | ||
8853 | 8849 | ||
8854 | if (pm->vl != queue->neighbour->vl) | 8850 | if (pm->vl != queue->neighbour->vl) |
8855 | { | 8851 | { |
@@ -8888,8 +8884,7 @@ transmit_on_queue (void *cls) | |||
8888 | 8884 | ||
8889 | OPTIMIZE: Note that in the future this heuristic should likely | 8885 | OPTIMIZE: Note that in the future this heuristic should likely |
8890 | be improved further (measure RTT stability, consider message | 8886 | be improved further (measure RTT stability, consider message |
8891 | urgency and size when delaying ACKs, etc.) */ | 8887 | urgency and size when delaying ACKs, etc.) */update_pm_next_attempt (pm, |
8892 | update_pm_next_attempt (pm, | ||
8893 | GNUNET_TIME_relative_to_absolute ( | 8888 | GNUNET_TIME_relative_to_absolute ( |
8894 | GNUNET_TIME_relative_multiply (queue->pd.aged_rtt, | 8889 | GNUNET_TIME_relative_multiply (queue->pd.aged_rtt, |
8895 | 4))); | 8890 | 4))); |