[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnunet] 06/19: improving logging
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] [gnunet] 06/19: improving logging |
|
Date: |
Sun, 22 Jan 2017 15:23:47 +0100 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository gnunet.
commit 0e6da3245dec82dd5f3a0f1cd3f3505bf454422d
Author: Christian Grothoff <address@hidden>
AuthorDate: Sun Jan 22 12:12:31 2017 +0100
improving logging
---
src/cadet/gnunet-service-cadet-new_channel.c | 6 +-
src/cadet/gnunet-service-cadet-new_paths.c | 43 ++++++++++++-
src/cadet/gnunet-service-cadet-new_peer.c | 95 ++++++++++++++++++++++++++--
src/cadet/gnunet-service-cadet-new_tunnels.c | 5 +-
4 files changed, 135 insertions(+), 14 deletions(-)
diff --git a/src/cadet/gnunet-service-cadet-new_channel.c
b/src/cadet/gnunet-service-cadet-new_channel.c
index 4bff1a1c5..563b1c7e7 100644
--- a/src/cadet/gnunet-service-cadet-new_channel.c
+++ b/src/cadet/gnunet-service-cadet-new_channel.c
@@ -323,12 +323,10 @@ GCCH_2s (const struct CadetChannel *ch)
{
static char buf[128];
- if (NULL == ch)
- return "(NULL Channel)";
GNUNET_snprintf (buf,
sizeof (buf),
- "%s:%s ctn:%X (%X)",
- GCT_2s (ch->t),
+ "%s:%s ctn:%X(%X)",
+ GNUNET_i2s (GCP_get_id (GCT_get_destination (ch->t))),
GNUNET_h2s (&ch->port),
ch->ctn,
ntohl (ch->ccn.channel_of_client));
diff --git a/src/cadet/gnunet-service-cadet-new_paths.c
b/src/cadet/gnunet-service-cadet-new_paths.c
index 2bd62f436..aff46db07 100644
--- a/src/cadet/gnunet-service-cadet-new_paths.c
+++ b/src/cadet/gnunet-service-cadet-new_paths.c
@@ -28,6 +28,7 @@
* (and will be tricky to have during path changes)
*/
#include "platform.h"
+#include "gnunet-service-cadet-new_connection.h"
#include "gnunet-service-cadet-new_peer.h"
#include "gnunet-service-cadet-new_paths.h"
@@ -133,6 +134,11 @@ GCPP_add_connection (struct CadetPeerPath *path,
{
struct CadetPeerPathEntry *entry;
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Adding connection %s to path %s at offset %u\n",
+ GCC_2s (cc),
+ GCPP_2s (path),
+ off);
GNUNET_assert (off < path->entries_length);
entry = &path->entries[off];
GNUNET_assert (NULL == entry->cc);
@@ -156,6 +162,11 @@ GCPP_del_connection (struct CadetPeerPath *path,
{
struct CadetPeerPathEntry *entry;
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Removing connection %s to path %s at offset %u\n",
+ GCC_2s (cc),
+ GCPP_2s (path),
+ off);
GNUNET_assert (off < path->entries_length);
entry = &path->entries[off];
GNUNET_assert (cc == entry->cc);
@@ -171,6 +182,9 @@ GCPP_del_connection (struct CadetPeerPath *path,
static void
path_destroy (struct CadetPeerPath *path)
{
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Destroying path %s\n",
+ GCPP_2s (path));
GNUNET_assert (0 ==
GNUNET_CONTAINER_multipeermap_size (path->connections));
GNUNET_CONTAINER_multipeermap_destroy (path->connections);
@@ -191,6 +205,9 @@ GCPP_release (struct CadetPeerPath *path)
{
struct CadetPeerPathEntry *entry;
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Owner releases path %s\n",
+ GCPP_2s (path));
path->hn = NULL;
entry = &path->entries[path->entries_length - 1];
while (1)
@@ -360,6 +377,9 @@ extend_path (struct CadetPeerPath *path,
entry,
old_len + i);
}
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Extended path %s\n",
+ GCPP_2s (path));
}
@@ -414,11 +434,16 @@ GCPP_try_path_from_dht (const struct GNUNET_PeerIdentity
*get_path,
if (i == get_path_length + put_path_length - 1)
{
/* Existing path includes this one, nothing to do! */
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Path discovered from DHT is already known\n");
return;
}
if (cm_ctx.match->entries_length == i + 1)
{
/* Existing path ends in the middle of new path, extend it! */
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Trying to extend existing path %s by additional links discovered
from DHT\n",
+ GCPP_2s (cm_ctx.match));
extend_path (cm_ctx.match,
&cpath[i],
get_path_length + put_path_length - i,
@@ -447,6 +472,8 @@ GCPP_try_path_from_dht (const struct GNUNET_PeerIdentity
*get_path,
if (NULL == hn)
{
/* None of the peers on the path care about it. */
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Path discovered from DHT is not interesting to us\n");
GNUNET_free (path);
return;
}
@@ -464,6 +491,9 @@ GCPP_try_path_from_dht (const struct GNUNET_PeerIdentity
*get_path,
entry,
i);
}
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Created new path %s based on information from DHT\n",
+ GCPP_2s (path));
}
@@ -503,11 +533,17 @@ GCPP_get_path_from_route (unsigned int path_length,
if (i == path_length - 1)
{
/* Existing path includes this one, return the match! */
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Returning existing path %s as inverse for incoming connection\n",
+ GCPP_2s (cm_ctx.match));
return cm_ctx.match;
}
if (cm_ctx.match->entries_length == i + 1)
{
/* Existing path ends in the middle of new path, extend it! */
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Extending existing path %s to create inverse for incoming
connection\n",
+ GCPP_2s (cm_ctx.match));
extend_path (cm_ctx.match,
&cpath[i],
path_length - i,
@@ -538,6 +574,9 @@ GCPP_get_path_from_route (unsigned int path_length,
path,
path_length - 1,
GNUNET_YES);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Created new path %s to create inverse for incoming connection\n",
+ GCPP_2s (path));
return path;
}
@@ -612,8 +651,8 @@ GCPP_2s (struct CadetPeerPath *path)
GNUNET_asprintf (&s,
"%s %s",
old,
- GCP_2s (GCPP_get_peer_at_offset (path,
- i)));
+ GNUNET_i2s (GCP_get_id (GCPP_get_peer_at_offset (path,
+ i))));
GNUNET_free_non_null (old);
old = s;
}
diff --git a/src/cadet/gnunet-service-cadet-new_peer.c
b/src/cadet/gnunet-service-cadet-new_peer.c
index cb9ea091b..11fd29657 100644
--- a/src/cadet/gnunet-service-cadet-new_peer.c
+++ b/src/cadet/gnunet-service-cadet-new_peer.c
@@ -1,4 +1,3 @@
-
/*
This file is part of GNUnet.
Copyright (C) 2001-2017 GNUnet e.V.
@@ -34,6 +33,7 @@
*/
#include "platform.h"
#include "gnunet_util_lib.h"
+#include "gnunet_hello_lib.h"
#include "gnunet_signatures.h"
#include "gnunet_transport_service.h"
#include "gnunet_ats_service.h"
@@ -232,9 +232,13 @@ struct CadetPeer
const char *
GCP_2s (const struct CadetPeer *peer)
{
- if (NULL == peer)
- return "PEER(NULL)";
- return GNUNET_i2s (&peer->pid);
+ static char buf[64];
+
+ GNUNET_snprintf (buf,
+ sizeof (buf),
+ "P(%s)",
+ GNUNET_i2s (&peer->pid));
+ return buf;
}
@@ -248,6 +252,9 @@ destroy_peer (void *cls)
{
struct CadetPeer *cp = cls;
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Destroying state about peer %s\n",
+ GCP_2s (cp));
cp->destroy_task = NULL;
GNUNET_assert (NULL == cp->t);
GNUNET_assert (NULL == cp->core_mq);
@@ -299,6 +306,10 @@ void
GCP_set_mq (struct CadetPeer *cp,
struct GNUNET_MQ_Handle *mq)
{
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Message queue for peer %s is now %p\n",
+ GCP_2s (cp),
+ mq);
cp->core_mq = mq;
for (struct GCP_MessageQueueManager *mqm = cp->mqm_head;
@@ -340,6 +351,10 @@ mqm_execute (struct GCP_MessageQueueManager *mqm)
{
struct CadetPeer *cp = mqm->cp;
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Sending to peer %s from MQM %p\n",
+ GCP_2s (cp),
+ mqm);
/* Move entry to the end of the DLL, to be fair. */
if (mqm != cp->mqm_tail)
{
@@ -368,6 +383,9 @@ mqm_send_done (void *cls)
{
struct CadetPeer *cp = cls;
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Sending to peer %s completed\n",
+ GCP_2s (cp));
if (0 == cp->mqm_ready_counter)
return; /* nothing to do */
for (struct GCP_MessageQueueManager *mqm = cp->mqm_head;
@@ -395,6 +413,10 @@ GCP_send (struct GCP_MessageQueueManager *mqm,
{
struct CadetPeer *cp = mqm->cp;
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Queueing message to peer %s in MQM %p\n",
+ GCP_2s (cp),
+ mqm);
GNUNET_assert (NULL != cp->core_mq);
GNUNET_assert (NULL == mqm->env);
GNUNET_MQ_notify_sent (env,
@@ -441,6 +463,8 @@ destroy_iterator_cb (void *cls,
void
GCP_destroy_all_peers ()
{
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Destroying all peers now\n");
GNUNET_CONTAINER_multipeermap_iterate (peers,
&destroy_iterator_cb,
NULL);
@@ -532,6 +556,11 @@ GCP_path_entry_add (struct CadetPeer *cp,
struct CadetPeerPathEntry *entry,
unsigned int off)
{
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Discovered that peer %s is on path %s at offset %u\n",
+ GCP_2s (cp),
+ GCPP_2s (entry->path),
+ off);
if (off >= cp->path_dll_length)
{
unsigned int len = cp->path_dll_length;
@@ -569,6 +598,11 @@ GCP_path_entry_remove (struct CadetPeer *cp,
struct CadetPeerPathEntry *entry,
unsigned int off)
{
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Removing knowledge about peer %s beging on path %s at offset %u\n",
+ GCP_2s (cp),
+ GCPP_2s (entry->path),
+ off);
GNUNET_CONTAINER_DLL_remove (cp->path_heads[off],
cp->path_tails[off],
entry);
@@ -614,9 +648,21 @@ GCP_attach_path (struct CadetPeer *cp,
if ( (DESIRED_CONNECTIONS_PER_TUNNEL > cp->num_paths) &&
(desirability < root_desirability) )
+ {
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Decided to not attach path %p to peer %s due to undesirability\n",
+ GCPP_2s (path),
+ GCP_2s (cp));
return NULL;
+ }
}
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Attaching path %p to peer %s (%s)\n",
+ GCPP_2s (path),
+ GCP_2s (cp),
+ (GNUNET_NO == force) ? "desirable" : "forced");
+
/* Yes, we'd like to add this path, add to our heap */
hn = GNUNET_CONTAINER_heap_insert (cp->path_heap,
(void *) cp,
@@ -662,6 +708,10 @@ GCP_detach_path (struct CadetPeer *cp,
struct CadetPeerPath *path,
struct GNUNET_CONTAINER_HeapNode *hn)
{
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Detatching path %p from peer %s\n",
+ GCPP_2s (path),
+ GCP_2s (cp));
GNUNET_assert (path ==
GNUNET_CONTAINER_heap_remove_node (hn));
}
@@ -677,6 +727,10 @@ void
GCP_add_connection (struct CadetPeer *cp,
struct CadetConnection *cc)
{
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Adding connection %s to peer %s\n",
+ GCC_2s (cc),
+ GCP_2s (cp));
GNUNET_assert (GNUNET_OK ==
GNUNET_CONTAINER_multishortmap_put (cp->connections,
&GCC_get_id
(cc)->connection_of_tunnel,
@@ -695,6 +749,10 @@ void
GCP_remove_connection (struct CadetPeer *cp,
struct CadetConnection *cc)
{
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Removing connection %s from peer %s\n",
+ GCC_2s (cc),
+ GCP_2s (cp));
GNUNET_assert (GNUNET_YES ==
GNUNET_CONTAINER_multishortmap_remove (cp->connections,
&GCC_get_id
(cc)->connection_of_tunnel,
@@ -712,6 +770,12 @@ consider_peer_activate (struct CadetPeer *cp)
{
uint32_t strength;
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Updating peer %s activation state (%u connections)%s%s\n",
+ GCP_2s (cp),
+ GNUNET_CONTAINER_multishortmap_size (cp->connections),
+ (NULL == cp->t) ? "" : " with tunnel",
+ (NULL == cp->core_mq) ? "" : " with CORE link");
if (NULL != cp->destroy_task)
{
/* It's active, do not destory! */
@@ -796,6 +860,9 @@ GCP_get (const struct GNUNET_PeerIdentity *peer_id,
&cp->pid,
cp,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Creating peer %s\n",
+ GCP_2s (cp));
return cp;
}
@@ -960,6 +1027,10 @@ GCP_set_hello (struct CadetPeer *cp,
{
struct GNUNET_HELLO_Message *mrg;
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Got %u byte HELLO for peer %s\n",
+ (unsigned int) GNUNET_HELLO_size (hello),
+ GCP_2s (cp));
if (NULL != cp->hello_offer)
{
GNUNET_TRANSPORT_offer_hello_cancel (cp->hello_offer);
@@ -998,6 +1069,10 @@ void
GCP_drop_tunnel (struct CadetPeer *cp,
struct CadetTunnel *t)
{
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Dropping tunnel %s to peer %s\n",
+ GCT_2s (t),
+ GCP_2s (cp));
GNUNET_assert (cp->t == t);
cp->t = NULL;
consider_peer_destroy (cp);
@@ -1039,6 +1114,10 @@ GCP_request_mq (struct CadetPeer *cp,
GNUNET_CONTAINER_DLL_insert (cp->mqm_head,
cp->mqm_tail,
mqm);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Creating MQM %p for peer %s\n",
+ mqm,
+ GCP_2s (cp));
if (NULL != cp->core_mq)
cb (cb_cls,
GNUNET_YES);
@@ -1058,6 +1137,11 @@ GCP_request_mq_cancel (struct GCP_MessageQueueManager
*mqm,
{
struct CadetPeer *cp = mqm->cp;
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Destroying MQM %p for peer %s%s\n",
+ mqm,
+ GCP_2s (cp),
+ (NULL == last_env) ? "" : " with last ditch transmission");
if (NULL != mqm->env)
GNUNET_MQ_discard (mqm->env);
if (NULL != last_env)
@@ -1088,6 +1172,9 @@ void
GCP_send_ooo (struct CadetPeer *cp,
struct GNUNET_MQ_Envelope *env)
{
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Sending message to %s out of management\n",
+ GCP_2s (cp));
if (NULL == cp->core_mq)
{
GNUNET_MQ_discard (env);
diff --git a/src/cadet/gnunet-service-cadet-new_tunnels.c
b/src/cadet/gnunet-service-cadet-new_tunnels.c
index cad3306cd..299bcc22f 100644
--- a/src/cadet/gnunet-service-cadet-new_tunnels.c
+++ b/src/cadet/gnunet-service-cadet-new_tunnels.c
@@ -405,13 +405,10 @@ GCT_2s (const struct CadetTunnel *t)
{
static char buf[64];
- if (NULL == t)
- return "T(NULL)";
-
GNUNET_snprintf (buf,
sizeof (buf),
"T(%s)",
- GCP_2s (t->destination));
+ GNUNET_i2s (GCP_get_id (t->destination)));
return buf;
}
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [gnunet] 12/19: fix a few off-by-ones, (continued)
- [GNUnet-SVN] [gnunet] 12/19: fix a few off-by-ones, gnunet, 2017/01/22
- [GNUnet-SVN] [gnunet] 02/19: do not run upnpc during tests, produces unnecessary errors if not available, gnunet, 2017/01/22
- [GNUnet-SVN] [gnunet] 16/19: nicer order of LOG statements, gnunet, 2017/01/22
- [GNUnet-SVN] [gnunet] 13/19: properly launch DHT GETs based on need for paths, gnunet, 2017/01/22
- [GNUnet-SVN] [gnunet] 17/19: must delay iteration over paths until later, as we may be right now creating a connection, gnunet, 2017/01/22
- [GNUnet-SVN] [gnunet] 19/19: must not move location of -struct CadetPeerPathEntry- in memory when growing path length as those structs are also referenced from a DLL, gnunet, 2017/01/22
- [GNUnet-SVN] [gnunet] 07/19: introcude GNUNET_i2s2(), gnunet, 2017/01/22
- [GNUnet-SVN] [gnunet] 14/19: fix indentation, gnunet, 2017/01/22
- [GNUnet-SVN] [gnunet] 15/19: minor cleanup, gnunet, 2017/01/22
- [GNUnet-SVN] [gnunet] 09/19: more logging for cadet-core subsystem, gnunet, 2017/01/22
- [GNUnet-SVN] [gnunet] 06/19: improving logging,
gnunet <=