consensus

5 files changed, 75 insertions, 7 deletions

diff --git a/src/consensus/gnunet-consensus-profiler.c b/src/consensus/gnunet-consensus-profiler.c
index a075cc291..143264f21 100644
--- a/src/consensus/gnunet-consensus-profiler.c
+++ b/src/consensus/gnunet-consensus-profiler.c
@@ -86,6 +86,44 @@ controller_cb (void *cls,
 
 
 static void
+statistics_done_db (void *cls,
+                    struct
+                    GNUNET_TESTBED_Operation
+                    *op,
+                    const char *emsg)
+{
+  GNUNET_assert (NULL == emsg);
+  GNUNET_TESTBED_operation_done (op);
+  printf ("statistics done\n");
+  GNUNET_SCHEDULER_shutdown ();
+}
+
+
+/**
+ * Callback function to process statistic values from all peers.
+ *
+ * @param cls closure
+ * @param peer the peer the statistic belong to
+ * @param subsystem name of subsystem that created the statistic
+ * @param name the name of the datum
+ * @param value the current value
+ * @param is_persistent GNUNET_YES if the value is persistent, GNUNET_NO if not
+ * @return GNUNET_OK to continue, GNUNET_SYSERR to abort iteration
+ */
+static int
+statistics_cb (void *cls,
+               const struct GNUNET_TESTBED_Peer *peer,
+               const char *subsystem,
+               const char *name,
+               uint64_t value,
+               int is_persistent)
+{
+  printf ("stat P%u: %s/%s=%lu\n", GNUNET_TESTBED_get_index (peer), subsystem, name, (unsigned long) value);
+  return GNUNET_OK;
+}
+
+
+static void
 destroy (void *cls, const struct GNUNET_SCHEDULER_TaskContext *ctx)
 {
   struct GNUNET_CONSENSUS_Handle *consensus = cls;
@@ -104,7 +142,10 @@ destroy (void *cls, const struct GNUNET_SCHEDULER_TaskContext *ctx)
               i,
               results_for_peer[i],
               num_values);
-    GNUNET_SCHEDULER_shutdown ();
+    GNUNET_TESTBED_get_statistics (num_peers, peers, NULL, NULL,
+                                   statistics_cb,
+                                   statistics_done_db,
+                                   NULL);
   }
 }
 
diff --git a/src/consensus/gnunet-service-consensus.c b/src/consensus/gnunet-service-consensus.c
index 296095f41..da18f816d 100644
--- a/src/consensus/gnunet-service-consensus.c
+++ b/src/consensus/gnunet-service-consensus.c
@@ -33,7 +33,6 @@
 #include "consensus_protocol.h"
 #include "consensus.h"
 
-#define GNUNET_CONSENSUS_ELEMENT_TYPE_USER_MAX 1 // FIXME
 #define ELEMENT_TYPE_CONTESTED_MARKER (GNUNET_CONSENSUS_ELEMENT_TYPE_USER_MAX + 1)
 
 
@@ -808,6 +807,7 @@ rfn_noncontested (struct ReferendumEntry *rfn)
   return ret;
 }
 
+
 static void
 rfn_vote (struct ReferendumEntry *rfn,
           uint16_t voting_peer,
@@ -2259,6 +2259,8 @@ install_step_timeouts (struct ConsensusSession *session)
   /* Given the fully constructed task graph
      with rounds for tasks, we can give the tasks timeouts. */
 
+  // unsigned int max_round;
+
   /* XXX: implement! */
 }
 
diff --git a/src/consensus/test_consensus.conf b/src/consensus/test_consensus.conf
index f8af4aa38..3c30968a9 100644
--- a/src/consensus/test_consensus.conf
+++ b/src/consensus/test_consensus.conf
@@ -1,14 +1,18 @@
-#@INLINE@ ../../contrib/no_forcestart.conf
+[arm]
+RESOURCE_DIAGNOSTICS = resource.log
 
 [PATHS]
 GNUNET_TEST_HOME = /tmp/test-consensus/
 
 [consensus]
-PREFIX = valgrind
+#PREFIX = time -a -o time.out -f real:_%E_user:_%U_sys:_%S
+#PREFIX = time -a -o time.out -f real:_%E_user:_%U_sys:_%S
 OPTIONS = -L INFO
 BINARY = gnunet-service-evil-consensus
 
-EVIL_SPEC = 0;cram;5
+#EVIL_SPEC = 0;cram;5/1;cram;5
+#EVIL_SPEC = 0;cram;5/1;cram;3
+
 
 # Evil behavior: Peer 0 adds 5 random elements when he is the gradecast leader
 # (every peer gets the same element.
@@ -18,11 +22,24 @@ EVIL_SPEC = 0;cram;5
 # (every peer gets different elements).
 #EVIL_SPEC = 0;stuff-different;leader;5
 
-
+[arm]
+RESOURCE_DIAGNOSTICS = resource.log.${PEERID}
 
 [core]
 FORECESTART = YES
 
+[revocation]
+FORECESTART = NO
+
+[fs]
+FORECESTART = NO
+
+[gns]
+FORECESTART = NO
+
+[hostlist]
+FORECESTART = NO
+
 [cadet]
 #PREFIX = valgrind
 
diff --git a/src/include/gnunet_consensus_service.h b/src/include/gnunet_consensus_service.h
index f50e4376f..77607a6e2 100644
--- a/src/include/gnunet_consensus_service.h
+++ b/src/include/gnunet_consensus_service.h
@@ -43,6 +43,14 @@ extern "C"
 
 
 /**
+ * Elements inserted into the consensus set by the client
+ * may not be larger than this constant, since types in
+ * the upper range are used by CONSENSUS internally.
+ */
+#define GNUNET_CONSENSUS_ELEMENT_TYPE_USER_MAX 0xFFF0
+
+
+/**
  * Called when a new element was received from another peer, or an error occured.
  * May deliver duplicate values.
  * Elements given to a consensus operation by the local peer are NOT given
diff --git a/src/set/gnunet-service-set_union_strata_estimator.c b/src/set/gnunet-service-set_union_strata_estimator.c
index 324d9d311..be14d353b 100644
--- a/src/set/gnunet-service-set_union_strata_estimator.c
+++ b/src/set/gnunet-service-set_union_strata_estimator.c
@@ -33,7 +33,7 @@
  * Should we try compressing the strata estimator? This will
  * break compatibility with the 0.10.1-network.
  */
-#define FAIL_10_1_COMPATIBILTIY 0
+#define FAIL_10_1_COMPATIBILTIY 1
 
 
 /**