[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r35910 - gnunet/src/cadet
From: |
gnunet |
Subject: |
[GNUnet-SVN] r35910 - gnunet/src/cadet |
Date: |
Wed, 10 Jun 2015 14:08:12 +0200 |
Author: bartpolot
Date: 2015-06-10 14:08:12 +0200 (Wed, 10 Jun 2015)
New Revision: 35910
Modified:
gnunet/src/cadet/gnunet-service-cadet_channel.c
Log:
- fix log
Modified: gnunet/src/cadet/gnunet-service-cadet_channel.c
===================================================================
--- gnunet/src/cadet/gnunet-service-cadet_channel.c 2015-06-10 12:08:12 UTC
(rev 35909)
+++ gnunet/src/cadet/gnunet-service-cadet_channel.c 2015-06-10 12:08:12 UTC
(rev 35910)
@@ -401,7 +401,8 @@
mid = ntohl (msg->mid);
- LOG (GNUNET_ERROR_TYPE_DEBUG, "add_buffered_data %u\n", mid);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "add_buffered_data MID %u (%u)\n",
+ mid, rel->n_recv);
rel->n_recv++;
@@ -632,7 +633,8 @@
send_client_data (ch, msg, fwd);
rel->n_recv--;
GNUNET_CONTAINER_DLL_remove (rel->head_recv, rel->tail_recv, copy);
- LOG (GNUNET_ERROR_TYPE_DEBUG, " COPYFREE RECV %p\n", copy);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " COPYFREE RECV %u (%p), %u left\n",
+ copy->mid, copy, rel->n_recv);
GNUNET_free (copy);
GCCH_send_data_ack (ch, fwd);
}
@@ -745,7 +747,7 @@
fwd = (rel == ch->root_rel);
/* Message not found in the queue that we are going to use. */
- LOG (GNUNET_ERROR_TYPE_DEBUG, "!!! RETRANSMIT %u\n", copy->mid);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "RETRANSMIT MID %u\n", copy->mid);
GCCH_send_prebuilt_message (&payload->header, ch, fwd, copy);
GNUNET_STATISTICS_update (stats, "# data retransmitted", 1, GNUNET_NO);
@@ -767,7 +769,7 @@
if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
return;
- LOG (GNUNET_ERROR_TYPE_DEBUG, "!!! RE-CREATE\n");
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "RE-CREATE\n");
GNUNET_STATISTICS_update (stats, "# data retransmitted", 1, GNUNET_NO);
if (rel == rel->ch->root_rel)
@@ -811,18 +813,17 @@
switch (chq->type)
{
case GNUNET_MESSAGE_TYPE_CADET_DATA:
- LOG (GNUNET_ERROR_TYPE_DEBUG, "!!! SENT DATA MID %u\n", copy->mid);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "data MID %u sent\n", copy->mid);
GNUNET_assert (chq == copy->chq);
copy->timestamp = GNUNET_TIME_absolute_get ();
rel = copy->rel;
if (NULL == rel->retry_task)
{
- LOG (GNUNET_ERROR_TYPE_DEBUG, "!! scheduling retry in 4 * %s\n",
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " scheduling retry in 4 * %s\n",
GNUNET_STRINGS_relative_time_to_string (rel->expected_delay,
GNUNET_YES));
if (0 != rel->expected_delay.rel_value_us)
{
- LOG (GNUNET_ERROR_TYPE_DEBUG, "!! delay != 0\n");
rel->retry_timer =
GNUNET_TIME_relative_multiply (rel->expected_delay,
CADET_RETRANSMIT_MARGIN);
@@ -829,10 +830,9 @@
}
else
{
- LOG (GNUNET_ERROR_TYPE_DEBUG, "!! delay reset\n");
rel->retry_timer = CADET_RETRANSMIT_TIME;
}
- LOG (GNUNET_ERROR_TYPE_DEBUG, "!! using delay %s\n",
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " using delay %s\n",
GNUNET_STRINGS_relative_time_to_string (rel->retry_timer,
GNUNET_NO));
rel->retry_task =
@@ -841,7 +841,7 @@
}
else
{
- LOG (GNUNET_ERROR_TYPE_DEBUG, "!! retry task %u\n", rel->retry_task);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "retry running %p\n", rel->retry_task);
}
copy->chq = NULL;
break;
@@ -850,7 +850,7 @@
case GNUNET_MESSAGE_TYPE_CADET_DATA_ACK:
case GNUNET_MESSAGE_TYPE_CADET_CHANNEL_CREATE:
case GNUNET_MESSAGE_TYPE_CADET_CHANNEL_ACK:
- LOG (GNUNET_ERROR_TYPE_DEBUG, "!!! SENT %s\n", GC_m2s (chq->type));
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "sent %s\n", GC_m2s (chq->type));
rel = chq->rel;
GNUNET_assert (rel->uniq == chq);
rel->uniq = NULL;
@@ -860,7 +860,7 @@
&& GNUNET_NO == rel->ch->destroy)
{
GNUNET_assert (NULL == rel->retry_task);
- LOG (GNUNET_ERROR_TYPE_DEBUG, "!!! STD BACKOFF %s\n",
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "STD BACKOFF %s\n",
GNUNET_STRINGS_relative_time_to_string (rel->retry_timer,
GNUNET_NO));
rel->retry_timer = GNUNET_TIME_STD_BACKOFF (rel->retry_timer);
@@ -977,7 +977,7 @@
{
next = copy->next;
GNUNET_CONTAINER_DLL_remove (rel->head_recv, rel->tail_recv, copy);
- LOG (GNUNET_ERROR_TYPE_DEBUG, " COPYFREE BATCH RECV %p\n", copy);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " COPYFREE ALL RECV %p\n", copy);
GNUNET_break (NULL == copy->chq);
GNUNET_free (copy);
}
@@ -985,7 +985,7 @@
{
next = copy->next;
GNUNET_CONTAINER_DLL_remove (rel->head_sent, rel->tail_sent, copy);
- LOG (GNUNET_ERROR_TYPE_DEBUG, " COPYFREE BATCH %p\n", copy);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " COPYFREE ALL SEND %p\n", copy);
if (NULL != copy->chq)
{
if (NULL != copy->chq->tq)
@@ -1104,7 +1104,7 @@
struct GNUNET_TIME_Relative time;
rel = copy->rel;
- LOG (GNUNET_ERROR_TYPE_DEBUG, "!!! Freeing %u\n", copy->mid);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "TIME Freeing %u\n", copy->mid);
if (update_time)
{
time = GNUNET_TIME_absolute_get_duration (copy->timestamp);
@@ -1116,8 +1116,9 @@
rel->expected_delay.rel_value_us += time.rel_value_us;
rel->expected_delay.rel_value_us /= 8;
}
- LOG (GNUNET_ERROR_TYPE_INFO, "!!! took %s, new delay %s\n",
- GNUNET_STRINGS_relative_time_to_string (time, GNUNET_NO),
+ LOG (GNUNET_ERROR_TYPE_INFO, "TIME message %12s\n",
+ GNUNET_STRINGS_relative_time_to_string (time, GNUNET_NO));
+ LOG (GNUNET_ERROR_TYPE_INFO, "TIME new delay %12s\n",
GNUNET_STRINGS_relative_time_to_string (rel->expected_delay,
GNUNET_NO));
rel->retry_timer = rel->expected_delay;
@@ -1124,7 +1125,7 @@
}
else
{
- LOG (GNUNET_ERROR_TYPE_INFO, "!!! batch free, ignoring timing\n");
+ LOG (GNUNET_ERROR_TYPE_INFO, "TIME batch free, ignoring timing\n");
}
rel->ch->pending_messages--;
if (NULL != copy->chq)
@@ -1133,7 +1134,7 @@
/* copy->q is set to NULL by ch_message_sent */
}
GNUNET_CONTAINER_DLL_remove (rel->head_sent, rel->tail_sent, copy);
- LOG (GNUNET_ERROR_TYPE_DEBUG, " COPYFREE %p\n", copy);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " COPYFREE SEND %p\n", copy);
GNUNET_free (copy);
if (GNUNET_NO != rel->ch->destroy && 0 == rel->ch->pending_messages)
@@ -1172,7 +1173,7 @@
{
rel->client_ready = GNUNET_YES;
rel->expected_delay = rel->retry_timer;
- LOG (GNUNET_ERROR_TYPE_DEBUG, " !! retry timer confirm %s\n",
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " confirm retry timer %s\n",
GNUNET_STRINGS_relative_time_to_string (rel->retry_timer, GNUNET_NO));
if (GCT_get_connections_buffer (ch->t) > 0 || GCT_is_loopback (ch->t))
send_client_ack (ch, fwd);
@@ -1225,7 +1226,7 @@
type = ntohs (msg->type);
size = ntohs (msg->size);
- LOG (GNUNET_ERROR_TYPE_DEBUG, "!!! SAVE %u %s\n", mid, GC_m2s (type));
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "save MID %u %s\n", mid, GC_m2s (type));
copy = GNUNET_malloc (sizeof (struct CadetReliableMessage) + size);
LOG (GNUNET_ERROR_TYPE_DEBUG, " at %p\n", copy);
copy->mid = mid;
@@ -1296,7 +1297,7 @@
{
case GNUNET_MESSAGE_TYPE_CADET_DATA:
/* Don't send hop ACK, wait for client to ACK */
- LOG (GNUNET_ERROR_TYPE_DEBUG, "!!! SEND loopback %u (%u)\n",
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "SEND loopback %u (%u)\n",
ntohl (((struct GNUNET_CADET_Data *) msgh)->mid), ntohs
(msgh->size));
GCCH_handle_data (ch, (struct GNUNET_CADET_Data *) msgh, fwd);
break;
@@ -1604,7 +1605,7 @@
struct CadetReliableMessage *aux;
for (aux = rel->head_sent; NULL != aux; aux = aux->next)
{
- LOG (GNUNET_ERROR_TYPE_DEBUG, " - sent MID %u\n", aux->mid);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " - sent mid %u\n", aux->mid);
}
}
}
@@ -1960,7 +1961,7 @@
( !GC_is_pid_bigger (rel->mid_recv, mid) &&
GC_is_pid_bigger (rel->mid_recv + 64, mid) ) )
{
- LOG (GNUNET_ERROR_TYPE_DEBUG, "RECV %u (%u)\n",
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "RECV MID %u (%u)\n",
mid, ntohs (msg->header.size));
if (GNUNET_YES == ch->reliable)
{
@@ -2176,9 +2177,9 @@
add_destination (ch, c);
if (GNUNET_YES == ch->reliable)
- LOG (GNUNET_ERROR_TYPE_DEBUG, "!!! Reliable\n");
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Reliable\n");
else
- LOG (GNUNET_ERROR_TYPE_DEBUG, "!!! Not Reliable\n");
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Not Reliable\n");
send_client_create (ch);
ch->state = CADET_CHANNEL_SENT;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r35910 - gnunet/src/cadet,
gnunet <=