[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r13485 - in gnunet/src: core datastore dht dv fs statistics
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r13485 - in gnunet/src: core datastore dht dv fs statistics topology transport |
|
Date: |
Mon, 1 Nov 2010 23:44:28 +0100 |
Author: grothoff
Date: 2010-11-01 23:44:28 +0100 (Mon, 01 Nov 2010)
New Revision: 13485
Modified:
gnunet/src/core/gnunet-service-core.c
gnunet/src/datastore/datastore_api.c
gnunet/src/datastore/plugin_datastore_sqlite.c
gnunet/src/dht/plugin_dhtlog_mysql_dump.c
gnunet/src/dht/plugin_dhtlog_mysql_dump_load.c
gnunet/src/dv/gnunet-service-dv.c
gnunet/src/fs/gnunet-service-fs.c
gnunet/src/statistics/gnunet-service-statistics.c
gnunet/src/topology/gnunet-daemon-topology.c
gnunet/src/transport/gnunet-service-transport.c
gnunet/src/transport/transport_api.c
Log:
fixes from LRN for DEBUG code
Modified: gnunet/src/core/gnunet-service-core.c
===================================================================
--- gnunet/src/core/gnunet-service-core.c 2010-11-01 22:25:26 UTC (rev
13484)
+++ gnunet/src/core/gnunet-service-core.c 2010-11-01 22:44:28 UTC (rev
13485)
@@ -42,9 +42,9 @@
#include "core.h"
-#define DEBUG_HANDSHAKE GNUNET_NO
+#define DEBUG_HANDSHAKE GNUNET_YES
-#define DEBUG_CORE_QUOTA GNUNET_NO
+#define DEBUG_CORE_QUOTA GNUNET_YES
/**
* Receive and send buffer windows grow over time. For
@@ -3540,7 +3540,7 @@
#if DEBUG_CORE_SET_QUOTA
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Received %u b/s as new inbound limit for peer `%4s'\n",
- (unsigned int) ntohl (pt->inbound_bw_limit.rel_value__),
+ (unsigned int) ntohl (pt->inbound_bw_limit.value__),
GNUNET_i2s (&n->peer));
#endif
n->bw_out_external_limit = pt->inbound_bw_limit;
Modified: gnunet/src/datastore/datastore_api.c
===================================================================
--- gnunet/src/datastore/datastore_api.c 2010-11-01 22:25:26 UTC (rev
13484)
+++ gnunet/src/datastore/datastore_api.c 2010-11-01 22:44:28 UTC (rev
13485)
@@ -1318,7 +1318,7 @@
#if DEBUG_DATASTORE
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Asked to get random entry in %llu ms\n",
- (unsigned long long) timeout.abs_value);
+ (unsigned long long) timeout.rel_value);
#endif
qc.rc.iter = iter;
qc.rc.iter_cls = iter_cls;
@@ -1378,7 +1378,7 @@
#if DEBUG_DATASTORE
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Asked to get zero-anonymity entry in %llu ms\n",
- (unsigned long long) timeout.abs_value);
+ (unsigned long long) timeout.rel_value);
#endif
qc.rc.iter = iter;
qc.rc.iter_cls = iter_cls;
Modified: gnunet/src/datastore/plugin_datastore_sqlite.c
===================================================================
--- gnunet/src/datastore/plugin_datastore_sqlite.c 2010-11-01 22:25:26 UTC
(rev 13484)
+++ gnunet/src/datastore/plugin_datastore_sqlite.c 2010-11-01 22:44:28 UTC
(rev 13485)
@@ -28,7 +28,7 @@
#include "plugin_datastore.h"
#include <sqlite3.h>
-#define DEBUG_SQLITE GNUNET_NO
+#define DEBUG_SQLITE GNUNET_YES
/**
@@ -667,7 +667,7 @@
type,
GNUNET_h2s(key),
priority,
- (unsigned long long) GNUNET_TIME_absolute_get_remaining
(expiration).abs_value,
+ (unsigned long long) GNUNET_TIME_absolute_get_remaining
(expiration).rel_value,
(long long) expiration.abs_value);
#endif
GNUNET_CRYPTO_hash (data, size, &vhash);
Modified: gnunet/src/dht/plugin_dhtlog_mysql_dump.c
===================================================================
--- gnunet/src/dht/plugin_dhtlog_mysql_dump.c 2010-11-01 22:25:26 UTC (rev
13484)
+++ gnunet/src/dht/plugin_dhtlog_mysql_dump.c 2010-11-01 22:44:28 UTC (rev
13485)
@@ -35,7 +35,7 @@
#include "dhtlog.h"
-#define DEBUG_DHTLOG GNUNET_NO
+#define DEBUG_DHTLOG GNUNET_YES
/**
* Maximum number of supported parameters for a prepared
@@ -519,11 +519,11 @@
{
int ret;
#if DEBUG_DHTLOG
- if (trialuid != current_trial)
+/* if (trialuid != current_trial)
{
fprintf (stderr,
_("Trialuid to update is not equal to current_trial\n"));
- }
+ }*/
#endif
if (outfile == NULL)
@@ -586,11 +586,11 @@
{
int ret;
#if DEBUG_DHTLOG
- if (trialuid != current_trial)
+/* if (trialuid != current_trial)
{
fprintf (stderr,
_("Trialuid to update is not equal to current_trial(!)(?)\n"));
- }
+ }*/
#endif
if (outfile == NULL)
return GNUNET_SYSERR;
Modified: gnunet/src/dht/plugin_dhtlog_mysql_dump_load.c
===================================================================
--- gnunet/src/dht/plugin_dhtlog_mysql_dump_load.c 2010-11-01 22:25:26 UTC
(rev 13484)
+++ gnunet/src/dht/plugin_dhtlog_mysql_dump_load.c 2010-11-01 22:44:28 UTC
(rev 13485)
@@ -36,7 +36,7 @@
#include "dhtlog.h"
-#define DEBUG_DHTLOG GNUNET_NO
+#define DEBUG_DHTLOG GNUNET_YES
/**
* Maximum number of supported parameters for a prepared
@@ -347,11 +347,11 @@
{
int ret;
#if DEBUG_DHTLOG
- if (trialuid != current_trial)
+/* if (trialuid != current_trial)
{
fprintf (stderr,
_("Trialuid to update is not equal to current_trial\n"));
- }
+ }*/
#endif
if (outfile == NULL)
@@ -404,11 +404,11 @@
{
int ret;
#if DEBUG_DHTLOG
- if (trialuid != current_trial)
+/* if (trialuid != current_trial)
{
fprintf (stderr,
_("Trialuid to update is not equal to current_trial(!)(?)\n"));
- }
+ }*/
#endif
if (outfile == NULL)
return GNUNET_SYSERR;
Modified: gnunet/src/dv/gnunet-service-dv.c
===================================================================
--- gnunet/src/dv/gnunet-service-dv.c 2010-11-01 22:25:26 UTC (rev 13484)
+++ gnunet/src/dv/gnunet-service-dv.c 2010-11-01 22:44:28 UTC (rev 13485)
@@ -1534,9 +1534,10 @@
else
{
#if DEBUG_MESSAGE_DROP
- direct_id = GNUNET_strdup(GNUNET_i2s(&dn->identity));
+ char *direct_id = GNUNET_strdup(GNUNET_i2s(&dn->identity));
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"%s: DROPPING MESSAGE type %d, forwarding failed! Message
immediately from %s!\n", GNUNET_i2s(&my_identity), ntohs(((struct
GNUNET_MessageHeader *)&incoming[1])->type), direct_id);
+ GNUNET_free (direct_id);
#endif
return GNUNET_SYSERR;
}
Modified: gnunet/src/fs/gnunet-service-fs.c
===================================================================
--- gnunet/src/fs/gnunet-service-fs.c 2010-11-01 22:25:26 UTC (rev 13484)
+++ gnunet/src/fs/gnunet-service-fs.c 2010-11-01 22:44:28 UTC (rev 13485)
@@ -41,7 +41,7 @@
#include "gnunet-service-fs_indexing.h"
#include "fs.h"
-#define DEBUG_FS GNUNET_NO
+#define DEBUG_FS GNUNET_YES
/**
* Should we introduce random latency in processing? Required for proper
@@ -2789,7 +2789,7 @@
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
"NOT sending query since we send %u others to this peer in
the last %llums\n",
MAX_QUEUE_PER_PEER,
- cp->avg_delay.abs_value);
+ cp->avg_delay.rel_value);
#endif
return GNUNET_YES; /* skip */
}
@@ -2964,7 +2964,7 @@
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"No peer selected for forwarding of query `%s', will try
again in %llu ms!\n",
GNUNET_h2s (&pr->query),
- delay.abs_value);
+ delay.rel_value);
#endif
pr->task = GNUNET_SCHEDULER_add_delayed (sched,
delay,
@@ -3283,9 +3283,9 @@
1,
GNUNET_NO);
#if DEBUG_FS
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+/* GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Duplicate response `%s', discarding.\n",
- GNUNET_h2s (&mhash));
+ GNUNET_h2s (&mhash));*/
#endif
return GNUNET_YES; /* duplicate */
case GNUNET_BLOCK_EVALUATION_RESULT_INVALID:
Modified: gnunet/src/statistics/gnunet-service-statistics.c
===================================================================
--- gnunet/src/statistics/gnunet-service-statistics.c 2010-11-01 22:25:26 UTC
(rev 13484)
+++ gnunet/src/statistics/gnunet-service-statistics.c 2010-11-01 22:44:28 UTC
(rev 13485)
@@ -305,7 +305,7 @@
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Transmitting value for `%s:%s' (%d): %llu\n",
e->service, e->name,
- e->persistent, e->abs_value);
+ e->persistent, e->value);
#endif
GNUNET_SERVER_notification_context_unicast (nc, client, &m->header,
GNUNET_NO);
GNUNET_free (m);
@@ -479,7 +479,7 @@
"Received request to update statistic on `%s:%s' (%u) to/by
%llu\n",
service, name,
(unsigned int) flags,
- (unsigned long long) abs_value);
+ (unsigned long long) value);
#endif
pos = start;
prev = NULL;
@@ -522,7 +522,7 @@
#if DEBUG_STATISTICS
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Statistic `%s:%s' updated to value %llu.\n",
- service, name, pos->abs_value);
+ service, name, pos->value);
#endif
if (changed)
notify_change (pos);
@@ -548,7 +548,7 @@
#if DEBUG_STATISTICS
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"New statistic on `%s:%s' with value %llu created.\n",
- service, name, pos->abs_value);
+ service, name, pos->value);
#endif
GNUNET_SERVER_receive_done (client, GNUNET_OK);
}
Modified: gnunet/src/topology/gnunet-daemon-topology.c
===================================================================
--- gnunet/src/topology/gnunet-daemon-topology.c 2010-11-01 22:25:26 UTC
(rev 13484)
+++ gnunet/src/topology/gnunet-daemon-topology.c 2010-11-01 22:44:28 UTC
(rev 13485)
@@ -35,7 +35,7 @@
#include "gnunet_util_lib.h"
-#define DEBUG_TOPOLOGY GNUNET_NO
+#define DEBUG_TOPOLOGY GNUNET_YES
/**
* For how long do we blacklist a peer after a failed connection
@@ -1275,7 +1275,7 @@
#if DEBUG_TOPOLOGY
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Sending `%s' with %u bytes",
- "HELLO"
+ "HELLO",
(unsigned int) want);
#endif
GNUNET_STATISTICS_update (stats,
Modified: gnunet/src/transport/gnunet-service-transport.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport.c 2010-11-01 22:25:26 UTC
(rev 13484)
+++ gnunet/src/transport/gnunet-service-transport.c 2010-11-01 22:44:28 UTC
(rev 13485)
@@ -39,9 +39,9 @@
#include "plugin_transport.h"
#include "transport.h"
-#define DEBUG_BLACKLIST GNUNET_NO
+#define DEBUG_BLACKLIST GNUNET_YES
-#define DEBUG_PING_PONG GNUNET_NO
+#define DEBUG_PING_PONG GNUNET_YES
#define DEBUG_TRANSPORT_HELLO GNUNET_YES
@@ -1554,7 +1554,7 @@
best_address->addr,
best_address->addrlen)
: "<inbound>",
- best_address->latency.abs_value);
+ best_address->latency.rel_value);
#endif
}
else
@@ -1667,7 +1667,7 @@
"No validated destination address available to transmit
message of size %u to peer `%4s', will wait %llums to find an address.\n",
mq->message_buf_size,
GNUNET_i2s (&mq->neighbour_id),
- timeout.abs_value);
+ timeout.rel_value);
#endif
/* FIXME: might want to trigger peerinfo lookup here
(unless that's already pending...) */
Modified: gnunet/src/transport/transport_api.c
===================================================================
--- gnunet/src/transport/transport_api.c 2010-11-01 22:25:26 UTC (rev
13484)
+++ gnunet/src/transport/transport_api.c 2010-11-01 22:44:28 UTC (rev
13485)
@@ -471,7 +471,7 @@
#if DEBUG_TRANSPORT
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Would need %llu ms before bandwidth is available for
delivery to `%4s', that is too long. Signaling timeout.\n",
- duration.abs_value,
+ duration.rel_value,
GNUNET_i2s (&n->id));
#endif
if (th->notify_delay_task != GNUNET_SCHEDULER_NO_TASK)
@@ -492,7 +492,7 @@
(unsigned int) n->out_tracker.available_bytes_per_s__,
(unsigned int) th->notify_size - sizeof (struct
OutboundMessage),
GNUNET_i2s (&n->id),
- duration.abs_value);
+ duration.rel_value);
#endif
retry_time = GNUNET_TIME_relative_min (retry_time,
duration);
@@ -608,7 +608,7 @@
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Message of %u bytes with timeout %llums constructed for
`%4s'\n",
(unsigned int) mret,
- (unsigned long long) GNUNET_TIME_absolute_get_remaining
(th->timeout).abs_value,
+ (unsigned long long) GNUNET_TIME_absolute_get_remaining
(th->timeout).rel_value,
GNUNET_i2s (&n->id));
#endif
if (mret != 0)
@@ -755,7 +755,7 @@
#if DEBUG_TRANSPORT
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Control transmit of %u bytes within %llums requested\n",
- size, (unsigned long long) timeout.abs_value);
+ size, (unsigned long long) timeout.rel_value);
#endif
th = GNUNET_malloc (sizeof (struct ControlMessage));
th->h = h;
@@ -868,11 +868,11 @@
if (n != NULL)
{
#if DEBUG_TRANSPORT
- if (ntohl (quota_out.rel_value__) !=
n->out_tracker.available_bytes_per_s__)
+ if (ntohl (quota_out.value__) != n->out_tracker.available_bytes_per_s__)
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Quota changed from %u to %u for peer `%s'\n",
(unsigned int) n->out_tracker.available_bytes_per_s__,
- (unsigned int) ntohl (quota_out.rel_value__),
+ (unsigned int) ntohl (quota_out.value__),
GNUNET_i2s (target));
else
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -888,7 +888,7 @@
#if DEBUG_TRANSPORT
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Quota changed to %u for peer `%s', but I have no such
neighbour!\n",
- (unsigned int) ntohl (quota_out.rel_value__),
+ (unsigned int) ntohl (quota_out.value__),
GNUNET_i2s (target));
#endif
}
@@ -1235,7 +1235,7 @@
#if DEBUG_TRANSPORT
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Scheduling task to reconnect to transport service in %llu
ms.\n",
- h->reconnect_delay.abs_value);
+ h->reconnect_delay.rel_value);
#endif
GNUNET_assert (h->client == NULL);
GNUNET_assert (h->reconnect_task == GNUNET_SCHEDULER_NO_TASK);
@@ -1802,7 +1802,7 @@
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Asking transport service for transmission of %u bytes to peer
`%4s' within %llu ms.\n",
size, GNUNET_i2s (target),
- (unsigned long long) timeout.abs_value);
+ (unsigned long long) timeout.rel_value);
#endif
n = neighbour_find (handle, target);
if (n == NULL)
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r13485 - in gnunet/src: core datastore dht dv fs statistics topology transport,
gnunet <=