* Create a defragmentation context.
*
* @param stats statistics context
- * @param mtu the maximum message size for each fragment
+ * @param mtu the maximum message size for each fragment
* @param num_msgs how many fragmented messages
* to we defragment at most at the same time?
* @param cls closure for proc and ackp
{
struct GNUNET_DEFRAGMENT_Context *dc;
- dc = GNUNET_malloc (sizeof (struct GNUNET_DEFRAGMENT_Context));
+ dc = GNUNET_new (struct GNUNET_DEFRAGMENT_Context);
dc->stats = stats;
dc->cls = cls;
dc->proc = proc;
for (i = 0; i < total; i++)
{
x[i] = (double) i;
- y[i] = (double) (first[i].time.abs_value - first[0].time.abs_value);
+ y[i] = (double) (first[i].time.abs_value_us - first[0].time.abs_value_us);
}
gsl_fit_mul (x, 1, y, 1, total, &c1, &cov11, &sumsq);
c1 += sqrt (sumsq); /* add 1 std dev */
- ret.rel_value = (uint64_t) c1;
- if (ret.rel_value == 0)
- ret = GNUNET_TIME_UNIT_MILLISECONDS; /* always at least 1 */
+ ret.rel_value_us = (uint64_t) c1;
+ if (0 == ret.rel_value_us)
+ ret = GNUNET_TIME_UNIT_MICROSECONDS; /* always at least 1 */
return ret;
-};
+}
/**
while (NULL != pos)
{
if ((old == NULL) ||
- (old->last_update.abs_value > pos->last_update.abs_value))
+ (old->last_update.abs_value_us > pos->last_update.abs_value_us))
old = pos;
pos = pos->next;
}
unsigned int bc;
unsigned int b;
unsigned int n;
+ unsigned int num_fragments;
int duplicate;
+ int last;
if (ntohs (msg->size) < sizeof (struct FragmentHeader))
{
return GNUNET_SYSERR;
}
GNUNET_STATISTICS_update (dc->stats, _("# fragments received"), 1, GNUNET_NO);
+ num_fragments = (ntohs (msg->size) + dc->mtu - sizeof (struct FragmentHeader)-1) / (dc->mtu - sizeof (struct FragmentHeader));
+ last = 0;
+ for (mc = dc->head; NULL != mc; mc = mc->next)
+ if (mc->fragment_id > fid)
+ last++;
+
mc = dc->head;
while ((NULL != mc) && (fid != mc->fragment_id))
mc = mc->next;
for (b = 0; b < 64; b++)
if (0 != (mc->bits & (1LL << b)))
bc++;
- if (mc->frag_times_write_offset - mc->frag_times_start_offset > 1)
- dc->latency = estimate_latency (mc);
- delay = GNUNET_TIME_relative_multiply (dc->latency, bc + 1);
- if ((0 == mc->bits) || (GNUNET_YES == duplicate)) /* message complete or duplicate, ACK now! */
- delay = GNUNET_TIME_UNIT_ZERO;
- if (GNUNET_SCHEDULER_NO_TASK != mc->ack_task)
- GNUNET_SCHEDULER_cancel (mc->ack_task);
- mc->ack_task = GNUNET_SCHEDULER_add_delayed (delay, &send_ack, mc);
+
+ /* notify about complete message */
if ((duplicate == GNUNET_NO) && (0 == mc->bits))
{
GNUNET_STATISTICS_update (dc->stats, _("# messages defragmented"), 1,
/* message complete, notify! */
dc->proc (dc->cls, mc->msg);
}
+ /* send ACK */
+ if (mc->frag_times_write_offset - mc->frag_times_start_offset > 1)
+ {
+ dc->latency = estimate_latency (mc);
+ }
+ delay = GNUNET_TIME_relative_multiply (dc->latency, bc + 1);
+ if ( (last + fid == num_fragments) ||
+ (0 == mc->bits) ||
+ (GNUNET_YES == duplicate))
+ {
+ /* message complete or duplicate or last missing fragment in
+ linear sequence; ACK now! */
+ delay = GNUNET_TIME_UNIT_ZERO;
+ }
+ if (GNUNET_SCHEDULER_NO_TASK != mc->ack_task)
+ GNUNET_SCHEDULER_cancel (mc->ack_task);
+ mc->ack_task = GNUNET_SCHEDULER_add_delayed (delay, &send_ack, mc);
if (duplicate == GNUNET_YES)
return GNUNET_NO;
return GNUNET_YES;