nicer stats, bugfix

2 files changed, 29 insertions, 10 deletions

diff --git a/src/fragmentation/defragmentation.c b/src/fragmentation/defragmentation.c
index cc42d3e75..6ad8d0faf 100644
--- a/src/fragmentation/defragmentation.c
+++ b/src/fragmentation/defragmentation.c
@@ -270,6 +270,10 @@ send_ack (void *cls,
   fa.header.type = htons (GNUNET_MESSAGE_TYPE_FRAGMENT_ACK);
   fa.fragment_id = htonl (mc->fragment_id);
   fa.bits = GNUNET_htonll (mc->bits);
+  GNUNET_STATISTICS_update (mc->dc->stats,
+                            _("# acknowledgements sent for fragment"),
+                            1,
+                            GNUNET_NO);
   dc->ackp (dc->cls, mc->fragment_id, &fa.header);
 }
 
@@ -445,7 +449,7 @@ GNUNET_DEFRAGMENT_process_fragment (struct GNUNET_DEFRAGMENT_Context *dc,
       return GNUNET_SYSERR;
     }
   GNUNET_STATISTICS_update (dc->stats,
-                            _("Fragments received"),
+                            _("# fragments received"),
                             1,
                             GNUNET_NO);
   mc = dc->head;
@@ -509,7 +513,7 @@ GNUNET_DEFRAGMENT_process_fragment (struct GNUNET_DEFRAGMENT_Context *dc,
     {
       duplicate = GNUNET_YES;
       GNUNET_STATISTICS_update (dc->stats,
-                                _("Duplicate fragments received"),
+                                _("# duplicate fragments received"),
                                 1,
                                 GNUNET_NO);
     }
@@ -533,7 +537,7 @@ GNUNET_DEFRAGMENT_process_fragment (struct GNUNET_DEFRAGMENT_Context *dc,
        (0 == mc->bits) )
     {
       GNUNET_STATISTICS_update (dc->stats,
-                                _("Messages defragmented"),
+                                _("# messages defragmented"),
                                 1,
                                 GNUNET_NO);
       /* message complete, notify! */
diff --git a/src/fragmentation/fragmentation.c b/src/fragmentation/fragmentation.c
index db66f5a5b..6afdc1533 100644
--- a/src/fragmentation/fragmentation.c
+++ b/src/fragmentation/fragmentation.c
@@ -49,6 +49,11 @@ struct GNUNET_FRAGMENT_Context
   struct GNUNET_TIME_Relative delay;
 
   /**
+   * Next allowed transmission time.
+   */
+  struct GNUNET_TIME_Absolute delay_until;
+
+  /**
    * Time we transmitted the last message of the last round.
    */
   struct GNUNET_TIME_Absolute last_round;
@@ -173,11 +178,11 @@ transmit_next (void *cls,
   if (NULL != fc->tracker)
     GNUNET_BANDWIDTH_tracker_consume (fc->tracker, fsize);    
   GNUNET_STATISTICS_update (fc->stats,
-                            _("Fragments transmitted"),
+                            _("# fragments transmitted"),
                             1, GNUNET_NO);
   if (0 != fc->last_round.abs_value)
     GNUNET_STATISTICS_update (fc->stats,
-                              _("Fragments retransmitted"),
+                              _("# fragments retransmitted"),
                               1, GNUNET_NO);
 
   /* select next message to calculate delay */
@@ -201,6 +206,7 @@ transmit_next (void *cls,
       fc->wack = GNUNET_YES;
     }
   fc->proc_busy = GNUNET_YES;
+  fc->delay_until = GNUNET_TIME_relative_to_absolute (delay);
   fc->proc (fc->proc_cls, &fh->header);
 }
 
@@ -237,12 +243,12 @@ GNUNET_FRAGMENT_context_create (struct GNUNET_STATISTICS_Handle *stats,
   uint64_t bits;
   
   GNUNET_STATISTICS_update (stats,
-                            _("Messages fragmented"),
+                            _("# messages fragmented"),
                             1, GNUNET_NO);
   GNUNET_assert (mtu >= 1024 + sizeof (struct FragmentHeader));
   size = ntohs (msg->size);
   GNUNET_STATISTICS_update (stats,
-                            _("Total size of fragmented messages"),
+                            _("# total size of fragmented messages"),
                             size, GNUNET_NO);
   GNUNET_assert (size > mtu);
   fc = GNUNET_malloc (sizeof (struct GNUNET_FRAGMENT_Context) + size);
@@ -281,8 +287,9 @@ GNUNET_FRAGMENT_context_transmission_done (struct GNUNET_FRAGMENT_Context *fc)
   GNUNET_assert (fc->proc_busy == GNUNET_YES);
   fc->proc_busy = GNUNET_NO;
   GNUNET_assert (fc->task == GNUNET_SCHEDULER_NO_TASK);
-  fc->task = GNUNET_SCHEDULER_add_now (&transmit_next,
-                                       fc);
+  fc->task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_absolute_get_remaining (fc->delay_until),
+                                           &transmit_next,
+                                           fc);
 }
 
 
@@ -322,11 +329,15 @@ GNUNET_FRAGMENT_process_ack (struct GNUNET_FRAGMENT_Context *fc,
       ndelay = GNUNET_TIME_absolute_get_duration (fc->last_round);
       fc->delay.rel_value = (ndelay.rel_value + 3 * fc->delay.rel_value) / 4;
     }
+  GNUNET_STATISTICS_update (fc->stats,
+                            _("# fragment acknowledgements received"),
+                            1,
+                            GNUNET_NO);
   if (abits != (fc->acks & abits))
     {
       /* ID collission or message reordering, count! This should be rare! */
       GNUNET_STATISTICS_update (fc->stats,
-                                _("Bits removed from ACK"),
+                                _("# bits removed from fragmentation ACKs"),
                                 1, GNUNET_NO);
     }
   fc->acks = abits;
@@ -340,6 +351,10 @@ GNUNET_FRAGMENT_process_ack (struct GNUNET_FRAGMENT_Context *fc,
     }
 
   /* all done */
+  GNUNET_STATISTICS_update (fc->stats,
+                            _("# fragmentation transmissions completed"),
+                            1,
+                            GNUNET_NO);
   if (fc->task != GNUNET_SCHEDULER_NO_TASK)
     {
       GNUNET_SCHEDULER_cancel (fc->task);