[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r24965 - gnunet/src/dht
From: |
gnunet |
Subject: |
[GNUnet-SVN] r24965 - gnunet/src/dht |
Date: |
Wed, 14 Nov 2012 16:53:47 +0100 |
Author: grothoff
Date: 2012-11-14 16:53:47 +0100 (Wed, 14 Nov 2012)
New Revision: 24965
Modified:
gnunet/src/dht/dht_api.c
gnunet/src/dht/gnunet-service-dht_clients.c
gnunet/src/dht/gnunet-service-dht_neighbours.c
Log:
fixing crash of mesh service -- reproduced by regex profiler w 100 peers -- on
shutdown due to failure to initialize dht_handle field
Modified: gnunet/src/dht/dht_api.c
===================================================================
--- gnunet/src/dht/dht_api.c 2012-11-14 15:52:09 UTC (rev 24964)
+++ gnunet/src/dht/dht_api.c 2012-11-14 15:53:47 UTC (rev 24965)
@@ -1268,6 +1268,7 @@
pending);
pending->in_pending_queue = GNUNET_YES;
get_handle = GNUNET_malloc (sizeof (struct GNUNET_DHT_GetHandle));
+ get_handle->dht_handle = handle;
get_handle->iter = iter;
get_handle->iter_cls = iter_cls;
get_handle->message = pending;
Modified: gnunet/src/dht/gnunet-service-dht_clients.c
===================================================================
--- gnunet/src/dht/gnunet-service-dht_clients.c 2012-11-14 15:52:09 UTC (rev
24964)
+++ gnunet/src/dht/gnunet-service-dht_clients.c 2012-11-14 15:53:47 UTC (rev
24965)
@@ -37,6 +37,12 @@
/**
+ * Should routing details be logged to stderr (for debugging)?
+ */
+#define LOG_ROUTE_DETAILS_STDERR GNUNET_YES
+
+
+/**
* Linked list of messages to send to clients.
*/
struct PendingMessage
@@ -581,6 +587,16 @@
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Received request for %s from local client %p\n",
GNUNET_h2s (&get->key), client);
+
+ if (LOG_ROUTE_DETAILS_STDERR)
+ {
+ fprintf (stderr,
+ "XDHT CLIENT-GET %s @ %u\n",
+ GNUNET_h2s (&get->key),
+ getpid ());
+ }
+
+
cqr = GNUNET_malloc (sizeof (struct ClientQueryRecord) + xquery_size);
cqr->key = get->key;
cqr->client = find_active_client (client);
@@ -1002,6 +1018,13 @@
struct GNUNET_HashCode ch;
unsigned int i;
+ if (LOG_ROUTE_DETAILS_STDERR)
+ {
+ fprintf (stderr,
+ "XDHT CLIENT-RESULT %s @ %u\n",
+ GNUNET_h2s (key),
+ getpid ());
+ }
if ((record->type != GNUNET_BLOCK_TYPE_ANY) && (record->type != frc->type))
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
Modified: gnunet/src/dht/gnunet-service-dht_neighbours.c
===================================================================
--- gnunet/src/dht/gnunet-service-dht_neighbours.c 2012-11-14 15:52:09 UTC
(rev 24964)
+++ gnunet/src/dht/gnunet-service-dht_neighbours.c 2012-11-14 15:53:47 UTC
(rev 24965)
@@ -97,7 +97,7 @@
/**
* Should routing details be logged to stderr (for debugging)?
*/
-#define LOG_ROUTE_DETAILS_STDERR GNUNET_NO
+#define LOG_ROUTE_DETAILS_STDERR GNUNET_YES
GNUNET_NETWORK_STRUCT_BEGIN
@@ -1598,7 +1598,9 @@
char *tmp;
tmp = GNUNET_strdup (GNUNET_i2s (&my_identity));
- fprintf (stderr, "XDHT PUT %s: %s<-%s\n", GNUNET_h2s (&put->key), tmp,
GNUNET_i2s (peer));
+ fprintf (stderr, "XDHT PUT %s: %s(%u)<-%s\n",
+ GNUNET_h2s (&put->key), tmp, getpid (),
+ GNUNET_i2s (peer));
GNUNET_free (tmp);
}
@@ -1855,7 +1857,9 @@
char *tmp;
tmp = GNUNET_strdup (GNUNET_i2s (&my_identity));
- fprintf (stderr, "XDHT GET %s: %s<-%s\n", GNUNET_h2s (&get->key), tmp,
GNUNET_i2s (peer));
+ fprintf (stderr, "XDHT GET %s: %s(%u)<-%s\n",
+ GNUNET_h2s (&get->key), tmp, getpid(),
+ GNUNET_i2s (peer));
GNUNET_free (tmp);
}
@@ -1989,7 +1993,10 @@
char *tmp;
tmp = GNUNET_strdup (GNUNET_i2s (&my_identity));
- fprintf (stderr, "XDHT RESULT %s: %s<-%s\n", GNUNET_h2s (&prm->key), tmp,
GNUNET_i2s (peer));
+ fprintf (stderr,
+ "XDHT RESULT %s: %s(%u)<-%s\n",
+ GNUNET_h2s (&prm->key), tmp,
+ getpid(), GNUNET_i2s (peer));
GNUNET_free (tmp);
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r24965 - gnunet/src/dht,
gnunet <=