diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-08-11 21:21:56 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-08-11 21:21:56 +0000 |
commit | 3d7fefedc9ba60bd8e8448efe8b628446d958536 (patch) | |
tree | 61ce41a52cd6e7232cead77818ef265993b2427e /src/transport/gnunet-service-transport_manipulation.c | |
parent | 4a0398474db197abed243a123fb971fbeeffab4b (diff) | |
download | gnunet-3d7fefedc9ba60bd8e8448efe8b628446d958536.tar.gz gnunet-3d7fefedc9ba60bd8e8448efe8b628446d958536.zip |
changing time measurement from milliseconds to microseconds
Diffstat (limited to 'src/transport/gnunet-service-transport_manipulation.c')
-rw-r--r-- | src/transport/gnunet-service-transport_manipulation.c | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/src/transport/gnunet-service-transport_manipulation.c b/src/transport/gnunet-service-transport_manipulation.c index 4a9414622..0ca732d62 100644 --- a/src/transport/gnunet-service-transport_manipulation.c +++ b/src/transport/gnunet-service-transport_manipulation.c | |||
@@ -419,7 +419,7 @@ GST_manipulation_send (const struct GNUNET_PeerIdentity *target, const void *msg | |||
419 | if (UINT32_MAX != find_metric(tmp, GNUNET_ATS_QUALITY_NET_DELAY, TM_SEND)) | 419 | if (UINT32_MAX != find_metric(tmp, GNUNET_ATS_QUALITY_NET_DELAY, TM_SEND)) |
420 | { | 420 | { |
421 | /* We have a delay */ | 421 | /* We have a delay */ |
422 | delay.rel_value = find_metric(tmp, GNUNET_ATS_QUALITY_NET_DELAY, TM_SEND); | 422 | delay.rel_value_us = find_metric (tmp, GNUNET_ATS_QUALITY_NET_DELAY, TM_SEND); |
423 | dqe = GNUNET_malloc (sizeof (struct DelayQueueEntry) + msg_size); | 423 | dqe = GNUNET_malloc (sizeof (struct DelayQueueEntry) + msg_size); |
424 | dqe->id = *target; | 424 | dqe->id = *target; |
425 | dqe->tmp = tmp; | 425 | dqe->tmp = tmp; |
@@ -434,8 +434,9 @@ GST_manipulation_send (const struct GNUNET_PeerIdentity *target, const void *msg | |||
434 | if (GNUNET_SCHEDULER_NO_TASK == tmp->send_delay_task) | 434 | if (GNUNET_SCHEDULER_NO_TASK == tmp->send_delay_task) |
435 | tmp->send_delay_task =GNUNET_SCHEDULER_add_delayed (delay, &send_delayed, dqe); | 435 | tmp->send_delay_task =GNUNET_SCHEDULER_add_delayed (delay, &send_delayed, dqe); |
436 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 436 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
437 | "Delaying %u byte message to peer `%s' with generic delay for %llu ms\n", | 437 | "Delaying %u byte message to peer `%s' with generic delay for %ms\n", |
438 | msg_size, GNUNET_i2s (target), (long long unsigned int) delay.rel_value); | 438 | msg_size, GNUNET_i2s (target), |
439 | GNUNET_STRINGS_relative_time_to_string (delay, GNUNET_YES)); | ||
439 | return; | 440 | return; |
440 | } | 441 | } |
441 | } | 442 | } |
@@ -443,7 +444,7 @@ GST_manipulation_send (const struct GNUNET_PeerIdentity *target, const void *msg | |||
443 | { | 444 | { |
444 | GNUNET_break (GNUNET_YES == GST_neighbours_test_connected(target)); | 445 | GNUNET_break (GNUNET_YES == GST_neighbours_test_connected(target)); |
445 | /* We have a delay */ | 446 | /* We have a delay */ |
446 | delay.rel_value = find_metric (&man_handle.general, GNUNET_ATS_QUALITY_NET_DELAY, TM_SEND); | 447 | delay.rel_value_us = find_metric (&man_handle.general, GNUNET_ATS_QUALITY_NET_DELAY, TM_SEND); |
447 | dqe = GNUNET_malloc (sizeof (struct DelayQueueEntry) + msg_size); | 448 | dqe = GNUNET_malloc (sizeof (struct DelayQueueEntry) + msg_size); |
448 | dqe->id = *target; | 449 | dqe->id = *target; |
449 | dqe->tmp = NULL; | 450 | dqe->tmp = NULL; |
@@ -460,8 +461,9 @@ GST_manipulation_send (const struct GNUNET_PeerIdentity *target, const void *msg | |||
460 | generic_send_delay_task = GNUNET_SCHEDULER_add_delayed (delay, &send_delayed, dqe); | 461 | generic_send_delay_task = GNUNET_SCHEDULER_add_delayed (delay, &send_delayed, dqe); |
461 | } | 462 | } |
462 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 463 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
463 | "Delaying %u byte message to peer `%s' with peer specific delay for %llu ms\n", | 464 | "Delaying %u byte message to peer `%s' with peer specific delay for %s\n", |
464 | msg_size, GNUNET_i2s (target), (long long unsigned int) delay.rel_value); | 465 | msg_size, GNUNET_i2s (target), |
466 | GNUNET_STRINGS_relative_time_to_string (delay, GNUNET_YES)); | ||
465 | return; | 467 | return; |
466 | } | 468 | } |
467 | 469 | ||
@@ -540,28 +542,29 @@ GST_manipulation_recv (void *cls, | |||
540 | struct GNUNET_TIME_Relative m_delay; | 542 | struct GNUNET_TIME_Relative m_delay; |
541 | 543 | ||
542 | g_recv_delay = find_metric (&man_handle.general, GNUNET_ATS_QUALITY_NET_DELAY, TM_RECEIVE); | 544 | g_recv_delay = find_metric (&man_handle.general, GNUNET_ATS_QUALITY_NET_DELAY, TM_RECEIVE); |
543 | if ((g_recv_delay >= GNUNET_TIME_UNIT_ZERO.rel_value) && (UINT32_MAX != g_recv_delay)) | 545 | if ((g_recv_delay >= GNUNET_TIME_UNIT_ZERO.rel_value_us) && (UINT32_MAX != g_recv_delay)) |
544 | m_delay.rel_value = g_recv_delay; /* Global delay */ | 546 | m_delay.rel_value_us = g_recv_delay; /* Global delay */ |
545 | else | 547 | else |
546 | m_delay = GNUNET_TIME_UNIT_ZERO; | 548 | m_delay = GNUNET_TIME_UNIT_ZERO; |
547 | 549 | ||
548 | if (NULL != (tmp = GNUNET_CONTAINER_multihashmap_get (man_handle.peers, &peer->hashPubKey))) | 550 | if (NULL != (tmp = GNUNET_CONTAINER_multihashmap_get (man_handle.peers, &peer->hashPubKey))) |
549 | { | 551 | { |
550 | /* Manipulate receive delay */ | 552 | /* Manipulate receive delay */ |
551 | p_recv_delay = find_metric (tmp, GNUNET_ATS_QUALITY_NET_DELAY, TM_RECEIVE); | 553 | p_recv_delay = find_metric (tmp, GNUNET_ATS_QUALITY_NET_DELAY, TM_RECEIVE); |
552 | if (UINT32_MAX != p_recv_delay) | 554 | if (UINT32_MAX != p_recv_delay) |
553 | m_delay.rel_value = p_recv_delay; /* Peer specific delay */ | 555 | m_delay.rel_value_us = p_recv_delay; /* Peer specific delay */ |
554 | } | 556 | } |
555 | 557 | ||
556 | quota_delay = GST_receive_callback (cls, peer, message, | 558 | quota_delay = GST_receive_callback (cls, peer, message, |
557 | session, sender_address, sender_address_len); | 559 | session, sender_address, sender_address_len); |
558 | 560 | ||
559 | if (quota_delay.rel_value > m_delay.rel_value) | 561 | if (quota_delay.rel_value_us > m_delay.rel_value_us) |
560 | m_delay = quota_delay; | 562 | m_delay = quota_delay; |
561 | 563 | ||
562 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 564 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
563 | "Delaying next receive for peer `%s' for %llu ms\n", | 565 | "Delaying next receive for peer `%s' for %s\n", |
564 | GNUNET_i2s (peer), (long long unsigned int) m_delay.rel_value); | 566 | GNUNET_i2s (peer), |
567 | GNUNET_STRINGS_relative_time_to_string (m_delay, GNUNET_YES)); | ||
565 | return m_delay; | 568 | return m_delay; |
566 | 569 | ||
567 | } | 570 | } |