[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnunet] 62/64: cleanup
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnunet] 62/64: cleanup |
Date: |
Sat, 30 Dec 2017 20:58:47 +0100 |
This is an automated email from the git hooks/post-receive script.
lurchi pushed a commit to branch master
in repository gnunet.
commit 1d6a686ccc73ce02fd6e22decb82425012a82a04
Author: lurchi <address@hidden>
AuthorDate: Sat Dec 30 20:37:01 2017 +0100
cleanup
---
src/psyc/gnunet-service-psyc.c | 30 +++++++++++++-----------------
src/social/social_api.c | 16 ++++------------
src/social/test_social.c | 2 +-
3 files changed, 18 insertions(+), 30 deletions(-)
diff --git a/src/psyc/gnunet-service-psyc.c b/src/psyc/gnunet-service-psyc.c
index 740886423..cf161435a 100644
--- a/src/psyc/gnunet-service-psyc.c
+++ b/src/psyc/gnunet-service-psyc.c
@@ -1188,12 +1188,12 @@ fragment_queue_insert (struct Channel *chn,
else if (GNUNET_MESSAGE_TYPE_PSYC_MESSAGE_METHOD == first_ptype
|| frag_offset == fragq->header_size)
{ /* header is now complete */
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"%p Header of message %" PRIu64 " is complete.\n",
chn,
GNUNET_ntohll (mmsg->message_id));
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"%p Adding message %" PRIu64 " to queue.\n",
chn,
GNUNET_ntohll (mmsg->message_id));
@@ -1201,7 +1201,7 @@ fragment_queue_insert (struct Channel *chn,
}
else
{
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"%p Header of message %" PRIu64 " is NOT complete yet: %"
PRIu64 " != %" PRIu64 "\n",
chn,
GNUNET_ntohll (mmsg->message_id),
@@ -1216,7 +1216,7 @@ fragment_queue_insert (struct Channel *chn,
if (frag_offset == fragq->size)
fragq->state = MSG_FRAG_STATE_END;
else
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"%p Message %" PRIu64 " is NOT complete yet: %" PRIu64 " !=
%" PRIu64 "\n",
chn,
GNUNET_ntohll (mmsg->message_id),
@@ -1271,7 +1271,7 @@ static void
fragment_queue_run (struct Channel *chn, uint64_t msg_id,
struct FragmentQueue *fragq, uint8_t drop)
{
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"%p Running message fragment queue for message %" PRIu64 "
(state: %u).\n",
chn,
msg_id,
@@ -1399,7 +1399,7 @@ store_recv_state_modify_result (void *cls, int64_t result,
static uint64_t
message_queue_run (struct Channel *chn)
{
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"%p Running message queue.\n", chn);
uint64_t n = 0;
uint64_t msg_id;
@@ -1407,7 +1407,7 @@ message_queue_run (struct Channel *chn)
while (GNUNET_YES == GNUNET_CONTAINER_heap_peek2 (chn->recv_msgs, NULL,
&msg_id))
{
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"%p Processing message %" PRIu64 " in queue.\n", chn, msg_id);
struct GNUNET_HashCode msg_id_hash;
hash_key_from_hll (&msg_id_hash, msg_id);
@@ -1417,7 +1417,7 @@ message_queue_run (struct Channel *chn)
if (NULL == fragq || fragq->state <= MSG_FRAG_STATE_HEADER)
{
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"%p No fragq (%p) or header not complete.\n",
chn, fragq);
break;
@@ -1439,7 +1439,7 @@ message_queue_run (struct Channel *chn)
&& (chn->max_message_id != msg_id - 1
&& chn->max_message_id != msg_id))
{
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"%p Out of order message. "
"(%" PRIu64 " != %" PRIu64 " - 1)\n",
chn, chn->max_message_id, msg_id);
@@ -1455,7 +1455,7 @@ message_queue_run (struct Channel *chn)
{
if (msg_id - fragq->state_delta != chn->max_state_message_id)
{
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"%p Out of order stateful message. "
"(%" PRIu64 " - %" PRIu64 " != %" PRIu64 ")\n",
chn, msg_id, fragq->state_delta,
chn->max_state_message_id);
@@ -1501,8 +1501,6 @@ message_queue_run (struct Channel *chn)
static uint64_t
message_queue_drop (struct Channel *chn)
{
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- "%p Dropping message queue.\n", chn);
uint64_t n = 0;
uint64_t msg_id;
while (GNUNET_YES == GNUNET_CONTAINER_heap_peek2 (chn->recv_msgs, NULL,
@@ -2241,12 +2239,10 @@ transmit_message (struct Channel *chn)
static void
master_queue_message (struct Master *mst, struct TransmitMessage *tmit_msg)
{
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "%p master_queue_message()\n", mst);
-
if (GNUNET_MESSAGE_TYPE_PSYC_MESSAGE_METHOD == tmit_msg->first_ptype)
{
tmit_msg->id = ++mst->max_message_id;
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"%p master_queue_message: message_id=%" PRIu64 "\n",
mst, tmit_msg->id);
struct GNUNET_PSYC_MessageMethod *pmeth
@@ -2258,7 +2254,7 @@ master_queue_message (struct Master *mst, struct
TransmitMessage *tmit_msg)
}
else if (pmeth->flags & GNUNET_PSYC_MASTER_TRANSMIT_STATE_MODIFY)
{
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"%p master_queue_message: state_delta=%" PRIu64 "\n",
mst, tmit_msg->id - mst->max_state_message_id);
pmeth->state_delta = GNUNET_htonll (tmit_msg->id
@@ -2267,7 +2263,7 @@ master_queue_message (struct Master *mst, struct
TransmitMessage *tmit_msg)
}
else
{
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"%p master_queue_message: state not modified\n", mst);
pmeth->state_delta = GNUNET_htonll (GNUNET_PSYC_STATE_NOT_MODIFIED);
}
diff --git a/src/social/social_api.c b/src/social/social_api.c
index 48e376404..96ddfe912 100644
--- a/src/social/social_api.c
+++ b/src/social/social_api.c
@@ -397,12 +397,9 @@ guest_cleanup (struct GNUNET_SOCIAL_Guest *gst)
static void
place_cleanup (struct GNUNET_SOCIAL_Place *plc)
{
- struct GNUNET_HashCode place_pub_hash;
-
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- "place_cleanup\n");
-
- GNUNET_CRYPTO_hash (&plc->pub_key, sizeof (plc->pub_key), &place_pub_hash);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "cleaning up place %p\n",
+ plc);
if (NULL != plc->tmit)
{
GNUNET_PSYC_transmit_destroy (plc->tmit);
@@ -433,11 +430,6 @@ place_cleanup (struct GNUNET_SOCIAL_Place *plc)
static void
place_disconnect (struct GNUNET_SOCIAL_Place *plc)
{
- struct GNUNET_HashCode place_pub_hash;
-
- GNUNET_CRYPTO_hash (&plc->pub_key,
- sizeof (plc->pub_key),
- &place_pub_hash);
place_cleanup (plc);
}
@@ -1515,7 +1507,7 @@ GNUNET_SOCIAL_host_announce (struct GNUNET_SOCIAL_Host
*hst,
void *notify_data_cls,
enum GNUNET_SOCIAL_AnnounceFlags flags)
{
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"PSYC_transmit_message for host, method: %s\n",
method_name);
if (GNUNET_OK ==
diff --git a/src/social/test_social.c b/src/social/test_social.c
index 61dbd121c..4d95cf005 100644
--- a/src/social/test_social.c
+++ b/src/social/test_social.c
@@ -359,7 +359,7 @@ host_farewell2 (void *cls,
const struct GNUNET_SOCIAL_Nym *nym,
struct GNUNET_PSYC_Environment *env)
{
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE,
"Nym left the place again.\n");
GNUNET_SCHEDULER_add_now (&schedule_host_leave, NULL);
}
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [gnunet] 46/64: don't shutdown before all members and origin have disconnected, (continued)
- [GNUnet-SVN] [gnunet] 46/64: don't shutdown before all members and origin have disconnected, gnunet, 2017/12/30
- [GNUnet-SVN] [gnunet] 38/64: Merge branch 'fix_social' of gnunet.org:gnunet into fix_social, gnunet, 2017/12/30
- [GNUnet-SVN] [gnunet] 48/64: we have to destroy channels to the origin when cleaning up a member, gnunet, 2017/12/30
- [GNUnet-SVN] [gnunet] 41/64: Merge branch 'fix_social' of gnunet.org:gnunet into fix_social, gnunet, 2017/12/30
- [GNUnet-SVN] [gnunet] 51/64: be more clear about test procedure (use self-explanatory function names), gnunet, 2017/12/30
- [GNUnet-SVN] [gnunet] 57/64: test_social runs into the case GNUNET_YES == grp->is_disconnected, gnunet, 2017/12/30
- [GNUnet-SVN] [gnunet] 49/64: forgot to call GNUNET_SERVICE_client_continue, gnunet, 2017/12/30
- [GNUnet-SVN] [gnunet] 64/64: Merge branch 'fix_social', gnunet, 2017/12/30
- [GNUnet-SVN] [gnunet] 28/64: Merge branch 'fix_social' of gnunet.org:gnunet into fix_social, gnunet, 2017/12/30
- [GNUnet-SVN] [gnunet] 53/64: unified debug output (allows grep OP ID), gnunet, 2017/12/30
- [GNUnet-SVN] [gnunet] 62/64: cleanup,
gnunet <=
- [GNUnet-SVN] [gnunet] 63/64: Revert "tried to print out stacktrace, not working. removed.", gnunet, 2017/12/30