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

[gnunet]

Author: grothoff
Date: 2012-02-26 14:45:13 +0100 (Sun, 26 Feb 2012)
New Revision: 20030

Modified:
   gnunet/src/core/test_core_api.c
   gnunet/src/core/test_core_api_reliability.c
   gnunet/src/core/test_core_api_start_only.c
   gnunet/src/core/test_core_quota_compliance.c
Log:
-extra logging is not the same as verbose

Modified: gnunet/src/core/test_core_api.c
===================================================================
--- gnunet/src/core/test_core_api.c     2012-02-26 11:30:36 UTC (rev 20029)
+++ gnunet/src/core/test_core_api.c     2012-02-26 13:45:13 UTC (rev 20030)
@@ -31,7 +31,7 @@
 #include "gnunet_scheduler_lib.h"
 #include "gnunet_transport_service.h"
 
-#define VERBOSE GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
 
 #define START_ARM GNUNET_YES
 

Modified: gnunet/src/core/test_core_api_reliability.c
===================================================================
--- gnunet/src/core/test_core_api_reliability.c 2012-02-26 11:30:36 UTC (rev 
20029)
+++ gnunet/src/core/test_core_api_reliability.c 2012-02-26 13:45:13 UTC (rev 
20030)
@@ -33,7 +33,7 @@
 #include "gnunet_transport_service.h"
 #include <gauger.h>
 
-#define VERBOSE GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
 
 #define START_ARM GNUNET_YES
 

Modified: gnunet/src/core/test_core_api_start_only.c
===================================================================
--- gnunet/src/core/test_core_api_start_only.c  2012-02-26 11:30:36 UTC (rev 
20029)
+++ gnunet/src/core/test_core_api_start_only.c  2012-02-26 13:45:13 UTC (rev 
20030)
@@ -31,7 +31,7 @@
 #include "gnunet_program_lib.h"
 #include "gnunet_scheduler_lib.h"
 
-#define VERBOSE GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
 
 #define TIMEOUT 3
 

Modified: gnunet/src/core/test_core_quota_compliance.c
===================================================================
--- gnunet/src/core/test_core_quota_compliance.c        2012-02-26 11:30:36 UTC 
(rev 20029)
+++ gnunet/src/core/test_core_quota_compliance.c        2012-02-26 13:45:13 UTC 
(rev 20030)
@@ -33,8 +33,7 @@
 #include "gnunet_transport_service.h"
 #include "gnunet_statistics_service.h"
 
-#define VERBOSE GNUNET_EXTRA_LOGGING
-#define DEBUG_TRANSMISSION GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
 
 #define SYMMETRIC 0
 #define ASYMMETRIC_SEND_LIMITED 1
@@ -333,11 +332,9 @@
   cbuf = buf;
   do
   {
-#if DEBUG_TRANSMISSION
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Sending message %u of size %u at offset %u\n", tr_n,
                 MESSAGESIZE, ret);
-#endif
     hdr.header.size = htons (MESSAGESIZE);
     hdr.header.type = htons (MTYPE);
     hdr.num = htonl (tr_n);
@@ -373,14 +370,12 @@
   pc->connect_status = 1;
   if (pc == &p1)
   {
-#if DEBUG_TRANSMISSION
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Encrypted connection established to peer `%4s'\n",
                 GNUNET_i2s (peer));
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Asking core (1) for transmission to peer `%4s'\n",
                 GNUNET_i2s (&p2.id));
-#endif
     if (err_task != GNUNET_SCHEDULER_NO_TASK)
       GNUNET_SCHEDULER_cancel (err_task);
     err_task =
@@ -421,10 +416,8 @@
     GNUNET_CORE_notify_transmit_ready_cancel (pc->nth);
     pc->nth = NULL;
   }
-#if DEBUG_TRANSMISSION
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Encrypted connection to `%4s' cut\n",
               GNUNET_i2s (peer));
-#endif
 }
 
 
@@ -434,11 +427,9 @@
                 const struct GNUNET_ATS_Information *atsi,
                 unsigned int atsi_count)
 {
-#if DEBUG_TRANSMISSION
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Core provides inbound data from `%4s' %llu.\n",
               GNUNET_i2s (other), ntohs (message->size));
-#endif
   total_bytes_recv += ntohs (message->size);
   return GNUNET_OK;
 }
@@ -450,11 +441,9 @@
                  const struct GNUNET_ATS_Information *atsi,
                  unsigned int atsi_count)
 {
-#if DEBUG_TRANSMISSION
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Core notifies about outbound data for `%4s'.\n",
               GNUNET_i2s (other));
-#endif
   return GNUNET_OK;
 }
 
@@ -492,10 +481,8 @@
     err_task = GNUNET_SCHEDULER_add_now (&terminate_task_error, NULL);
     return GNUNET_SYSERR;
   }
-#if DEBUG_TRANSMISSION
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Got message %u of size %u\n",
               ntohl (hdr->num), ntohs (message->size));
-#endif
   n++;
   if (0 == (n % 10))
     FPRINTF (stderr, "%s",  ".");
@@ -545,11 +532,9 @@
     GNUNET_assert (ok == 3);
     OKPP;
     GNUNET_assert (cls == &p2);
-#if DEBUG_TRANSMISSION
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Asking core (1) to connect to peer `%4s'\n",
                 GNUNET_i2s (&p2.id));
-#endif
     connect_task = GNUNET_SCHEDULER_add_now (&try_connect, NULL);
   }
 }
@@ -560,11 +545,8 @@
 {
   struct PeerContext *p = cls;
 
-
-#if DEBUG_TRANSMISSION
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Received (my) `%s' from transport service\n", "HELLO");
-#endif
   GNUNET_assert (message != NULL);
   p->hello = GNUNET_malloc (ntohs (message->size));
   memcpy (p->hello, message, ntohs (message->size));