[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r37402 - in gnunet/src: consensus secretsharing
From: |
gnunet |
Subject: |
[GNUnet-SVN] r37402 - in gnunet/src: consensus secretsharing |
Date: |
Mon, 27 Jun 2016 17:03:17 +0200 |
Author: dold
Date: 2016-06-27 17:03:17 +0200 (Mon, 27 Jun 2016)
New Revision: 37402
Modified:
gnunet/src/consensus/gnunet-consensus-profiler.c
gnunet/src/consensus/gnunet-service-consensus.c
gnunet/src/consensus/test_consensus.conf
gnunet/src/secretsharing/gnunet-secretsharing-profiler.c
Log:
fix compiler warnings
Modified: gnunet/src/consensus/gnunet-consensus-profiler.c
===================================================================
--- gnunet/src/consensus/gnunet-consensus-profiler.c 2016-06-27 14:45:28 UTC
(rev 37401)
+++ gnunet/src/consensus/gnunet-consensus-profiler.c 2016-06-27 15:03:17 UTC
(rev 37402)
@@ -98,7 +98,7 @@
static void
-statistics_done_db (void *cls,
+statistics_done_cb (void *cls,
struct
GNUNET_TESTBED_Operation
*op,
@@ -108,6 +108,7 @@
GNUNET_TESTBED_operation_done (op);
if (NULL != statistics_file)
fclose (statistics_file);
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "got statistics, shutting down\n");
GNUNET_SCHEDULER_shutdown ();
}
@@ -162,7 +163,7 @@
statistics_file = fopen (statistics_filename, "w");
GNUNET_TESTBED_get_statistics (num_peers, peers, NULL, NULL,
statistics_cb,
- statistics_done_db,
+ statistics_done_cb,
NULL);
}
}
@@ -182,7 +183,7 @@
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"consensus %d done\n",
- chp - consensus_handles);
+ (int) (chp - consensus_handles));
GNUNET_SCHEDULER_add_now (destroy, *chp);
}
@@ -349,6 +350,8 @@
disconnect_adapter(void *cls, void *op_result)
{
/* FIXME: what to do here? */
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "disconnect adapter called\n");
}
Modified: gnunet/src/consensus/gnunet-service-consensus.c
===================================================================
--- gnunet/src/consensus/gnunet-service-consensus.c 2016-06-27 14:45:28 UTC
(rev 37401)
+++ gnunet/src/consensus/gnunet-service-consensus.c 2016-06-27 15:03:17 UTC
(rev 37402)
@@ -1339,8 +1339,7 @@
case EVILNESS_SLACK:
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"P%u: evil peer: slacking\n",
- session->local_peer_idx,
- evil.num);
+ (unsigned int) session->local_peer_idx);
/* Do nothing. */
break;
case EVILNESS_NONE:
@@ -1671,7 +1670,7 @@
#ifdef GNUNET_EXTRA_LOGGING
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Decreased pending_prereq to %u for step `%s'.\n",
- step->subordinates[i]->pending_prereq,
+ (unsigned int) step->subordinates[i]->pending_prereq,
step->subordinates[i]->debug_name);
#endif
@@ -1706,7 +1705,7 @@
#ifdef GNUNET_EXTRA_LOGGING
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Decreased pending_prereq to %u for step `%s'.\n",
- step->subordinates[i]->pending_prereq,
+ (unsigned int) step->subordinates[i]->pending_prereq,
step->subordinates[i]->debug_name);
#endif
@@ -2699,7 +2698,7 @@
arrange_peers (&p1, &p2, n);
task = ((struct TaskEntry) {
.step = step,
- .key = (struct TaskKey) { PHASE_KIND_GRADECAST_LEADER, p1, p2, rep,
lead},
+ .key = (struct TaskKey) { PHASE_KIND_GRADECAST_LEADER, p1, p2, rep, lead
},
.start = task_start_reconcile,
.cancel = task_cancel_reconcile,
});
@@ -2807,9 +2806,6 @@
uint16_t me = session->local_peer_idx;
- uint16_t p1;
- uint16_t p2;
-
/* The task we're currently setting up. */
struct TaskEntry task;
@@ -2841,6 +2837,9 @@
for (i = 0; i < n; i++)
{
+ uint16_t p1;
+ uint16_t p2;
+
p1 = me;
p2 = i;
arrange_peers (&p1, &p2, n);
@@ -2957,8 +2956,8 @@
session->conclude_deadline = GNUNET_TIME_absolute_ntoh (join_msg->deadline);
session->conclude_start = GNUNET_TIME_absolute_ntoh (join_msg->start);
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "consensus with timeout %ums created\n",
- (GNUNET_TIME_absolute_get_difference (session->conclude_start,
session->conclude_deadline)).rel_value_us / 1000);
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "consensus with timeout %llums
created\n",
+ (long long) (GNUNET_TIME_absolute_get_difference
(session->conclude_start, session->conclude_deadline)).rel_value_us / 1000);
session->local_peer_idx = get_peer_idx (&my_peer, session);
GNUNET_assert (-1 != session->local_peer_idx);
@@ -3173,11 +3172,11 @@
static void
shutdown_task (void *cls)
{
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "shutting down\n");
while (NULL != sessions_head)
destroy_session (sessions_head);
- GNUNET_STATISTICS_destroy (statistics, GNUNET_YES);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "handled shutdown request\n");
+ GNUNET_STATISTICS_destroy (statistics, GNUNET_NO);
}
Modified: gnunet/src/consensus/test_consensus.conf
===================================================================
--- gnunet/src/consensus/test_consensus.conf 2016-06-27 14:45:28 UTC (rev
37401)
+++ gnunet/src/consensus/test_consensus.conf 2016-06-27 15:03:17 UTC (rev
37402)
@@ -12,7 +12,7 @@
[arm]
-RESOURCE_DIAGNOSTICS = resource.log.${PEERID}
+RESOURCE_DIAGNOSTICS = resource.log.${PEERID:-master}
[core]
FORECESTART = YES
Modified: gnunet/src/secretsharing/gnunet-secretsharing-profiler.c
===================================================================
--- gnunet/src/secretsharing/gnunet-secretsharing-profiler.c 2016-06-27
14:45:28 UTC (rev 37401)
+++ gnunet/src/secretsharing/gnunet-secretsharing-profiler.c 2016-06-27
15:03:17 UTC (rev 37402)
@@ -304,7 +304,7 @@
struct GNUNET_SECRETSHARING_Share *my_share,
struct GNUNET_SECRETSHARING_PublicKey *public_key,
unsigned int num_ready_peers,
- struct GNUNET_PeerIdentity *ready_peers)
+ const struct GNUNET_PeerIdentity *ready_peers)
{
struct GNUNET_SECRETSHARING_Session **sp = cls;
unsigned int n = sp - session_handles;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r37402 - in gnunet/src: consensus secretsharing,
gnunet <=