gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] r9499 - gnunet/src/core


From: gnunet
Subject: [GNUnet-SVN] r9499 - gnunet/src/core
Date: Fri, 13 Nov 2009 13:28:33 -0700

Author: grothoff
Date: 2009-11-13 13:28:32 -0700 (Fri, 13 Nov 2009)
New Revision: 9499

Modified:
   gnunet/src/core/gnunet-service-core.c
   gnunet/src/core/test_core_api_data.conf
   gnunet/src/core/test_core_api_peer1.conf
   gnunet/src/core/test_core_api_peer2.conf
Log:
cleaning up

Modified: gnunet/src/core/gnunet-service-core.c
===================================================================
--- gnunet/src/core/gnunet-service-core.c       2009-11-13 20:27:21 UTC (rev 
9498)
+++ gnunet/src/core/gnunet-service-core.c       2009-11-13 20:28:32 UTC (rev 
9499)
@@ -1524,6 +1524,11 @@
           ret += pos->size;
           size -= pos->size;
           *priority += pos->priority;
+#if DEBUG_CORE
+         GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                     "Adding plaintext message with deadline %llu ms to 
batch\n",
+                     GNUNET_TIME_absolute_get_remaining (pos->deadline).value);
+#endif
           deadline->value = GNUNET_MIN (deadline->value, pos->deadline.value);
           GNUNET_free (pos);
           if (prev == NULL)
@@ -1537,6 +1542,11 @@
         }
       pos = next;
     }
+#if DEBUG_CORE
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+             "Deadline for message batch is %llu ms\n",
+             GNUNET_TIME_absolute_get_remaining (*deadline).value);
+#endif
   return ret;
 }
 
@@ -1707,7 +1717,6 @@
                                       &retry_plaintext_processing, n);
       return;
     }
-
   ph->sequence_number = htonl (++n->last_sequence_number_sent);
   ph->inbound_bpm_limit = htonl (n->bpm_in);
   ph->timestamp = GNUNET_TIME_absolute_hton (GNUNET_TIME_absolute_get ());
@@ -1726,9 +1735,10 @@
   /* encrypt */
 #if DEBUG_CORE
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Encrypting %u bytes of plaintext messages for `%4s' for 
transmission.\n",
+              "Encrypting %u bytes of plaintext messages for `%4s' for 
transmission in %llums.\n",
              esize,
-             GNUNET_i2s(&n->peer));
+             GNUNET_i2s(&n->peer),
+             (unsigned long long) GNUNET_TIME_absolute_get_remaining 
(deadline).value);
 #endif
   GNUNET_assert (GNUNET_OK ==
                  do_encrypt (n,
@@ -2146,6 +2156,12 @@
       GNUNET_break (0);
       break;
     }
+#if DEBUG_CORE
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Have %llu ms left for `%s' transmission.\n",
+             (unsigned long long) GNUNET_TIME_absolute_get_remaining 
(me->deadline).value,
+             "SET_KEY");
+#endif
   /* trigger queue processing */
   process_encrypted_neighbour_queue (n);
   if (n->status != PEER_STATE_KEY_CONFIRMED)

Modified: gnunet/src/core/test_core_api_data.conf
===================================================================
--- gnunet/src/core/test_core_api_data.conf     2009-11-13 20:27:21 UTC (rev 
9498)
+++ gnunet/src/core/test_core_api_data.conf     2009-11-13 20:28:32 UTC (rev 
9499)
@@ -1,27 +1,5 @@
 [PATHS]
-SERVICEHOME = /tmp/test-gnunetd-fs-download/
+SERVICEHOME = /tmp/test-gnunet-core/
 
-[resolver]
-PORT = 2464
-
-[transport]
-PORT = 2465
-PLUGINS = tcp
-
-[arm]
-PORT = 2466
-
-[statistics]
-PORT = 2467
-
-[tcp]
-PORT = 2468
-
-[peerinfo]
-PORT = 2469
-
-[core]
-PORT = 2470
-
 [testing]
 WEAKRANDOM = YES

Modified: gnunet/src/core/test_core_api_peer1.conf
===================================================================
--- gnunet/src/core/test_core_api_peer1.conf    2009-11-13 20:27:21 UTC (rev 
9498)
+++ gnunet/src/core/test_core_api_peer1.conf    2009-11-13 20:28:32 UTC (rev 
9499)
@@ -1,5 +1,5 @@
 [PATHS]
-SERVICEHOME = /tmp/test-gnunetd-core-peer-1/
+SERVICEHOME = /tmp/test-gnunet-core-peer-1/
 DEFAULTCONFIG = test_core_api_peer1.conf
 
 [resolver]
@@ -25,11 +25,13 @@
 
 [transport-tcp]
 PORT = 12468
+#DEBUG = YES
 
 [peerinfo]
 PORT = 12469
 #PREFIX = xterm -T peerinfo1 -e valgrind --tool=memcheck
 #PREFIX = xterm -T peerinfo1 -e
+#DEBUG = YES
 
 [core]
 PORT = 12470

Modified: gnunet/src/core/test_core_api_peer2.conf
===================================================================
--- gnunet/src/core/test_core_api_peer2.conf    2009-11-13 20:27:21 UTC (rev 
9498)
+++ gnunet/src/core/test_core_api_peer2.conf    2009-11-13 20:28:32 UTC (rev 
9499)
@@ -1,5 +1,5 @@
 [PATHS]
-SERVICEHOME = /tmp/test-gnunetd-core-peer-2/
+SERVICEHOME = /tmp/test-gnunet-core-peer-2/
 DEFAULTCONFIG = test_core_api_peer2.conf
 
 [resolver]
@@ -24,11 +24,13 @@
 
 [transport-tcp]
 PORT = 22468
+#DEBUG = YES
 
 [peerinfo]
 PORT = 22469
 #PREFIX = xterm -T peerinfo2 -e valgrind --tool=memcheck
 #PREFIX = xterm -T peerinfo2 -e 
+#DEBUG = YES
 
 [core]
 PORT = 22470





reply via email to

[Prev in Thread] Current Thread [Next in Thread]