/*
This file is part of GNUnet
- (C) 2012, 2013 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2012, 2013 Christian Grothoff (and other contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
You should have received a copy of the GNU General Public License
along with GNUnet; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
*/
/**
#include "consensus.h"
-/**
- * Log macro that prefixes the local peer and the peer we are in contact with.
- *
- * @param kind log level
- * @param cpi ConsensusPeerInformation of the partner peer
- * @param m log message
- */
-#define LOG_PP(kind, cpi, m,...) GNUNET_log (kind, "P%d for P%d: " m, \
- cpi->session->local_peer_idx, (int) (cpi - cpi->session->info),##__VA_ARGS__)
-
+#define ELEMENT_TYPE_CONTESTED_MARKER (GNUNET_CONSENSUS_ELEMENT_TYPE_USER_MAX + 1)
-/**
- * Number of exponential rounds, used in the exp and completion round.
- */
-#define NUM_EXP_REPETITIONS 4
+enum ReferendumVote
+{
+ /**
+ * Vote that nothing should change.
+ * This option is never voted explicitly.
+ */
+ VOTE_STAY = 0,
+ /**
+ * Vote that an element should be added.
+ */
+ VOTE_ADD = 1,
+ /**
+ * Vote that an element should be removed.
+ */
+ VOTE_REMOVE = 2,
+};
-/* forward declarations */
-/* mutual recursion with struct ConsensusSession */
-struct ConsensusPeerInformation;
+GNUNET_NETWORK_STRUCT_BEGIN
-/* mutual recursion with round_over */
-static void
-subround_over (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
+struct ContestedPayload
+{
+};
/**
- * Describes the current round a consensus session is in.
+ * Tuple of integers that together
+ * identify a task uniquely.
*/
-enum ConsensusRound
-{
+struct TaskKey {
+ /**
+ * A value from 'enum PhaseKind'.
+ */
+ uint16_t kind GNUNET_PACKED;
+
/**
- * Not started the protocol yet.
+ * Number of the first peer
+ * in canonical order.
*/
- CONSENSUS_ROUND_BEGIN=0,
+ int16_t peer1 GNUNET_PACKED;
+
/**
- * Distribution of elements with the exponential scheme.
+ * Number of the second peer in canonical order.
*/
- CONSENSUS_ROUND_EXCHANGE,
+ int16_t peer2 GNUNET_PACKED;
+
/**
- * Collect and distribute missing values.
+ * Repetition of the gradecast phase.
*/
- CONSENSUS_ROUND_COMPLETION,
+ int16_t repetition GNUNET_PACKED;
+
/**
- * Consensus concluded. After timeout and finished communication with client,
- * consensus session will be destroyed.
+ * Leader in the gradecast phase.
+ *
+ * Can be different from both peer1 and peer2.
*/
- CONSENSUS_ROUND_FINISH
+ int16_t leader GNUNET_PACKED;
};
-/**
- * Information about the current round.
- */
-struct RoundInfo
+
+struct SetKey
{
+ int set_kind GNUNET_PACKED;
+ int k1 GNUNET_PACKED;
+ int k2 GNUNET_PACKED;
+};
+
+
+struct SetEntry
+{
+ struct SetKey key;
+ struct GNUNET_SET_Handle *h;
/**
- * The current main round.
- */
- enum ConsensusRound round;
- /**
- * The current exp round repetition, valid if
- * the main round is an exp round.
+ * GNUNET_YES if the set resulted
+ * from applying a referendum with contested
+ * elements.
*/
- uint32_t exp_repetition;
+ int is_contested;
+};
+
+
+struct DiffKey
+{
+ int diff_kind GNUNET_PACKED;
+ int k1 GNUNET_PACKED;
+ int k2 GNUNET_PACKED;
+};
+
+struct RfnKey
+{
+ int rfn_kind GNUNET_PACKED;
+ int k1 GNUNET_PACKED;
+ int k2 GNUNET_PACKED;
+};
+
+
+GNUNET_NETWORK_STRUCT_END
+
+enum PhaseKind
+{
+ PHASE_KIND_ALL_TO_ALL,
+ PHASE_KIND_GRADECAST_LEADER,
+ PHASE_KIND_GRADECAST_ECHO,
+ PHASE_KIND_GRADECAST_ECHO_GRADE,
+ PHASE_KIND_GRADECAST_CONFIRM,
+ PHASE_KIND_GRADECAST_CONFIRM_GRADE,
/**
- * The current exp subround, valid if
- * the main round is an exp round.
+ * Apply a repetition of the all-to-all
+ * gradecast to the current set.
*/
- uint32_t exp_subround;
+ PHASE_KIND_APPLY_REP,
+ PHASE_KIND_FINISH,
+};
+
+
+enum SetKind
+{
+ SET_KIND_NONE = 0,
+ SET_KIND_CURRENT,
+ SET_KIND_LEADER_PROPOSAL,
+ SET_KIND_ECHO_RESULT,
+};
+
+enum DiffKind
+{
+ DIFF_KIND_NONE = 0,
+ DIFF_KIND_LEADER_PROPOSAL,
+ DIFF_KIND_LEADER_CONSENSUS,
+ DIFF_KIND_GRADECAST_RESULT,
+};
+
+enum RfnKind
+{
+ RFN_KIND_NONE = 0,
+ RFN_KIND_ECHO,
+ RFN_KIND_CONFIRM,
+ RFN_KIND_GRADECAST_RESULT
+};
+
+
+struct SetOpCls
+{
+ struct SetKey input_set;
+
+ struct SetKey output_set;
+ struct RfnKey output_rfn;
+ struct DiffKey output_diff;
+
+ int do_not_remove;
+
+ int transceive_contested;
+
+ struct GNUNET_SET_OperationHandle *op;
};
+struct FinishCls
+{
+ struct SetKey input_set;
+};
+
/**
- * A consensus session consists of one local client and the remote authorities.
+ * Closure for both @a start_task
+ * and @a cancel_task.
*/
-struct ConsensusSession
+union TaskFuncCls
+{
+ struct SetOpCls setop;
+ struct FinishCls finish;
+};
+
+struct TaskEntry;
+
+typedef void (*TaskFunc) (struct TaskEntry *task);
+
+/*
+ * Node in the consensus task graph.
+ */
+struct TaskEntry
+{
+ struct TaskKey key;
+
+ struct Step *step;
+
+ int is_started;
+
+ int is_finished;
+
+ TaskFunc start;
+ TaskFunc cancel;
+
+ union TaskFuncCls cls;
+};
+
+
+struct Step
{
/**
- * Consensus sessions are kept in a DLL.
+ * All steps of one session are in a
+ * linked list for easier deallocation.
*/
- struct ConsensusSession *next;
+ struct Step *prev;
/**
- * Consensus sessions are kept in a DLL.
+ * All steps of one session are in a
+ * linked list for easier deallocation.
*/
- struct ConsensusSession *prev;
+ struct Step *next;
- /**
- * Global consensus identification, computed
- * from the session id and participating authorities.
- */
- struct GNUNET_HashCode global_id;
+ struct ConsensusSession *session;
- /**
- * Client that inhabits the session
- */
- struct GNUNET_SERVER_Client *client;
+ struct TaskEntry **tasks;
+ unsigned int tasks_len;
+ unsigned int tasks_cap;
- /**
- * Queued messages to the client.
+ unsigned int finished_tasks;
+
+ /*
+ * Tasks that have this task as dependency.
+ *
+ * We store pointers to subordinates rather
+ * than to prerequisites since it makes
+ * tracking the readiness of a task easier.
*/
- struct GNUNET_MQ_Handle *client_mq;
+ struct Step **subordinates;
+ unsigned int subordinates_len;
+ unsigned int subordinates_cap;
/**
- * Time when the conclusion of the consensus should begin.
+ * Counter for the prerequisites of
+ * this step.
*/
- struct GNUNET_TIME_Absolute conclude_start;
+ size_t pending_prereq;
- /**
- * Timeout for all rounds together, single rounds will schedule a timeout task
- * with a fraction of the conclude timeout.
- * Only valid once the current round is not CONSENSUS_ROUND_BEGIN.
+ /*
+ * Task that will run this step despite
+ * any pending prerequisites.
*/
- struct GNUNET_TIME_Absolute conclude_deadline;
+ struct GNUNET_SCHEDULER_Task *timeout_task;
- /**
- * Timeout task identifier for the current round or subround.
+ unsigned int is_running;
+
+ unsigned int is_finished;
+
+ /*
+ * Synchrony round of the task.
+ * Determines the deadline for the task.
*/
- GNUNET_SCHEDULER_TaskIdentifier round_timeout_tid;
+ unsigned int round;
/**
- * Number of other peers in the consensus.
+ * Human-readable name for
+ * the task, used for debugging.
*/
- unsigned int num_peers;
+ char *debug_name;
+};
- /**
- * Information about the other peers,
- * their state, etc.
+
+struct RfnElementInfo
+{
+ const struct GNUNET_SET_Element *element;
+
+ /*
+ * GNUNET_YES if the peer votes for the proposal.
*/
- struct ConsensusPeerInformation *info;
+ int *votes;
/**
- * Index of the local peer in the peers array
+ * Proposal for this element,
+ * can only be VOTE_ADD or VOTE_REMOVE.
*/
- unsigned int local_peer_idx;
+ enum ReferendumVote proposal;
+};
- /**
- * Current round
+
+struct ReferendumEntry
+{
+ struct RfnKey key;
+
+ /*
+ * Elements where there is at least one proposed change.
+ *
+ * Maps the hash of the GNUNET_SET_Element
+ * to 'struct RfnElementInfo'.
*/
- enum ConsensusRound current_round;
+ struct GNUNET_CONTAINER_MultiHashMap *rfn_elements;
+
+ unsigned int num_peers;
/**
- * Permutation of peers for the current round,
+ * Stores, for every peer in the session,
+ * whether the peer finished the whole referendum.
+ *
+ * Votes from peers are only counted if they're
+ * marked as commited (#GNUNET_YES) in the referendum.
+ *
+ * Otherwise (#GNUNET_NO), the requested changes are
+ * not counted for majority votes or thresholds.
*/
- uint32_t *shuffle;
+ int *peer_commited;
+
/**
- * Inverse permutation of peers for the current round,
+ * Contestation state of the peer. If a peer is contested, the values it
+ * contributed are still counted for applying changes, but the grading is
+ * affected.
*/
- uint32_t *shuffle_inv;
+ int *peer_contested;
+};
+
+
+struct DiffElementInfo
+{
+ const struct GNUNET_SET_Element *element;
/**
- * Current round of the exponential scheme.
+ * Positive weight for 'add', negative
+ * weights for 'remove'.
*/
- uint32_t exp_repetition;
+ int weight;
+};
+
+
+/**
+ * Weighted diff.
+ */
+struct DiffEntry
+{
+ struct DiffKey key;
+ struct GNUNET_CONTAINER_MultiHashMap *changes;
+};
+
+
+/**
+ * A consensus session consists of one local client and the remote authorities.
+ */
+struct ConsensusSession
+{
/**
- * Current sub-round of the exponential scheme.
+ * Consensus sessions are kept in a DLL.
*/
- uint32_t exp_subround;
+ struct ConsensusSession *next;
/**
- * The partner for the current exp-round.
- * The local peer will initiate the set reconciliation with the
- * outgoing peer.
+ * Consensus sessions are kept in a DLL.
*/
- struct ConsensusPeerInformation *partner_outgoing;
+ struct ConsensusSession *prev;
+
+ unsigned int num_client_insert_pending;
+
+ struct GNUNET_CONTAINER_MultiHashMap *setmap;
+ struct GNUNET_CONTAINER_MultiHashMap *rfnmap;
+ struct GNUNET_CONTAINER_MultiHashMap *diffmap;
/**
- * The partner for the current exp-round
- * The incoming peer will initiate the set reconciliation with
- * the incoming peer.
+ * Array of peers with length 'num_peers'.
+ */
+ int *peers_blacklisted;
+
+ /*
+ * Mapping from (hashed) TaskKey to TaskEntry.
+ *
+ * We map the application_id for a round to the task that should be
+ * executed, so we don't have to go through all task whenever we get
+ * an incoming set op request.
*/
- struct ConsensusPeerInformation *partner_incoming;
+ struct GNUNET_CONTAINER_MultiHashMap *taskmap;
+
+ struct Step *steps_head;
+ struct Step *steps_tail;
+
+ int conclude_started;
+
+ int conclude_done;
/**
- * The consensus set of this session.
- */
- struct GNUNET_SET_Handle *element_set;
+ * Global consensus identification, computed
+ * from the session id and participating authorities.
+ */
+ struct GNUNET_HashCode global_id;
/**
- * Listener for requests from other peers.
- * Uses the session's global id as app id.
+ * Client that inhabits the session
*/
- struct GNUNET_SET_ListenHandle *set_listener;
-};
-
+ struct GNUNET_SERVER_Client *client;
-/**
- * Information about a peer that is in a consensus session.
- */
-struct ConsensusPeerInformation
-{
/**
- * Peer identitty of the peer in the consensus session
+ * Queued messages to the client.
*/
- struct GNUNET_PeerIdentity peer_id;
+ struct GNUNET_MQ_Handle *client_mq;
/**
- * Back-reference to the consensus session,
- * to that ConsensusPeerInformation can be used as a closure
+ * Time when the conclusion of the consensus should begin.
*/
- struct ConsensusSession *session;
+ struct GNUNET_TIME_Absolute conclude_start;
/**
- * Have we finished the set operation for this (sub-)round?
+ * Timeout for all rounds together, single rounds will schedule a timeout task
+ * with a fraction of the conclude timeout.
+ * Only valid once the current round is not CONSENSUS_ROUND_BEGIN.
*/
- int set_op_finished;
+ struct GNUNET_TIME_Absolute conclude_deadline;
+
+ struct GNUNET_PeerIdentity *peers;
/**
- * Set operation we are currently executing with this peer.
+ * Number of other peers in the consensus.
*/
- struct GNUNET_SET_OperationHandle *set_op;
+ unsigned int num_peers;
/**
- * Set operation we are planning on executing with this peer.
+ * Index of the local peer in the peers array
*/
- struct GNUNET_SET_OperationHandle *delayed_set_op;
+ unsigned int local_peer_idx;
/**
- * Info about the round of the delayed set operation.
+ * Listener for requests from other peers.
+ * Uses the session's global id as app id.
*/
- struct RoundInfo delayed_round_info;
+ struct GNUNET_SET_ListenHandle *set_listener;
};
-
/**
* Linked list of sessions this peer participates in.
*/
static struct GNUNET_PeerIdentity my_peer;
-/**
- * Check if the current subround has finished.
- * Must only be called when an exp-round is the current round.
- *
- * @param session session to check for exp-round completion
- * @return GNUNET_YES if the subround has finished,
- * GNUNET_NO if not
- */
-static int
-have_exp_subround_finished (const struct ConsensusSession *session)
+static void
+finish_task (struct TaskEntry *task);
+
+static void
+run_ready_steps (struct ConsensusSession *session);
+
+static const char *
+phasename (uint16_t phase)
+{
+ switch (phase)
+ {
+ case PHASE_KIND_ALL_TO_ALL: return "ALL_TO_ALL";
+ case PHASE_KIND_FINISH: return "FINISH";
+ case PHASE_KIND_GRADECAST_LEADER: return "GRADECAST_LEADER";
+ case PHASE_KIND_GRADECAST_ECHO: return "GRADECAST_ECHO";
+ case PHASE_KIND_GRADECAST_ECHO_GRADE: return "GRADECAST_ECHO_GRADE";
+ case PHASE_KIND_GRADECAST_CONFIRM: return "GRADECAST_CONFIRM";
+ case PHASE_KIND_GRADECAST_CONFIRM_GRADE: return "GRADECAST_CONFIRM_GRADE";
+ case PHASE_KIND_APPLY_REP: return "APPLY_REP";
+ default: return "(unknown)";
+ }
+}
+
+
+static const char *
+setname (uint16_t kind)
+{
+ switch (kind)
+ {
+ case SET_KIND_CURRENT: return "CURRENT";
+ case SET_KIND_LEADER_PROPOSAL: return "LEADER_PROPOSAL";
+ case SET_KIND_NONE: return "NONE";
+ default: return "(unknown)";
+ }
+}
+
+static const char *
+rfnname (uint16_t kind)
+{
+ switch (kind)
+ {
+ case RFN_KIND_NONE: return "NONE";
+ case RFN_KIND_ECHO: return "ECHO";
+ case RFN_KIND_CONFIRM: return "CONFIRM";
+ default: return "(unknown)";
+ }
+}
+
+static const char *
+diffname (uint16_t kind)
+{
+ switch (kind)
+ {
+ case DIFF_KIND_NONE: return "NONE";
+ case DIFF_KIND_LEADER_CONSENSUS: return "LEADER_CONSENSUS";
+ case DIFF_KIND_GRADECAST_RESULT: return "GRADECAST_RESULT";
+ case DIFF_KIND_LEADER_PROPOSAL: return "LEADER_PROPOSAL";
+ default: return "(unknown)";
+ }
+}
+
+#ifdef GNUNET_EXTRA_LOGGING
+
+
+static const char *
+debug_str_element (const struct GNUNET_SET_Element *el)
+{
+ struct GNUNET_HashCode hash;
+
+ GNUNET_SET_element_hash (el, &hash);
+
+ return GNUNET_h2s (&hash);
+}
+
+static const char *
+debug_str_task_key (struct TaskKey *tk)
+{
+ static char buf[256];
+
+ snprintf (buf, sizeof (buf),
+ "TaskKey kind=%s, p1=%d, p2=%d, l=%d, rep=%d",
+ phasename (tk->kind), tk->peer1, tk->peer2,
+ tk->leader, tk->repetition);
+
+ return buf;
+}
+
+static const char *
+debug_str_diff_key (struct DiffKey *dk)
+{
+ static char buf[256];
+
+ snprintf (buf, sizeof (buf),
+ "DiffKey kind=%s, k1=%d, k2=%d",
+ diffname (dk->diff_kind), dk->k1, dk->k2);
+
+ return buf;
+}
+
+static const char *
+debug_str_set_key (const struct SetKey *sk)
+{
+ static char buf[256];
+
+ snprintf (buf, sizeof (buf),
+ "SetKey kind=%s, k1=%d, k2=%d",
+ setname (sk->set_kind), sk->k1, sk->k2);
+
+ return buf;
+}
+
+
+static const char *
+debug_str_rfn_key (const struct RfnKey *rk)
{
- int not_finished;
+ static char buf[256];
- GNUNET_assert (CONSENSUS_ROUND_EXCHANGE == session->current_round);
+ snprintf (buf, sizeof (buf),
+ "RfnKey kind=%s, k1=%d, k2=%d",
+ rfnname (rk->rfn_kind), rk->k1, rk->k2);
- not_finished = 0;
- if ( (NULL != session->partner_outgoing) &&
- (GNUNET_NO == session->partner_outgoing->set_op_finished) )
- not_finished++;
- if ( (NULL != session->partner_incoming) &&
- (GNUNET_NO == session->partner_incoming->set_op_finished) )
- not_finished++;
- if (0 == not_finished)
- return GNUNET_YES;
- return GNUNET_NO;
+ return buf;
}
+#endif /* GNUNET_EXTRA_LOGGING */
+
/**
* Destroy a session, free all resources associated with it.
static void
destroy_session (struct ConsensusSession *session)
{
- int i;
-
GNUNET_CONTAINER_DLL_remove (sessions_head, sessions_tail, session);
- if (NULL != session->element_set)
- {
- GNUNET_SET_destroy (session->element_set);
- session->element_set = NULL;
- }
if (NULL != session->set_listener)
{
GNUNET_SET_listen_cancel (session->set_listener);
{
GNUNET_MQ_destroy (session->client_mq);
session->client_mq = NULL;
+ /* The MQ cleanup will also disconnect the underlying client. */
+ session->client = NULL;
}
if (NULL != session->client)
{
GNUNET_SERVER_client_disconnect (session->client);
session->client = NULL;
}
- if (NULL != session->shuffle)
- {
- GNUNET_free (session->shuffle);
- session->shuffle = NULL;
- }
- if (NULL != session->shuffle_inv)
- {
- GNUNET_free (session->shuffle_inv);
- session->shuffle_inv = NULL;
- }
- if (NULL != session->info)
- {
- for (i = 0; i < session->num_peers; i++)
- {
- struct ConsensusPeerInformation *cpi;
- cpi = &session->info[i];
- if (NULL != cpi->set_op)
- {
- GNUNET_SET_operation_cancel (cpi->set_op);
- cpi->set_op = NULL;
- }
- }
- GNUNET_free (session->info);
- session->info = NULL;
- }
GNUNET_free (session);
}
/**
- * Iterator for set elements.
+ * Send the final result set of the consensus to the client, element by
+ * element.
*
* @param cls closure
* @param element the current element, NULL if all elements have been
* iterated over
- * @return GNUNET_YES to continue iterating, GNUNET_NO to stop.
+ * @return #GNUNET_YES to continue iterating, #GNUNET_NO to stop.
*/
static int
send_to_client_iter (void *cls,
const struct GNUNET_SET_Element *element)
{
- struct ConsensusSession *session = cls;
+ struct TaskEntry *task = (struct TaskEntry *) cls;
+ struct ConsensusSession *session = task->step->session;
struct GNUNET_MQ_Envelope *ev;
if (NULL != element)
{
struct GNUNET_CONSENSUS_ElementMessage *m;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "P%d: got element for client\n",
- session->local_peer_idx);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "P%d: sending element %s to client\n",
+ session->local_peer_idx,
+ debug_str_element (element));
- ev = GNUNET_MQ_msg_extra (m, element->size, GNUNET_MESSAGE_TYPE_CONSENSUS_CLIENT_RECEIVED_ELEMENT);
- m->element_type = htons (element->type);
+ ev = GNUNET_MQ_msg_extra (m, element->size,
+ GNUNET_MESSAGE_TYPE_CONSENSUS_CLIENT_RECEIVED_ELEMENT);
+ m->element_type = htons (element->element_type);
memcpy (&m[1], element->data, element->size);
GNUNET_MQ_send (session->client_mq, ev);
}
else
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "P%d: finished iterating elements for client\n",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "P%d: finished iterating elements for client\n",
session->local_peer_idx);
ev = GNUNET_MQ_msg_header (GNUNET_MESSAGE_TYPE_CONSENSUS_CLIENT_CONCLUDE_DONE);
GNUNET_MQ_send (session->client_mq, ev);
}
+static struct SetEntry *
+lookup_set (struct ConsensusSession *session, struct SetKey *key)
+{
+ struct GNUNET_HashCode hash;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "P%u: looking up set {%s}\n",
+ session->local_peer_idx,
+ debug_str_set_key (key));
+
+ GNUNET_assert (SET_KIND_NONE != key->set_kind);
+ GNUNET_CRYPTO_hash (key, sizeof (struct SetKey), &hash);
+ return GNUNET_CONTAINER_multihashmap_get (session->setmap, &hash);
+}
+
+
+static struct DiffEntry *
+lookup_diff (struct ConsensusSession *session, struct DiffKey *key)
+{
+ struct GNUNET_HashCode hash;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "P%u: looking up diff {%s}\n",
+ session->local_peer_idx,
+ debug_str_diff_key (key));
+
+ GNUNET_assert (DIFF_KIND_NONE != key->diff_kind);
+ GNUNET_CRYPTO_hash (key, sizeof (struct DiffKey), &hash);
+ return GNUNET_CONTAINER_multihashmap_get (session->diffmap, &hash);
+}
+
+
+static struct ReferendumEntry *
+lookup_rfn (struct ConsensusSession *session, struct RfnKey *key)
+{
+ struct GNUNET_HashCode hash;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "P%u: looking up rfn {%s}\n",
+ session->local_peer_idx,
+ debug_str_rfn_key (key));
+
+ GNUNET_assert (RFN_KIND_NONE != key->rfn_kind);
+ GNUNET_CRYPTO_hash (key, sizeof (struct RfnKey), &hash);
+ return GNUNET_CONTAINER_multihashmap_get (session->rfnmap, &hash);
+}
+
+
+static void
+diff_insert (struct DiffEntry *diff,
+ int weight,
+ const struct GNUNET_SET_Element *element)
+{
+ struct DiffElementInfo *di;
+ struct GNUNET_HashCode hash;
+
+ GNUNET_assert ( (1 == weight) || (-1 == weight));
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "diff_insert with element size %u\n",
+ element->size);
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "hashing element\n");
+
+ GNUNET_SET_element_hash (element, &hash);
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "hashed element\n");
+
+ di = GNUNET_CONTAINER_multihashmap_get (diff->changes, &hash);
+
+ if (NULL == di)
+ {
+ di = GNUNET_new (struct DiffElementInfo);
+ di->element = GNUNET_SET_element_dup (element);
+ GNUNET_assert (GNUNET_OK ==
+ GNUNET_CONTAINER_multihashmap_put (diff->changes,
+ &hash, di,
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST));
+ }
+
+ di->weight = weight;
+}
+
+
+static void
+rfn_commit (struct ReferendumEntry *rfn,
+ uint16_t commit_peer)
+{
+ GNUNET_assert (commit_peer < rfn->num_peers);
+
+ rfn->peer_commited[commit_peer] = GNUNET_YES;
+}
+
+
+static void
+rfn_contest (struct ReferendumEntry *rfn,
+ uint16_t contested_peer)
+{
+ GNUNET_assert (contested_peer < rfn->num_peers);
+
+ rfn->peer_contested[contested_peer] = GNUNET_YES;
+}
+
+
+static uint16_t
+rfn_noncontested (struct ReferendumEntry *rfn)
+{
+ uint16_t i;
+ uint16_t ret;
+
+ ret = 0;
+ for (i = 0; i < rfn->num_peers; i++)
+ if ( (GNUNET_YES == rfn->peer_commited[i]) && (GNUNET_NO == rfn->peer_contested[i]) )
+ ret++;
+
+ return ret;
+}
+
+static void
+rfn_vote (struct ReferendumEntry *rfn,
+ uint16_t voting_peer,
+ enum ReferendumVote vote,
+ const struct GNUNET_SET_Element *element)
+{
+ struct RfnElementInfo *ri;
+ struct GNUNET_HashCode hash;
+
+ GNUNET_assert (voting_peer < rfn->num_peers);
+
+ /* Explicit voting only makes sense with VOTE_ADD or VOTE_REMOTE,
+ since VOTE_KEEP is implicit in not voting. */
+ GNUNET_assert ( (VOTE_ADD == vote) || (VOTE_REMOVE == vote) );
+
+ GNUNET_SET_element_hash (element, &hash);
+ ri = GNUNET_CONTAINER_multihashmap_get (rfn->rfn_elements, &hash);
+
+ if (NULL == ri)
+ {
+ ri = GNUNET_new (struct RfnElementInfo);
+ ri->element = GNUNET_SET_element_dup (element);
+ ri->votes = GNUNET_new_array (rfn->num_peers, int);
+ GNUNET_assert (GNUNET_OK ==
+ GNUNET_CONTAINER_multihashmap_put (rfn->rfn_elements,
+ &hash, ri,
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST));
+ }
+
+ ri->votes[voting_peer] = GNUNET_YES;
+ ri->proposal = vote;
+}
+
+
+uint16_t
+task_other_peer (struct TaskEntry *task)
+{
+ uint16_t me = task->step->session->local_peer_idx;
+ if (task->key.peer1 == me)
+ return task->key.peer2;
+ return task->key.peer1;
+}
+
+
/**
- * Start the next round.
- * This function can be invoked as a timeout task, or called manually (tc will be NULL then).
+ * Callback for set operation results. Called for each element
+ * in the result set.
*
- * @param cls the session
- * @param tc task context, for when this task is invoked by the scheduler,
- * NULL if invoked for another reason
+ * @param cls closure
+ * @param element a result element, only valid if status is GNUNET_SET_STATUS_OK
+ * @param status see enum GNUNET_SET_Status
*/
static void
-round_over (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+set_result_cb (void *cls,
+ const struct GNUNET_SET_Element *element,
+ enum GNUNET_SET_Status status)
{
- struct ConsensusSession *session;
- unsigned int i;
- int res;
+ struct TaskEntry *task = cls;
+ struct ConsensusSession *session = task->step->session;
+ struct SetEntry *output_set = NULL;
+ struct DiffEntry *output_diff = NULL;
+ struct ReferendumEntry *output_rfn = NULL;
+ unsigned int other_idx;
+ struct SetOpCls *setop;
+
+ setop = &task->cls.setop;
+
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "P%u: got set result for {%s}, status %u\n",
+ session->local_peer_idx,
+ debug_str_task_key (&task->key),
+ status);
+
+ if (GNUNET_NO == task->is_started)
+ {
+ GNUNET_break_op (0);
+ return;
+ }
- /* don't kick off next round if we're shutting down */
- if ((NULL != tc) && (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
+ if (GNUNET_YES == task->is_finished)
+ {
+ GNUNET_break_op (0);
return;
+ }
- session = cls;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "P%d: round over\n", session->local_peer_idx);
+ other_idx = task_other_peer (task);
- if (tc != NULL)
- session->round_timeout_tid = GNUNET_SCHEDULER_NO_TASK;
+ if (SET_KIND_NONE != setop->output_set.set_kind)
+ {
+ output_set = lookup_set (session, &setop->output_set);
+ GNUNET_assert (NULL != output_set);
+ }
- if (session->round_timeout_tid != GNUNET_SCHEDULER_NO_TASK)
+ if (DIFF_KIND_NONE != setop->output_diff.diff_kind)
{
- GNUNET_SCHEDULER_cancel (session->round_timeout_tid);
- session->round_timeout_tid = GNUNET_SCHEDULER_NO_TASK;
+ output_diff = lookup_diff (session, &setop->output_diff);
+ GNUNET_assert (NULL != output_diff);
}
- for (i = 0; i < session->num_peers; i++)
+ if (RFN_KIND_NONE != setop->output_rfn.rfn_kind)
{
- if (NULL != session->info[i].set_op)
+ output_rfn = lookup_rfn (session, &setop->output_rfn);
+ GNUNET_assert (NULL != output_rfn);
+ }
+
+ if (GNUNET_YES == session->peers_blacklisted[other_idx])
+ {
+ /* Peer might have been blacklisted
+ by a gradecast running in parallel, ignore elements from now */
+ if (GNUNET_SET_STATUS_ADD_LOCAL == status)
+ return;
+ if (GNUNET_SET_STATUS_ADD_REMOTE == status)
+ return;
+ }
+
+ if ( (GNUNET_SET_STATUS_ADD_LOCAL == status) || (GNUNET_SET_STATUS_ADD_REMOTE == status) )
+ {
+ if ( (GNUNET_YES == setop->transceive_contested) && (ELEMENT_TYPE_CONTESTED_MARKER == element->element_type) )
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "P%d: canceling stray op with P%d\n",
- session->local_peer_idx, i);
- GNUNET_SET_operation_cancel (session->info[i].set_op);
- session->info[i].set_op = NULL;
+ GNUNET_assert (NULL != output_rfn);
+ rfn_contest (output_rfn, task_other_peer (task));
+ return;
}
- /* we're in the new round, nothing finished yet */
- session->info[i].set_op_finished = GNUNET_NO;
}
- switch (session->current_round)
+ switch (status)
{
- case CONSENSUS_ROUND_BEGIN:
- session->current_round = CONSENSUS_ROUND_EXCHANGE;
- session->exp_repetition = 0;
- subround_over (session, NULL);
+ case GNUNET_SET_STATUS_ADD_LOCAL:
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Adding element in Task {%s}\n",
+ debug_str_task_key (&task->key));
+ if (NULL != output_set)
+ {
+ // FIXME: record pending adds, use callback
+ GNUNET_SET_add_element (output_set->h,
+ element,
+ NULL,
+ NULL);
+#ifdef GNUNET_EXTRA_LOGGING
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "P%u: adding element %s into set {%s} of task {%s}\n",
+ session->local_peer_idx,
+ debug_str_element (element),
+ debug_str_set_key (&setop->output_set),
+ debug_str_task_key (&task->key));
+#endif
+ }
+ if (NULL != output_diff)
+ {
+ diff_insert (output_diff, 1, element);
+#ifdef GNUNET_EXTRA_LOGGING
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "P%u: adding element %s into diff {%s} of task {%s}\n",
+ session->local_peer_idx,
+ debug_str_element (element),
+ debug_str_diff_key (&setop->output_diff),
+ debug_str_task_key (&task->key));
+#endif
+ }
+ if (NULL != output_rfn)
+ {
+ rfn_vote (output_rfn, task_other_peer (task), VOTE_ADD, element);
+#ifdef GNUNET_EXTRA_LOGGING
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "P%u: adding element %s into rfn {%s} of task {%s}\n",
+ session->local_peer_idx,
+ debug_str_element (element),
+ debug_str_rfn_key (&setop->output_rfn),
+ debug_str_task_key (&task->key));
+#endif
+ }
+ // XXX: add result to structures in task
break;
- case CONSENSUS_ROUND_EXCHANGE:
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "P%d: finished, sending elements to client\n",
- session->local_peer_idx);
- session->current_round = CONSENSUS_ROUND_FINISH;
- res = GNUNET_SET_iterate (session->element_set, send_to_client_iter, session);
- if (GNUNET_SYSERR == res)
+ case GNUNET_SET_STATUS_ADD_REMOTE:
+ if (GNUNET_YES == setop->do_not_remove)
+ break;
+ if (ELEMENT_TYPE_CONTESTED_MARKER == element->element_type)
+ break;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Removing element in Task {%s}\n",
+ debug_str_task_key (&task->key));
+ if (NULL != output_set)
+ {
+ // FIXME: record pending adds, use callback
+ GNUNET_SET_remove_element (output_set->h,
+ element,
+ NULL,
+ NULL);
+#ifdef GNUNET_EXTRA_LOGGING
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "P%u: removing element %s from set {%s} of task {%s}\n",
+ session->local_peer_idx,
+ debug_str_element (element),
+ debug_str_set_key (&setop->output_set),
+ debug_str_task_key (&task->key));
+#endif
+ }
+ if (NULL != output_diff)
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "can't iterate set: set invalid\n");
+ diff_insert (output_diff, -1, element);
+#ifdef GNUNET_EXTRA_LOGGING
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "P%u: removing element %s from diff {%s} of task {%s}\n",
+ session->local_peer_idx,
+ debug_str_element (element),
+ debug_str_diff_key (&setop->output_diff),
+ debug_str_task_key (&task->key));
+#endif
}
- else if (GNUNET_NO == res)
+ if (NULL != output_rfn)
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "can't iterate set: iterator already active\n");
+ rfn_vote (output_rfn, task_other_peer (task), VOTE_REMOVE, element);
+#ifdef GNUNET_EXTRA_LOGGING
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "P%u: removing element %s from rfn {%s} of task {%s}\n",
+ session->local_peer_idx,
+ debug_str_element (element),
+ debug_str_rfn_key (&setop->output_rfn),
+ debug_str_task_key (&task->key));
+#endif
}
break;
+ case GNUNET_SET_STATUS_DONE:
+ // XXX: check first if any changes to the underlying
+ // set are still pending
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Finishing setop in Task {%s}\n",
+ debug_str_task_key (&task->key));
+ if (NULL != output_rfn)
+ {
+ rfn_commit (output_rfn, task_other_peer (task));
+ }
+ finish_task (task);
+ break;
+ case GNUNET_SET_STATUS_FAILURE:
+ // XXX: cleanup
+ GNUNET_break_op (0);
+ finish_task (task);
+ return;
default:
+ /* not reached */
GNUNET_assert (0);
}
}
+#ifdef EVIL
+
+enum Evilness
+{
+ EVILNESS_NONE,
+ EVILNESS_CRAM,
+ EVILNESS_SLACK,
+};
-/**
- * Create a new permutation for the session's peers in session->shuffle.
- * Uses a Fisher-Yates shuffle with pseudo-randomness coming from
- * both the global session id and the current round index.
- *
- * @param session the session to create the new permutation for
- */
static void
-shuffle (struct ConsensusSession *session)
+get_evilness (struct ConsensusSession *session, enum Evilness *ret_type, unsigned int *ret_num)
{
- uint32_t i;
- uint32_t randomness[session->num_peers-1];
+ char *evil_spec;
+ char *field;
+ char *evil_type_str = NULL;
- if (NULL == session->shuffle)
- session->shuffle = GNUNET_malloc (session->num_peers * sizeof (*session->shuffle));
- if (NULL == session->shuffle_inv)
- session->shuffle_inv = GNUNET_malloc (session->num_peers * sizeof (*session->shuffle_inv));
+ if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_string (cfg, "consensus", "EVIL_SPEC", &evil_spec))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "P%u: no evilness\n",
+ session->local_peer_idx);
+ *ret_type = EVILNESS_NONE;
+ return;
+ }
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "P%u: got evilness spec\n",
+ session->local_peer_idx);
- GNUNET_CRYPTO_kdf (randomness, sizeof (randomness),
- &session->exp_repetition, sizeof (uint32_t),
- &session->global_id, sizeof (struct GNUNET_HashCode),
- NULL);
+ for (field = strtok (evil_spec, "/");
+ NULL != field;
+ field = strtok (NULL, "/"))
+ {
+ unsigned int peer_num;
+ unsigned int evil_num;
+ int ret;
- for (i = 0; i < session->num_peers; i++)
- session->shuffle[i] = i;
+ evil_type_str = NULL;
- for (i = session->num_peers - 1; i > 0; i--)
- {
- uint32_t x;
- uint32_t tmp;
- x = randomness[i-1] % session->num_peers;
- tmp = session->shuffle[x];
- session->shuffle[x] = session->shuffle[i];
- session->shuffle[i] = tmp;
- }
+ ret = sscanf (field, "%u;%m[a-z];%u", &peer_num, &evil_type_str, &evil_num);
- /* create the inverse */
- for (i = 0; i < session->num_peers; i++)
- session->shuffle_inv[session->shuffle[i]] = i;
-}
+ if (ret != 3)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Malformed field '%s' in EVIL_SPEC, behaving like a good peer.\n",
+ field);
+ goto not_evil;
+ }
+ GNUNET_assert (NULL != evil_type_str);
-/**
- * Find and set the partner_incoming and partner_outgoing of our peer,
- * one of them may not exist (and thus set to NULL) if the number of peers
- * in the session is not a power of two.
- *
- * @param session the consensus session
- */
-static void
-find_partners (struct ConsensusSession *session)
-{
- unsigned int arc;
- unsigned int num_ghosts;
- unsigned int largest_arc;
- int partner_idx;
-
- /* shuffled local index */
- int my_idx = session->shuffle[session->local_peer_idx];
-
- /* distance to neighboring peer in current subround */
- arc = 1 << session->exp_subround;
- largest_arc = 1;
- while (largest_arc < session->num_peers)
- largest_arc <<= 1;
- num_ghosts = largest_arc - session->num_peers;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "largest arc: %u\n", largest_arc);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "arc: %u\n", arc);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "num ghosts: %u\n", num_ghosts);
-
- if (0 == (my_idx & arc))
- {
- /* we are outgoing */
- partner_idx = (my_idx + arc) % session->num_peers;
- session->partner_outgoing = &session->info[session->shuffle_inv[partner_idx]];
- GNUNET_assert (GNUNET_NO == session->partner_outgoing->set_op_finished);
- /* are we a 'ghost' of a peer that would exist if
- * the number of peers was a power of two, and thus have to partner
- * with an additional peer?
- */
- if (my_idx < num_ghosts)
+ if (peer_num == session->local_peer_idx)
{
- int ghost_partner_idx;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "my index %d, arc %d, peers %u\n", my_idx, arc, session->num_peers);
- ghost_partner_idx = (my_idx - (int) arc) % (int) session->num_peers;
- /* platform dependent; modulo sometimes returns negative values */
- if (ghost_partner_idx < 0)
- ghost_partner_idx += session->num_peers;
- /* we only need to have a ghost partner if the partner is outgoing */
- if (0 == (ghost_partner_idx & arc))
+ if (0 == strcmp ("slack", evil_type_str))
+ *ret_type = EVILNESS_SLACK;
+ else if (0 == strcmp ("cram", evil_type_str))
+ {
+ *ret_type = EVILNESS_CRAM;
+ *ret_num = evil_num;
+ }
+ else
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ghost partner is %d\n", ghost_partner_idx);
- session->partner_incoming = &session->info[session->shuffle_inv[ghost_partner_idx]];
- GNUNET_assert (GNUNET_NO == session->partner_incoming->set_op_finished);
- return;
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Malformed field '%s' in EVIL_SPEC (unknown type), behaving like a good peer.\n");
+ goto not_evil;
}
+ goto cleanup;
}
- session->partner_incoming = NULL;
- return;
+ /* No GNUNET_free since memory was allocated by libc */
+ free (evil_type_str);
+ evil_type_str = NULL;
}
- /* we only have an incoming connection */
- partner_idx = (my_idx - (int) arc) % (int) session->num_peers;
- if (partner_idx < 0)
- partner_idx += session->num_peers;
- session->partner_outgoing = NULL;
- session->partner_incoming = &session->info[session->shuffle_inv[partner_idx]];
- GNUNET_assert (GNUNET_NO == session->partner_incoming->set_op_finished);
+not_evil:
+ *ret_type = EVILNESS_NONE;
+cleanup:
+ GNUNET_free (evil_spec);
+ if (NULL != evil_type_str)
+ free (evil_type_str);
}
+#endif
+
/**
- * Callback for set operation results. Called for each element
- * in the result set.
- *
- * @param cls closure
- * @param element a result element, only valid if status is GNUNET_SET_STATUS_OK
- * @param status see enum GNUNET_SET_Status
+ * Commit the appropriate set for a
+ * task.
*/
static void
-set_result_cb (void *cls,
- const struct GNUNET_SET_Element *element,
- enum GNUNET_SET_Status status)
+commit_set (struct ConsensusSession *session,
+ struct TaskEntry *task)
{
- struct ConsensusPeerInformation *cpi = cls;
- unsigned int remote_idx = cpi - cpi->session->info;
- unsigned int local_idx = cpi->session->local_peer_idx;
+ struct SetEntry *set;
+ struct SetOpCls *setop = &task->cls.setop;
- GNUNET_assert ((cpi == cpi->session->partner_outgoing) ||
- (cpi == cpi->session->partner_incoming));
+ GNUNET_assert (NULL != setop->op);
+ set = lookup_set (session, &setop->input_set);
+ GNUNET_assert (NULL != set);
- switch (status)
+#ifdef EVIL
{
- case GNUNET_SET_STATUS_OK:
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "P%u: set result from P%u: element\n",
- local_idx, remote_idx);
- break;
- case GNUNET_SET_STATUS_FAILURE:
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "P%u: set result from P%u: failure\n",
- local_idx, remote_idx);
- cpi->set_op = NULL;
- return;
- case GNUNET_SET_STATUS_HALF_DONE:
- case GNUNET_SET_STATUS_DONE:
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "P%u: set result from P%u: done\n",
- local_idx, remote_idx);
- cpi->set_op_finished = GNUNET_YES;
- cpi->set_op = NULL;
- if (have_exp_subround_finished (cpi->session) == GNUNET_YES)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "P%u: all reconciliations of subround done\n",
- local_idx);
- subround_over (cpi->session, NULL);
- }
- else
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "P%u: waiting for further set results\n",
- local_idx);
- }
- return;
- default:
- GNUNET_break (0);
- return;
+ unsigned int i;
+ unsigned int evil_num;
+ enum Evilness evilness;
+
+ get_evilness (session, &evilness, &evil_num);
+ switch (evilness)
+ {
+ case EVILNESS_CRAM:
+ /* We're not cramming elements in the
+ all-to-all round, since that would just
+ add more elements to the result set, but
+ wouldn't test robustness. */
+ if (PHASE_KIND_ALL_TO_ALL == task->key.kind)
+ {
+ GNUNET_SET_commit (setop->op, set->h);
+ break;
+ }
+ for (i = 0; i < evil_num; i++)
+ {
+ struct GNUNET_HashCode hash;
+ struct GNUNET_SET_Element element;
+ element.data = &hash;
+ element.size = sizeof (struct GNUNET_HashCode);
+ element.element_type = 0;
+
+ GNUNET_CRYPTO_hash_create_random (GNUNET_CRYPTO_QUALITY_STRONG, &hash);
+ GNUNET_SET_add_element (set->h, &element, NULL, NULL);
+#ifdef GNUNET_EXTRA_LOGGING
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "P%u: evil peer: cramming element %s into set {%s} of task {%s}\n",
+ session->local_peer_idx,
+ debug_str_element (&element),
+ debug_str_set_key (&setop->input_set),
+ debug_str_task_key (&task->key));
+#endif
+ }
+ GNUNET_SET_commit (setop->op, set->h);
+ break;
+ case EVILNESS_SLACK:
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "P%u: evil peer: slacking\n",
+ session->local_peer_idx,
+ evil_num);
+ /* Do nothing. */
+ break;
+ case EVILNESS_NONE:
+ GNUNET_SET_commit (setop->op, set->h);
+ break;
+ }
+ }
+#else
+ if ( (GNUNET_YES == setop->transceive_contested) && (GNUNET_YES == set->is_contested) )
+ {
+ struct GNUNET_SET_Element element;
+ struct ContestedPayload payload;
+ element.data = &payload;
+ element.size = sizeof (struct ContestedPayload);
+ element.element_type = ELEMENT_TYPE_CONTESTED_MARKER;
+ GNUNET_SET_add_element (set->h, &element, NULL, NULL);
}
+ if (GNUNET_NO == session->peers_blacklisted[task_other_peer (task)])
+ {
+ GNUNET_SET_commit (setop->op, set->h);
+ }
+ else
+ {
+ /* For our testcases, we don't want the blacklisted
+ peers to wait. */
+ GNUNET_SET_operation_cancel (setop->op);
+ setop->op = NULL;
+ }
+#endif
+}
- switch (cpi->session->current_round)
+
+static void
+put_diff (struct ConsensusSession *session,
+ struct DiffEntry *diff)
+{
+ struct GNUNET_HashCode hash;
+
+ GNUNET_assert (NULL != diff);
+
+ GNUNET_CRYPTO_hash (&diff->key, sizeof (struct DiffKey), &hash);
+ GNUNET_assert (GNUNET_OK ==
+ GNUNET_CONTAINER_multihashmap_put (session->diffmap, &hash, diff,
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
+}
+
+static void
+put_set (struct ConsensusSession *session,
+ struct SetEntry *set)
+{
+ struct GNUNET_HashCode hash;
+
+ GNUNET_assert (NULL != set->h);
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Putting set %s\n",
+ debug_str_set_key (&set->key));
+
+ GNUNET_CRYPTO_hash (&set->key, sizeof (struct SetKey), &hash);
+ GNUNET_assert (GNUNET_OK ==
+ GNUNET_CONTAINER_multihashmap_put (session->setmap, &hash, set,
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
+}
+
+
+static void
+put_rfn (struct ConsensusSession *session,
+ struct ReferendumEntry *rfn)
+{
+ struct GNUNET_HashCode hash;
+
+ GNUNET_CRYPTO_hash (&rfn->key, sizeof (struct RfnKey), &hash);
+ GNUNET_assert (GNUNET_OK ==
+ GNUNET_CONTAINER_multihashmap_put (session->rfnmap, &hash, rfn,
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
+}
+
+
+
+static void
+task_cancel_reconcile (struct TaskEntry *task)
+{
+ /* not implemented yet */
+ GNUNET_assert (0);
+}
+
+
+static void
+apply_diff_to_rfn (struct DiffEntry *diff,
+ struct ReferendumEntry *rfn,
+ uint16_t voting_peer,
+ uint16_t num_peers)
+{
+ struct GNUNET_CONTAINER_MultiHashMapIterator *iter;
+ struct DiffElementInfo *di;
+
+ iter = GNUNET_CONTAINER_multihashmap_iterator_create (diff->changes);
+
+ while (GNUNET_YES ==
+ GNUNET_CONTAINER_multihashmap_iterator_next (iter,
+ NULL,
+ (const void **) &di))
{
- case CONSENSUS_ROUND_COMPLETION:
- case CONSENSUS_ROUND_EXCHANGE:
- GNUNET_SET_add_element (cpi->session->element_set, element, NULL, NULL);
- break;
- default:
- GNUNET_break (0);
- return;
+ if (di->weight > 0)
+ {
+ rfn_vote (rfn, voting_peer, VOTE_ADD, di->element);
+ }
+ if (di->weight < 0)
+ {
+ rfn_vote (rfn, voting_peer, VOTE_REMOVE, di->element);
+ }
}
+
+ GNUNET_CONTAINER_multihashmap_iterator_destroy (iter);
}
-/**
- * Compare the round the session is in with the round of the given context message.
- *
- * @param session a consensus session
- * @param ri a round context message
- * @return 0 if it's the same round, -1 if the session is in an earlier round,
- * 1 if the session is in a later round
- */
-static int
-rounds_compare (struct ConsensusSession *session,
- struct RoundInfo* ri)
+struct DiffEntry *
+diff_create ()
+{
+ struct DiffEntry *d = GNUNET_new (struct DiffEntry);
+
+ d->changes = GNUNET_CONTAINER_multihashmap_create (8, GNUNET_NO);
+
+ return d;
+}
+
+
+struct DiffEntry *
+diff_compose (struct DiffEntry *diff_1,
+ struct DiffEntry *diff_2)
+{
+ struct DiffEntry *diff_new;
+ struct GNUNET_CONTAINER_MultiHashMapIterator *iter;
+ struct DiffElementInfo *di;
+
+ diff_new = diff_create ();
+
+ iter = GNUNET_CONTAINER_multihashmap_iterator_create (diff_1->changes);
+ while (GNUNET_YES == GNUNET_CONTAINER_multihashmap_iterator_next (iter, NULL, (const void **) &di))
+ {
+ diff_insert (diff_new, di->weight, di->element);
+ }
+ GNUNET_CONTAINER_multihashmap_iterator_destroy (iter);
+
+ iter = GNUNET_CONTAINER_multihashmap_iterator_create (diff_2->changes);
+ while (GNUNET_YES == GNUNET_CONTAINER_multihashmap_iterator_next (iter, NULL, (const void **) &di))
+ {
+ diff_insert (diff_new, di->weight, di->element);
+ }
+ GNUNET_CONTAINER_multihashmap_iterator_destroy (iter);
+
+ return diff_new;
+}
+
+
+struct ReferendumEntry *
+rfn_create (uint16_t size)
+{
+ struct ReferendumEntry *rfn;
+
+ rfn = GNUNET_new (struct ReferendumEntry);
+ rfn->rfn_elements = GNUNET_CONTAINER_multihashmap_create (8, GNUNET_NO);
+ rfn->peer_commited = GNUNET_new_array (size, int);
+ rfn->peer_contested = GNUNET_new_array (size, int);
+ rfn->num_peers = size;
+
+ return rfn;
+}
+
+
+void
+diff_destroy (struct DiffEntry *diff)
{
- if (session->current_round < ri->round)
- return -1;
- if (session->current_round > ri->round)
- return 1;
- if (session->current_round == CONSENSUS_ROUND_EXCHANGE)
+ GNUNET_CONTAINER_multihashmap_destroy (diff->changes);
+ GNUNET_free (diff);
+}
+
+
+static void
+rfn_majority (const struct ReferendumEntry *rfn,
+ const struct RfnElementInfo *ri,
+ uint16_t *ret_majority,
+ enum ReferendumVote *ret_vote)
+{
+ uint16_t votes_yes = 0;
+ uint16_t num_commited = 0;
+ uint16_t i;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Computing rfn majority for element %s of rfn {%s}\n",
+ debug_str_element (ri->element),
+ debug_str_rfn_key (&rfn->key));
+
+ for (i = 0; i < rfn->num_peers; i++)
+ {
+ if (GNUNET_NO == rfn->peer_commited[i])
+ continue;
+ num_commited++;
+
+ if (GNUNET_YES == ri->votes[i])
+ votes_yes++;
+ }
+
+ if (votes_yes > (num_commited) / 2)
{
- if (session->exp_repetition < ri->exp_repetition)
- return -1;
- if (session->exp_repetition > ri->exp_repetition)
- return 1;
- if (session->exp_subround < ri->exp_subround)
- return -1;
- if (session->exp_subround < ri->exp_subround)
- return 1;
- return 0;
+ *ret_vote = ri->proposal;
+ *ret_majority = votes_yes;
+ }
+ else
+ {
+ *ret_vote = VOTE_STAY;
+ *ret_majority = num_commited - votes_yes;
}
- /* other rounds have no subrounds / repetitions to compare */
- return 0;
+}
+
+
+struct SetCopyCls
+{
+ struct TaskEntry *task;
+ struct SetKey dst_set_key;
+};
+
+
+static void
+set_copy_cb (void *cls, struct GNUNET_SET_Handle *copy)
+{
+ struct SetCopyCls *scc = cls;
+ struct TaskEntry *task = scc->task;
+ struct SetKey dst_set_key = scc->dst_set_key;
+ struct SetEntry *set;
+
+ GNUNET_free (scc);
+ set = GNUNET_new (struct SetEntry);
+ set->h = copy;
+ set->key = dst_set_key;
+ put_set (task->step->session, set);
+
+ task->start (task);
}
/**
- * Do the next subround in the exp-scheme.
- * This function can be invoked as a timeout task, or called manually (tc will be NULL then).
- *
- * @param cls the session
- * @param tc task context, for when this task is invoked by the scheduler,
- * NULL if invoked for another reason
+ * Call the start function of the given
+ * task again after we created a copy of the given set.
*/
static void
-subround_over (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+create_set_copy_for_task (struct TaskEntry *task,
+ struct SetKey *src_set_key,
+ struct SetKey *dst_set_key)
{
- struct ConsensusSession *session;
- struct GNUNET_TIME_Relative subround_timeout;
- int i;
+ struct SetEntry *src_set;
+ struct SetCopyCls *scc = GNUNET_new (struct SetCopyCls);
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Copying set {%s} to {%s} for task {%s}\n",
+ debug_str_set_key (src_set_key),
+ debug_str_set_key (dst_set_key),
+ debug_str_task_key (&task->key));
+
+ scc->task = task;
+ scc->dst_set_key = *dst_set_key;
+ src_set = lookup_set (task->step->session, src_set_key);
+ GNUNET_assert (NULL != src_set);
+ GNUNET_SET_copy_lazy (src_set->h,
+ set_copy_cb,
+ scc);
+}
+
- /* don't kick off next subround if we're shutting down */
- if ((NULL != tc) && (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
+struct SetMutationProgressCls
+{
+ int num_pending;
+ /**
+ * Task to finish once all changes are through.
+ */
+ struct TaskEntry *task;
+};
+
+
+static void
+set_mutation_done (void *cls)
+{
+ struct SetMutationProgressCls *pc = cls;
+
+ GNUNET_assert (pc->num_pending > 0);
+
+ pc->num_pending--;
+
+ if (0 == pc->num_pending)
+ {
+ struct TaskEntry *task = pc->task;
+ GNUNET_free (pc);
+ finish_task (task);
+ }
+}
+
+static void
+task_start_apply_round (struct TaskEntry *task)
+{
+ struct ConsensusSession *session = task->step->session;
+ struct SetKey sk_in;
+ struct SetKey sk_out;
+ struct RfnKey rk_in;
+ struct SetEntry *set_out;
+ struct ReferendumEntry *rfn_in;
+ struct GNUNET_CONTAINER_MultiHashMapIterator *iter;
+ struct RfnElementInfo *ri;
+ struct SetMutationProgressCls *progress_cls;
+
+ sk_in = (struct SetKey) { SET_KIND_CURRENT, task->key.repetition };
+ rk_in = (struct RfnKey) { RFN_KIND_GRADECAST_RESULT, task->key.repetition };
+ sk_out = (struct SetKey) { SET_KIND_CURRENT, task->key.repetition + 1 };
+
+ set_out = lookup_set (session, &sk_out);
+ if (NULL == set_out)
+ {
+ create_set_copy_for_task (task, &sk_in, &sk_out);
return;
+ }
+
+ rfn_in = lookup_rfn (session, &rk_in);
+ GNUNET_assert (NULL != rfn_in);
- session = cls;
+ progress_cls = GNUNET_new (struct SetMutationProgressCls);
+ progress_cls->task = task;
- GNUNET_assert (CONSENSUS_ROUND_EXCHANGE == session->current_round);
+ iter = GNUNET_CONTAINER_multihashmap_iterator_create (rfn_in->rfn_elements);
- if (tc != NULL)
+ while (GNUNET_YES == GNUNET_CONTAINER_multihashmap_iterator_next (iter, NULL, (const void **) &ri))
{
- session->round_timeout_tid = GNUNET_SCHEDULER_NO_TASK;
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "P%u: consensus subround timed out\n",
- session->local_peer_idx);
+ uint16_t majority_num;
+ enum ReferendumVote majority_vote;
+
+ rfn_majority (rfn_in, ri, &majority_num, &majority_vote);
+
+ switch (majority_vote)
+ {
+ case VOTE_ADD:
+ progress_cls->num_pending++;
+ GNUNET_assert (GNUNET_OK ==
+ GNUNET_SET_add_element (set_out->h,
+ ri->element,
+ set_mutation_done,
+ progress_cls));
+ break;
+ case VOTE_REMOVE:
+ progress_cls->num_pending++;
+ GNUNET_assert (GNUNET_OK ==
+ GNUNET_SET_remove_element (set_out->h,
+ ri->element,
+ set_mutation_done,
+ progress_cls));
+ break;
+ case VOTE_STAY:
+ // do nothing
+ break;
+ default:
+ GNUNET_assert (0);
+ break;
+ }
}
- /* cancel timeout */
- if (session->round_timeout_tid != GNUNET_SCHEDULER_NO_TASK)
+ if (progress_cls->num_pending == 0)
{
- GNUNET_SCHEDULER_cancel (session->round_timeout_tid);
- session->round_timeout_tid = GNUNET_SCHEDULER_NO_TASK;
+ // call closure right now, no pending ops
+ GNUNET_free (progress_cls);
+ finish_task (task);
}
+}
- for (i = 0; i < session->num_peers; i++)
+
+#define THRESH(s) (((s)->num_peers / 3))
+
+
+static void
+task_start_grade (struct TaskEntry *task)
+{
+ struct ConsensusSession *session = task->step->session;
+ struct ReferendumEntry *output_rfn;
+ struct ReferendumEntry *input_rfn;
+ struct DiffEntry *input_diff;
+ struct RfnKey rfn_key;
+ struct DiffKey diff_key;
+ struct GNUNET_CONTAINER_MultiHashMapIterator *iter;
+ struct RfnElementInfo *ri;
+ unsigned int gradecast_confidence = 2;
+
+ rfn_key = (struct RfnKey) { RFN_KIND_GRADECAST_RESULT, task->key.repetition };
+ output_rfn = lookup_rfn (session, &rfn_key);
+ if (NULL == output_rfn)
+ {
+ output_rfn = rfn_create (session->num_peers);
+ output_rfn->key = rfn_key;
+ put_rfn (session, output_rfn);
+ }
+
+ diff_key = (struct DiffKey) { DIFF_KIND_LEADER_PROPOSAL, task->key.repetition, task->key.leader };
+ input_diff = lookup_diff (session, &diff_key);
+ GNUNET_assert (NULL != input_diff);
+
+ rfn_key = (struct RfnKey) { RFN_KIND_ECHO, task->key.repetition, task->key.leader };
+ input_rfn = lookup_rfn (session, &rfn_key);
+ GNUNET_assert (NULL != input_rfn);
+
+ iter = GNUNET_CONTAINER_multihashmap_iterator_create (input_rfn->rfn_elements);
+
+ apply_diff_to_rfn (input_diff, output_rfn, task->key.leader, session->num_peers);
+
+ while (GNUNET_YES == GNUNET_CONTAINER_multihashmap_iterator_next (iter, NULL, (const void **) &ri))
+ {
+ uint16_t majority_num;
+ enum ReferendumVote majority_vote;
+
+ // XXX: we need contested votes and non-contested votes here
+ rfn_majority (input_rfn, ri, &majority_num, &majority_vote);
+
+ if (majority_num < (session->num_peers / 3) * 2)
+ {
+ gradecast_confidence = GNUNET_MIN(1, gradecast_confidence);
+ }
+ if (majority_num < (session->num_peers / 3) + 1)
+ {
+ gradecast_confidence = 0;
+ }
+
+ switch (majority_vote)
+ {
+ case VOTE_STAY:
+ break;
+ case VOTE_ADD:
+ rfn_vote (output_rfn, task->key.leader, VOTE_ADD, ri->element);
+ break;
+ case VOTE_REMOVE:
+ rfn_vote (output_rfn, task->key.leader, VOTE_REMOVE, ri->element);
+ break;
+ default:
+ GNUNET_assert (0);
+ break;
+ }
+ }
+
+ {
+ uint16_t noncontested;
+ noncontested = rfn_noncontested (input_rfn);
+ if (noncontested < (session->num_peers / 3) * 2)
+ {
+ gradecast_confidence = GNUNET_MIN(1, gradecast_confidence);
+ }
+ if (noncontested < (session->num_peers / 3) + 1)
+ {
+ gradecast_confidence = 0;
+ }
+ }
+
+ if (gradecast_confidence >= 1)
+ rfn_commit (output_rfn, task->key.leader);
+
+ if (gradecast_confidence <= 1)
+ session->peers_blacklisted[task->key.leader] = GNUNET_YES;
+
+ finish_task (task);
+}
+
+
+static void
+task_start_reconcile (struct TaskEntry *task)
+{
+ struct SetEntry *input;
+ struct SetOpCls *setop = &task->cls.setop;
+ struct ConsensusSession *session = task->step->session;
+
+ input = lookup_set (session, &setop->input_set);
+ GNUNET_assert (NULL != input);
+ GNUNET_assert (NULL != input->h);
+
+ /* We create the outputs for the operation here
+ (rather than in the set operation callback)
+ because we want something valid in there, even
+ if the other peer doesn't talk to us */
+
+ if (SET_KIND_NONE != setop->output_set.set_kind)
+ {
+ /* If we don't have an existing output set,
+ we clone the input set. */
+ if (NULL == lookup_set (session, &setop->output_set))
+ {
+ create_set_copy_for_task (task, &setop->input_set, &setop->output_set);
+ return;
+ }
+ }
+
+ if (RFN_KIND_NONE != setop->output_rfn.rfn_kind)
+ {
+ if (NULL == lookup_rfn (session, &setop->output_rfn))
+ {
+ struct ReferendumEntry *rfn;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "P%u: output rfn <%s> missing, creating.\n",
+ session->local_peer_idx,
+ debug_str_rfn_key (&setop->output_rfn));
+
+ rfn = rfn_create (session->num_peers);
+ rfn->key = setop->output_rfn;
+ put_rfn (session, rfn);
+ }
+ }
+
+ if (DIFF_KIND_NONE != setop->output_diff.diff_kind)
{
- if (NULL != session->info[i].set_op)
+ if (NULL == lookup_diff (session, &setop->output_diff))
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "P%d: canceling stray op with P%d\n",
- session->local_peer_idx, i);
- GNUNET_SET_operation_cancel (session->info[i].set_op);
- session->info[i].set_op = NULL;
+ struct DiffEntry *diff;
+
+ diff = diff_create ();
+ diff->key = setop->output_diff;
+ put_diff (session, diff);
}
- /* we're in the new round, nothing finished yet */
- session->info[i].set_op_finished = GNUNET_NO;
}
- if (session->exp_repetition >= NUM_EXP_REPETITIONS)
+ if ( (task->key.peer1 == session->local_peer_idx) && (task->key.peer2 == session->local_peer_idx) )
{
- round_over (session, NULL);
+ /* XXX: mark the corresponding rfn as commited if necessary */
+ finish_task (task);
return;
}
- if (session->exp_repetition == 0)
+ if (task->key.peer1 == session->local_peer_idx)
{
- /* initialize everything for the log-rounds */
- session->exp_repetition = 1;
- session->exp_subround = 0;
- if (NULL == session->shuffle)
- session->shuffle = GNUNET_malloc ((sizeof (int)) * session->num_peers);
- if (NULL == session->shuffle_inv)
- session->shuffle_inv = GNUNET_malloc ((sizeof (int)) * session->num_peers);
- for (i = 0; i < session->num_peers; i++)
- session->shuffle[i] = session->shuffle_inv[i] = i;
+ struct GNUNET_CONSENSUS_RoundContextMessage rcm = { 0 };
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "P%u: Looking up set {%s} to run remote union\n",
+ session->local_peer_idx,
+ debug_str_set_key (&setop->input_set));
+
+ rcm.header.type = htons (GNUNET_MESSAGE_TYPE_CONSENSUS_P2P_ROUND_CONTEXT);
+ rcm.header.size = htons (sizeof (struct GNUNET_CONSENSUS_RoundContextMessage));
+
+ rcm.kind = htons (task->key.kind);
+ rcm.peer1 = htons (task->key.peer1);
+ rcm.peer2 = htons (task->key.peer2);
+ rcm.leader = htons (task->key.leader);
+ rcm.repetition = htons (task->key.repetition);
+
+ GNUNET_assert (NULL == setop->op);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "P%u: initiating set op with P%u, our set is %s\n",
+ session->local_peer_idx, task->key.peer2, debug_str_set_key (&setop->input_set));
+
+ // XXX: maybe this should be done while
+ // setting up tasks alreays?
+ setop->op = GNUNET_SET_prepare (&session->peers[task->key.peer2],
+ &session->global_id,
+ &rcm.header,
+ GNUNET_SET_RESULT_SYMMETRIC,
+ set_result_cb,
+ task);
+
+ if (GNUNET_OK != GNUNET_SET_commit (setop->op, input->h))
+ {
+ GNUNET_break (0);
+ /* XXX: cleanup? */
+ return;
+ }
}
- else if (session->exp_subround + 1 >= (int) ceil (log2 (session->num_peers)))
+ else if (task->key.peer2 == session->local_peer_idx)
{
- /* subrounds done, start new log-round */
- session->exp_repetition++;
- session->exp_subround = 0;
- shuffle (session);
+ /* Wait for the other peer to contact us */
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "P%u: waiting set op with P%u\n",
+ session->local_peer_idx, task->key.peer1);
+
+ if (NULL != setop->op)
+ {
+ commit_set (session, task);
+ }
}
else
{
- session->exp_subround++;
+ /* We made an error while constructing the task graph. */
+ GNUNET_assert (0);
}
+}
+
+
+static void
+task_start_eval_echo (struct TaskEntry *task)
+{
+ struct GNUNET_CONTAINER_MultiHashMapIterator *iter;
+ struct ReferendumEntry *input_rfn;
+ struct RfnElementInfo *ri;
+ struct SetEntry *output_set;
+ struct SetMutationProgressCls *progress_cls;
+ struct ConsensusSession *session = task->step->session;
+ struct SetKey sk_in;
+ struct SetKey sk_out;
+ struct RfnKey rk_in;
+
+ sk_in = (struct SetKey) { SET_KIND_LEADER_PROPOSAL, task->key.repetition, task->key.leader };
+ sk_out = (struct SetKey) { SET_KIND_ECHO_RESULT, task->key.repetition, task->key.leader };
+ output_set = lookup_set (session, &sk_out);
+ if (NULL == output_set)
+ {
+ create_set_copy_for_task (task, &sk_in, &sk_out);
+ return;
+ }
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Evaluating referendum in Task {%s}\n",
+ debug_str_task_key (&task->key));
+
+ progress_cls = GNUNET_new (struct SetMutationProgressCls);
+ progress_cls->task = task;
+
+ rk_in = (struct RfnKey) { RFN_KIND_ECHO, task->key.repetition, task->key.leader };
+ input_rfn = lookup_rfn (session, &rk_in);
+
+ GNUNET_assert (NULL != input_rfn);
+
+ iter = GNUNET_CONTAINER_multihashmap_iterator_create (input_rfn->rfn_elements);
+ GNUNET_assert (NULL != iter);
+
+ while (GNUNET_YES ==
+ GNUNET_CONTAINER_multihashmap_iterator_next (iter,
+ NULL,
+ (const void **) &ri))
+ {
+ enum ReferendumVote majority_vote;
+ uint16_t majority_num;
+
+ rfn_majority (input_rfn, ri, &majority_num, &majority_vote);
+
+ if (majority_num < session->num_peers / 3)
+ {
+ /* It is not the case that all nonfaulty peers
+ echoed the same value. Since we're doing a set reconciliation, we
+ can't simply send "nothing" for the value. Thus we mark our 'confirm'
+ reconciliation as contested. Other peers might not know that the
+ leader is faulty, thus we still re-distribute in the confirmation
+ round. */
+ output_set->is_contested = GNUNET_YES;
+ }
+
+ switch (majority_vote)
+ {
+ case VOTE_ADD:
+ progress_cls->num_pending++;
+ GNUNET_assert (GNUNET_OK ==
+ GNUNET_SET_add_element (output_set->h,
+ ri->element,
+ set_mutation_done,
+ progress_cls));
+ break;
+ case VOTE_REMOVE:
+ progress_cls->num_pending++;
+ GNUNET_assert (GNUNET_OK ==
+ GNUNET_SET_remove_element (output_set->h,
+ ri->element,
+ set_mutation_done,
+ progress_cls));
+ break;
+ case VOTE_STAY:
+ /* Nothing to do. */
+ break;
+ default:
+ /* not reached */
+ GNUNET_assert (0);
+ }
+ }
+
+ GNUNET_CONTAINER_multihashmap_iterator_destroy (iter);
+
+ if (progress_cls->num_pending == 0)
+ {
+ // call closure right now, no pending ops
+ GNUNET_free (progress_cls);
+ finish_task (task);
+ }
+}
+
+
+static void
+task_start_finish (struct TaskEntry *task)
+{
+ struct SetEntry *final_set;
+ struct ConsensusSession *session = task->step->session;
+
+ final_set = lookup_set (session, &task->cls.finish.input_set);
+
+ GNUNET_assert (NULL != final_set);
+
+
+ GNUNET_SET_iterate (final_set->h,
+ send_to_client_iter,
+ task);
+}
+
+static void
+start_task (struct ConsensusSession *session, struct TaskEntry *task)
+{
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "P%u: starting task {%s}\n", session->local_peer_idx, debug_str_task_key (&task->key));
+
+ GNUNET_assert (GNUNET_NO == task->is_started);
+ GNUNET_assert (GNUNET_NO == task->is_finished);
+ GNUNET_assert (NULL != task->start);
+
+ task->start (task);
+
+ task->is_started = GNUNET_YES;
+}
+
+
+static void finish_step (struct Step *step)
+{
+ unsigned int i;
+
+ GNUNET_assert (step->finished_tasks == step->tasks_len);
+ GNUNET_assert (GNUNET_YES == step->is_running);
+ GNUNET_assert (GNUNET_NO == step->is_finished);
+
+#ifdef GNUNET_EXTRA_LOGGING
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "All tasks of step `%s' with %u subordinates finished.\n",
+ step->debug_name,
+ step->subordinates_len);
+#endif
+
+ for (i = 0; i < step->subordinates_len; i++)
+ {
+ GNUNET_assert (step->subordinates[i]->pending_prereq > 0);
+ step->subordinates[i]->pending_prereq--;
+#ifdef GNUNET_EXTRA_LOGGING
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Decreased pending_prereq to %u for step `%s'.\n",
+ step->subordinates[i]->pending_prereq,
+ step->subordinates[i]->debug_name);
+
+#endif
+ }
+
+ step->is_finished = GNUNET_YES;
+
+ // XXX: maybe schedule as task to avoid recursion?
+ run_ready_steps (step->session);
+}
+
- subround_timeout =
- GNUNET_TIME_relative_divide (GNUNET_TIME_absolute_get_difference (session->conclude_start, session->conclude_deadline),
- 2 * NUM_EXP_REPETITIONS * ((int) ceil (log2 (session->num_peers))));
+/*
+ * Run all steps of the session that don't any
+ * more dependencies.
+ */
+static void
+run_ready_steps (struct ConsensusSession *session)
+{
+ struct Step *step;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "subround timeout: %u ms\n", subround_timeout.rel_value_us / 1000);
+ step = session->steps_head;
- session->round_timeout_tid = GNUNET_SCHEDULER_add_delayed (subround_timeout, subround_over, session);
+ while (NULL != step)
+ {
+ if ( (GNUNET_NO == step->is_running) && (0 == step->pending_prereq) )
+ {
+ size_t i;
- /* determine the incoming and outgoing partner */
- find_partners (session);
+ GNUNET_assert (0 == step->finished_tasks);
- GNUNET_assert (session->partner_outgoing != &session->info[session->local_peer_idx]);
- GNUNET_assert (session->partner_incoming != &session->info[session->local_peer_idx]);
+#ifdef GNUNET_EXTRA_LOGGING
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "P%u: Running step `%s' of round %d with %d tasks and %d subordinates\n",
+ session->local_peer_idx,
+ step->debug_name,
+ step->round, step->tasks_len, step->subordinates_len);
+#endif
- /* initiate set operation with the outgoing partner */
- if (NULL != session->partner_outgoing)
- {
- struct GNUNET_CONSENSUS_RoundContextMessage *msg;
- msg = GNUNET_new (struct GNUNET_CONSENSUS_RoundContextMessage);
- msg->header.type = htons (GNUNET_MESSAGE_TYPE_CONSENSUS_P2P_ROUND_CONTEXT);
- msg->header.size = htons (sizeof *msg);
- msg->round = htonl (session->current_round);
- msg->exp_repetition = htonl (session->exp_repetition);
- msg->exp_subround = htonl (session->exp_subround);
+ step->is_running = GNUNET_YES;
+ for (i = 0; i < step->tasks_len; i++)
+ start_task (session, step->tasks[i]);
- if (NULL != session->partner_outgoing->set_op)
- {
- GNUNET_break (0);
- GNUNET_SET_operation_cancel (session->partner_outgoing->set_op);
+ /* Sometimes there is no task to trigger finishing the step, so we have to do it here. */
+ if ( (step->finished_tasks == step->tasks_len) && (GNUNET_NO == step->is_finished))
+ finish_step (step);
+
+ /* Running the next ready steps will be triggered by task completion */
+ return;
}
- session->partner_outgoing->set_op =
- GNUNET_SET_prepare (&session->partner_outgoing->peer_id,
- &session->global_id,
- (struct GNUNET_MessageHeader *) msg,
- 0, /* FIXME: salt */
- GNUNET_SET_RESULT_ADDED,
- set_result_cb, session->partner_outgoing);
- GNUNET_free (msg);
- GNUNET_SET_commit (session->partner_outgoing->set_op, session->element_set);
+ step = step->next;
}
- /* commit to the delayed set operation */
- if ((NULL != session->partner_incoming) && (NULL != session->partner_incoming->delayed_set_op))
- {
- int cmp = rounds_compare (session, &session->partner_incoming->delayed_round_info);
+ return;
+}
- if (NULL != session->partner_incoming->set_op)
- {
- GNUNET_break (0);
- GNUNET_SET_operation_cancel (session->partner_incoming->set_op);
- session->partner_incoming->set_op = NULL;
- }
- if (cmp == 0)
- {
- GNUNET_SET_commit (session->partner_incoming->delayed_set_op, session->element_set);
- session->partner_incoming->set_op = session->partner_incoming->delayed_set_op;
- session->partner_incoming->delayed_set_op = NULL;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "P%d resumed delayed round with P%d\n",
- session->local_peer_idx, (int) (session->partner_incoming - session->info));
- }
- else
- {
- /* this should not happen -- a round has been skipped! */
- GNUNET_break_op (0);
- }
- }
-#ifdef GNUNET_EXTRA_LOGGING
- {
- int in;
- int out;
- if (session->partner_outgoing == NULL)
- out = -1;
- else
- out = (int) (session->partner_outgoing - session->info);
- if (session->partner_incoming == NULL)
- in = -1;
- else
- in = (int) (session->partner_incoming - session->info);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "P%u: doing exp-round, r=%d, sub=%d, in: %d, out: %d\n", session->local_peer_idx,
- session->exp_repetition, session->exp_subround, in, out);
- }
-#endif /* GNUNET_EXTRA_LOGGING */
+static void
+finish_task (struct TaskEntry *task)
+{
+ GNUNET_assert (GNUNET_NO == task->is_finished);
+ task->is_finished = GNUNET_YES;
+
+ task->step->finished_tasks++;
+
+ if (task->step->finished_tasks == task->step->tasks_len)
+ finish_step (task->step);
}
{
int i;
for (i = 0; i < session->num_peers; i++)
- if (0 == memcmp (peer, &session->info[i].peer_id, sizeof *peer))
+ if (0 == memcmp (peer, &session->peers[i], sizeof (struct GNUNET_PeerIdentity)))
return i;
return -1;
}
* exactly the same peers, the global id will be different.
*
* @param session session to generate the global id for
- * @param session_id local id of the consensus session
+ * @param local_session_id local id of the consensus session
*/
static void
compute_global_id (struct ConsensusSession *session,
- const struct GNUNET_HashCode *session_id)
+ const struct GNUNET_HashCode *local_session_id)
{
- int i;
- struct GNUNET_HashCode tmp;
- struct GNUNET_HashCode phash;
-
- /* FIXME: use kdf? */
-
- session->global_id = *session_id;
- for (i = 0; i < session->num_peers; ++i)
- {
- GNUNET_CRYPTO_hash (&session->info[i].peer_id, sizeof (struct GNUNET_PeerIdentity), &phash);
- GNUNET_CRYPTO_hash_xor (&session->global_id, &phash, &tmp);
- session->global_id = tmp;
- GNUNET_CRYPTO_hash (&session->global_id, sizeof (struct GNUNET_PeerIdentity), &tmp);
- session->global_id = tmp;
- }
+ const char *salt = "gnunet-service-consensus/session_id";
+
+ GNUNET_assert (GNUNET_YES ==
+ GNUNET_CRYPTO_kdf (&session->global_id,
+ sizeof (struct GNUNET_HashCode),
+ salt,
+ strlen (salt),
+ session->peers,
+ session->num_peers * sizeof (struct GNUNET_PeerIdentity),
+ local_session_id,
+ sizeof (struct GNUNET_HashCode),
+ NULL));
}
unsigned int local_peer_in_list;
uint32_t listed_peers;
const struct GNUNET_PeerIdentity *msg_peers;
- struct GNUNET_PeerIdentity *peers;
unsigned int i;
GNUNET_assert (NULL != join_msg);
if (GNUNET_NO == local_peer_in_list)
session->num_peers++;
- peers = GNUNET_malloc (session->num_peers * sizeof (struct GNUNET_PeerIdentity));
+ session->peers = GNUNET_malloc (session->num_peers * sizeof (struct GNUNET_PeerIdentity));
if (GNUNET_NO == local_peer_in_list)
- peers[session->num_peers - 1] = my_peer;
+ session->peers[session->num_peers - 1] = my_peer;
- memcpy (peers, msg_peers, listed_peers * sizeof (struct GNUNET_PeerIdentity));
- qsort (peers, session->num_peers, sizeof (struct GNUNET_PeerIdentity), &peer_id_cmp);
+ memcpy (session->peers, msg_peers, listed_peers * sizeof (struct GNUNET_PeerIdentity));
+ qsort (session->peers, session->num_peers, sizeof (struct GNUNET_PeerIdentity), &peer_id_cmp);
+}
- session->info = GNUNET_malloc (session->num_peers * sizeof (struct ConsensusPeerInformation));
- for (i = 0; i < session->num_peers; ++i)
- {
- /* initialize back-references, so consensus peer information can
- * be used as closure */
- session->info[i].session = session;
- session->info[i].peer_id = peers[i];
- }
+static struct TaskEntry *
+lookup_task (struct ConsensusSession *session,
+ struct TaskKey *key)
+{
+ struct GNUNET_HashCode hash;
+
- GNUNET_free (peers);
+ GNUNET_CRYPTO_hash (key, sizeof (struct TaskKey), &hash);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Looking up task hash %s\n",
+ GNUNET_h2s (&hash));
+ return GNUNET_CONTAINER_multihashmap_get (session->taskmap, &hash);
}
struct GNUNET_SET_Request *request)
{
struct ConsensusSession *session = cls;
- struct GNUNET_CONSENSUS_RoundContextMessage *msg = (struct GNUNET_CONSENSUS_RoundContextMessage *) context_msg;
- struct ConsensusPeerInformation *cpi;
- struct GNUNET_SET_OperationHandle *set_op;
- struct RoundInfo round_info;
- int index;
- int cmp;
+ struct TaskKey tk;
+ struct TaskEntry *task;
+ struct GNUNET_CONSENSUS_RoundContextMessage *cm;
if (NULL == context_msg)
{
return;
}
- index = get_peer_idx (other_peer, session);
+ if (GNUNET_MESSAGE_TYPE_CONSENSUS_P2P_ROUND_CONTEXT != ntohs (context_msg->type))
+ {
+ GNUNET_break_op (0);
+ return;
+ }
- if (index < 0)
+ if (sizeof (struct GNUNET_CONSENSUS_RoundContextMessage) != ntohs (context_msg->size))
{
GNUNET_break_op (0);
return;
}
- round_info.round = ntohl (msg->round);
- round_info.exp_repetition = ntohl (msg->exp_repetition);
- round_info.exp_subround = ntohl (msg->exp_subround);
+ cm = (struct GNUNET_CONSENSUS_RoundContextMessage *) context_msg;
- cpi = &session->info[index];
+ tk = ((struct TaskKey) {
+ .kind = ntohs (cm->kind),
+ .peer1 = ntohs (cm->peer1),
+ .peer2 = ntohs (cm->peer2),
+ .repetition = ntohs (cm->repetition),
+ .leader = ntohs (cm->leader),
+ });
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "P%d got set request from P%d\n", session->local_peer_idx, index);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "P%u: got req for task %s\n",
+ session->local_peer_idx, debug_str_task_key (&tk));
- switch (session->current_round)
+ task = lookup_task (session, &tk);
+
+ if (NULL == task)
{
- case CONSENSUS_ROUND_BEGIN:
- /* we're in the begin round, so requests for the exchange round may
- * come in, they will be delayed for now! */
- case CONSENSUS_ROUND_EXCHANGE:
- cmp = rounds_compare (session, &round_info);
- if (cmp > 0)
- {
- /* the other peer is too late */
- GNUNET_break_op (0);
- return;
- }
- /* kill old request, if any. this is legal,
- * as the other peer would not make a new request if it would want to
- * complete the old one! */
- if (NULL != cpi->set_op)
- {
- LOG_PP (GNUNET_ERROR_TYPE_INFO, cpi, "got new request from same peer, canceling old one\n");
- GNUNET_SET_operation_cancel (cpi->set_op);
- cpi->set_op = NULL;
- }
- set_op = GNUNET_SET_accept (request, GNUNET_SET_RESULT_ADDED,
- set_result_cb, &session->info[index]);
- if (cmp == 0)
- {
- cpi->set_op = set_op;
- GNUNET_SET_commit (set_op, session->element_set);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "P%d commited to set request from P%d\n", session->local_peer_idx, index);
- }
- else
- {
- /* we still have wait until we have finished the current round,
- * as the other peer's round is larger */
- cpi->delayed_set_op = set_op;
- cpi->delayed_round_info = round_info;
- /* The current setop is finished, as we canceled the current setop above. */
- cpi->set_op_finished = GNUNET_YES;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "P%d delaying set request from P%d\n", session->local_peer_idx, index);
- }
- break;
- default:
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "P%d got unexpected set request in round %d from P%d\n",
- session->local_peer_idx, session->current_round, index);
- GNUNET_break_op (0);
- return;
+ GNUNET_break_op (0);
+ return;
+ }
+
+ if (GNUNET_YES == task->is_finished)
+ {
+ GNUNET_break_op (0);
+ return;
+ }
+
+ if (task->key.peer2 != session->local_peer_idx)
+ {
+ /* We're being asked, so we must be thne 2nd peer. */
+ GNUNET_break_op (0);
+ return;
+ }
+
+ GNUNET_assert (! ((task->key.peer1 == session->local_peer_idx) &&
+ (task->key.peer2 == session->local_peer_idx)));
+
+ task->cls.setop.op = GNUNET_SET_accept (request,
+ GNUNET_SET_RESULT_SYMMETRIC,
+ set_result_cb,
+ task);
+
+ /* If the task hasn't been started yet,
+ we wait for that until we commit. */
+
+ if (GNUNET_YES == task->is_started)
+ {
+ commit_set (session, task);
+ }
+}
+
+
+
+static void
+put_task (struct GNUNET_CONTAINER_MultiHashMap *taskmap,
+ struct TaskEntry *t)
+{
+ struct GNUNET_HashCode round_hash;
+ struct Step *s;
+
+ GNUNET_assert (NULL != t->step);
+
+ t = GNUNET_memdup (t, sizeof (struct TaskEntry));
+
+ s = t->step;
+
+ if (s->tasks_len == s->tasks_cap)
+ {
+ unsigned int target_size = 3 * (s->tasks_cap + 1) / 2;
+ GNUNET_array_grow (s->tasks,
+ s->tasks_cap,
+ target_size);
+ }
+
+#ifdef GNUNET_EXTRA_LOGGING
+ GNUNET_assert (NULL != s->debug_name);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Putting task <%s> into step `%s'\n",
+ debug_str_task_key (&t->key),
+ s->debug_name);
+#endif
+
+ s->tasks[s->tasks_len] = t;
+ s->tasks_len++;
+
+ GNUNET_CRYPTO_hash (&t->key, sizeof (struct TaskKey), &round_hash);
+ GNUNET_assert (GNUNET_OK ==
+ GNUNET_CONTAINER_multihashmap_put (taskmap, &round_hash, t,
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
+}
+
+
+static void
+install_step_timeouts (struct ConsensusSession *session)
+{
+ /* Given the fully constructed task graph
+ with rounds for tasks, we can give the tasks timeouts. */
+
+ /* XXX: implement! */
+}
+
+
+
+/*
+ * Arrange two peers in some canonical order.
+ */
+static void
+arrange_peers (uint16_t *p1, uint16_t *p2, uint16_t n)
+{
+ uint16_t a;
+ uint16_t b;
+
+ GNUNET_assert (*p1 < n);
+ GNUNET_assert (*p2 < n);
+
+ if (*p1 < *p2)
+ {
+ a = *p1;
+ b = *p2;
+ }
+ else
+ {
+ a = *p2;
+ b = *p1;
+ }
+
+ /* For uniformly random *p1, *p2,
+ this condition is true with 50% chance */
+ if (((b - a) + n) % n <= n / 2)
+ {
+ *p1 = a;
+ *p2 = b;
+ }
+ else
+ {
+ *p1 = b;
+ *p2 = a;
+ }
+}
+
+
+/**
+ * Record @a dep as a dependency of @step.
+ */
+static void
+step_depend_on (struct Step *step, struct Step *dep)
+{
+ /* We're not checking for cyclic dependencies,
+ but this is a cheap sanity check. */
+ GNUNET_assert (step != dep);
+ GNUNET_assert (NULL != step);
+ GNUNET_assert (NULL != dep);
+ GNUNET_assert (dep->round <= step->round);
+
+#ifdef GNUNET_EXTRA_LOGGING
+ /* Make sure we have complete debugging information.
+ Also checks that we don't screw up too badly
+ constructing the task graph. */
+ GNUNET_assert (NULL != step->debug_name);
+ GNUNET_assert (NULL != dep->debug_name);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Making step `%s' depend on `%s'\n",
+ step->debug_name,
+ dep->debug_name);
+#endif
+
+ if (dep->subordinates_cap == dep->subordinates_len)
+ {
+ unsigned int target_size = 3 * (dep->subordinates_cap + 1) / 2;
+ GNUNET_array_grow (dep->subordinates,
+ dep->subordinates_cap,
+ target_size);
+ }
+
+ GNUNET_assert (dep->subordinates_len <= dep->subordinates_cap);
+
+ dep->subordinates[dep->subordinates_len] = step;
+ dep->subordinates_len++;
+
+ step->pending_prereq++;
+}
+
+
+static struct Step *
+create_step (struct ConsensusSession *session, int round)
+{
+ struct Step *step;
+ step = GNUNET_new (struct Step);
+ step->session = session;
+ step->round = round;
+ GNUNET_CONTAINER_DLL_insert_tail (session->steps_head,
+ session->steps_tail,
+ step);
+ return step;
+}
+
+
+/**
+ * Construct the task graph for a single
+ * gradecast.
+ */
+static void
+construct_task_graph_gradecast (struct ConsensusSession *session,
+ uint16_t rep,
+ uint16_t lead,
+ struct Step *step_before,
+ struct Step *step_after)
+{
+ uint16_t n = session->num_peers;
+ uint16_t me = session->local_peer_idx;
+
+ uint16_t p1;
+ uint16_t p2;
+
+ /* The task we're currently setting up. */
+ struct TaskEntry task;
+
+ struct Step *step;
+ struct Step *prev_step;
+
+ uint16_t round;
+
+ unsigned int k;
+
+ round = step_before->round + 1;
+
+ /* gcast step 1: leader disseminates */
+
+ step = create_step (session, round);
+
+#ifdef GNUNET_EXTRA_LOGGING
+ GNUNET_asprintf (&step->debug_name, "disseminate leader %u rep %u", lead, rep);
+#endif
+ step_depend_on (step, step_before);
+
+ if (lead == me)
+ {
+ for (k = 0; k < n; k++)
+ {
+ if (k == me)
+ continue;
+ p1 = me;
+ p2 = k;
+ arrange_peers (&p1, &p2, n);
+ task = ((struct TaskEntry) {
+ .step = step,
+ .start = task_start_reconcile,
+ .cancel = task_cancel_reconcile,
+ .key = (struct TaskKey) { PHASE_KIND_GRADECAST_LEADER, p1, p2, rep, me },
+ });
+ task.cls.setop.input_set = (struct SetKey) { SET_KIND_CURRENT, rep };
+ put_task (session->taskmap, &task);
+ }
+ /* We run this task to make sure that the leader
+ has the stored the SET_KIND_LEADER set of himself,
+ so he can participate in the rest of the gradecast
+ without the code having to handle any special cases. */
+ task = ((struct TaskEntry) {
+ .step = step,
+ .key = (struct TaskKey) { PHASE_KIND_GRADECAST_LEADER, me, me, rep, me },
+ .start = task_start_reconcile,
+ .cancel = task_cancel_reconcile,
+ });
+ task.cls.setop.input_set = (struct SetKey) { SET_KIND_CURRENT, rep };
+ task.cls.setop.output_set = (struct SetKey) { SET_KIND_LEADER_PROPOSAL, rep, me };
+ task.cls.setop.output_diff = (struct DiffKey) { DIFF_KIND_LEADER_PROPOSAL, rep, me };
+ put_task (session->taskmap, &task);
+ }
+ else
+ {
+ p1 = me;
+ p2 = lead;
+ arrange_peers (&p1, &p2, n);
+ task = ((struct TaskEntry) {
+ .step = step,
+ .key = (struct TaskKey) { PHASE_KIND_GRADECAST_LEADER, p1, p2, rep, lead},
+ .start = task_start_reconcile,
+ .cancel = task_cancel_reconcile,
+ });
+ task.cls.setop.input_set = (struct SetKey) { SET_KIND_CURRENT, rep };
+ task.cls.setop.output_set = (struct SetKey) { SET_KIND_LEADER_PROPOSAL, rep, lead };
+ task.cls.setop.output_diff = (struct DiffKey) { DIFF_KIND_LEADER_PROPOSAL, rep, lead };
+ put_task (session->taskmap, &task);
+ }
+
+ /* gcast phase 2: echo */
+ prev_step = step;
+ round += 1;
+ step = create_step (session, round);
+#ifdef GNUNET_EXTRA_LOGGING
+ GNUNET_asprintf (&step->debug_name, "echo leader %u rep %u", lead, rep);
+#endif
+ step_depend_on (step, prev_step);
+
+ for (k = 0; k < n; k++)
+ {
+ p1 = k;
+ p2 = me;
+ arrange_peers (&p1, &p2, n);
+ task = ((struct TaskEntry) {
+ .step = step,
+ .key = (struct TaskKey) { PHASE_KIND_GRADECAST_ECHO, p1, p2, rep, lead },
+ .start = task_start_reconcile,
+ .cancel = task_cancel_reconcile,
+ });
+ task.cls.setop.input_set = (struct SetKey) { SET_KIND_LEADER_PROPOSAL, rep, lead };
+ task.cls.setop.output_rfn = (struct RfnKey) { RFN_KIND_ECHO, rep, lead };
+ put_task (session->taskmap, &task);
+ }
+
+ prev_step = step;
+ /* Same round, since step only has local tasks */
+ step = create_step (session, round);
+#ifdef GNUNET_EXTRA_LOGGING
+ GNUNET_asprintf (&step->debug_name, "echo grade leader %u rep %u", lead, rep);
+#endif
+ step_depend_on (step, prev_step);
+
+ arrange_peers (&p1, &p2, n);
+ task = ((struct TaskEntry) {
+ .key = (struct TaskKey) { PHASE_KIND_GRADECAST_ECHO_GRADE, -1, -1, rep, lead },
+ .step = step,
+ .start = task_start_eval_echo
+ });
+ put_task (session->taskmap, &task);
+
+ prev_step = step;
+ round += 1;
+ step = create_step (session, round);
+#ifdef GNUNET_EXTRA_LOGGING
+ GNUNET_asprintf (&step->debug_name, "confirm leader %u rep %u", lead, rep);
+#endif
+ step_depend_on (step, prev_step);
+
+ /* gcast phase 3: confirmation and grading */
+ for (k = 0; k < n; k++)
+ {
+ p1 = k;
+ p2 = me;
+ arrange_peers (&p1, &p2, n);
+ task = ((struct TaskEntry) {
+ .step = step,
+ .start = task_start_reconcile,
+ .cancel = task_cancel_reconcile,
+ .key = (struct TaskKey) { PHASE_KIND_GRADECAST_CONFIRM, p1, p2, rep, lead},
+ });
+ task.cls.setop.input_set = (struct SetKey) { SET_KIND_ECHO_RESULT, rep, lead };
+ task.cls.setop.output_rfn = (struct RfnKey) { RFN_KIND_CONFIRM, rep, lead };
+ /* If there was at least one element in the echo round that was
+ contested (i.e. it had no n-t majority), then we let the other peers
+ know, and other peers let us know. The contested flag for each peer is
+ stored in the rfn. */
+ task.cls.setop.transceive_contested = GNUNET_YES;
+ put_task (session->taskmap, &task);
+ }
+
+ prev_step = step;
+ /* Same round, since step only has local tasks */
+ step = create_step (session, round);
+#ifdef GNUNET_EXTRA_LOGGING
+ GNUNET_asprintf (&step->debug_name, "confirm grade leader %u rep %u", lead, rep);
+#endif
+ step_depend_on (step, prev_step);
+
+ task = ((struct TaskEntry) {
+ .step = step,
+ .key = (struct TaskKey) { PHASE_KIND_GRADECAST_CONFIRM_GRADE, -1, -1, rep, lead },
+ .start = task_start_grade,
+ });
+ put_task (session->taskmap, &task);
+
+ step_depend_on (step_after, step);
+}
+
+
+static void
+construct_task_graph (struct ConsensusSession *session)
+{
+ uint16_t n = session->num_peers;
+ uint16_t t = n / 3;
+
+ uint16_t me = session->local_peer_idx;
+
+ uint16_t p1;
+ uint16_t p2;
+
+ /* The task we're currently setting up. */
+ struct TaskEntry task;
+
+ /* Current leader */
+ unsigned int lead;
+
+ struct Step *step;
+ struct Step *prev_step;
+
+ unsigned int round = 0;
+
+ unsigned int i;
+
+ // XXX: introduce first step,
+ // where we wait for all insert acks
+ // from the set service
+
+ /* faster but brittle all-to-all */
+
+ // XXX: Not implemented yet
+
+ /* all-to-all step */
+
+ step = create_step (session, round);
+
+#ifdef GNUNET_EXTRA_LOGGING
+ step->debug_name = GNUNET_strdup ("all to all");
+#endif
+
+ for (i = 0; i < n; i++)
+ {
+ p1 = me;
+ p2 = i;
+ arrange_peers (&p1, &p2, n);
+ task = ((struct TaskEntry) {
+ .key = (struct TaskKey) { PHASE_KIND_ALL_TO_ALL, p1, p2, -1, -1 },
+ .step = step,
+ .start = task_start_reconcile,
+ .cancel = task_cancel_reconcile,
+ });
+ task.cls.setop.input_set = (struct SetKey) { SET_KIND_CURRENT, 0 };
+ task.cls.setop.output_set = task.cls.setop.input_set;
+ task.cls.setop.do_not_remove = GNUNET_YES;
+ put_task (session->taskmap, &task);
+ }
+
+ prev_step = step;
+ step = NULL;
+
+ round += 1;
+
+ /* Byzantine union */
+
+ /* sequential repetitions of the gradecasts */
+ for (i = 0; i < t + 1; i++)
+ {
+ struct Step *step_rep_start;
+ struct Step *step_rep_end;
+
+ /* Every repetition is in a separate round. */
+ step_rep_start = create_step (session, round);
+#ifdef GNUNET_EXTRA_LOGGING
+ GNUNET_asprintf (&step_rep_start->debug_name, "gradecast start rep %u", i);
+#endif
+
+ step_depend_on (step_rep_start, prev_step);
+
+ /* gradecast has three rounds */
+ round += 3;
+ step_rep_end = create_step (session, round);
+#ifdef GNUNET_EXTRA_LOGGING
+ GNUNET_asprintf (&step_rep_end->debug_name, "gradecast end rep %u", i);
+#endif
+
+ /* parallel gradecasts */
+ for (lead = 0; lead < n; lead++)
+ construct_task_graph_gradecast (session, i, lead, step_rep_start, step_rep_end);
+
+ task = ((struct TaskEntry) {
+ .step = step_rep_end,
+ .key = (struct TaskKey) { PHASE_KIND_APPLY_REP, -1, -1, i, -1},
+ .start = task_start_apply_round,
+ });
+ put_task (session->taskmap, &task);
+
+ prev_step = step_rep_end;
}
+
+ /* There is no next gradecast round, thus the final
+ start step is the overall end step of the gradecasts */
+ round += 1;
+ step = create_step (session, round);
+#ifdef GNUNET_EXTRA_LOGGING
+ GNUNET_asprintf (&step->debug_name, "finish");
+#endif
+ step_depend_on (step, prev_step);
+
+ task = ((struct TaskEntry) {
+ .step = step,
+ .key = (struct TaskKey) { PHASE_KIND_FINISH, -1, -1, -1, -1 },
+ .start = task_start_finish,
+ });
+ task.cls.finish.input_set = (struct SetKey) { SET_KIND_CURRENT, t + 1 };
+
+ put_task (session->taskmap, &task);
}
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "session with %u peers\n", session->num_peers);
compute_global_id (session, &join_msg->session_id);
- /* check if some local client already owns the session.
- * it is only legal to have a session with an existing global id
- * if all other sessions with this global id are finished.*/
+ /* Check if some local client already owns the session.
+ It is only legal to have a session with an existing global id
+ if all other sessions with this global id are finished.*/
other_session = sessions_head;
while (NULL != other_session)
{
if ((other_session != session) &&
(0 == GNUNET_CRYPTO_hash_cmp (&session->global_id, &other_session->global_id)))
{
- if (CONSENSUS_ROUND_FINISH != other_session->current_round)
- {
- GNUNET_break (0);
- destroy_session (session);
- return;
- }
+ //if (CONSENSUS_ROUND_FINISH != other_session->current_round)
+ //{
+ // GNUNET_break (0);
+ // destroy_session (session);
+ // return;
+ //}
break;
}
other_session = other_session->next;
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);
+
session->local_peer_idx = get_peer_idx (&my_peer, session);
GNUNET_assert (-1 != session->local_peer_idx);
- session->element_set = GNUNET_SET_create (cfg, GNUNET_SET_OPERATION_UNION);
- GNUNET_assert (NULL != session->element_set);
session->set_listener = GNUNET_SET_listen (cfg, GNUNET_SET_OPERATION_UNION,
&session->global_id,
set_listen_cb, session);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "%d is the local peer\n", session->local_peer_idx);
+
+ session->setmap = GNUNET_CONTAINER_multihashmap_create (1, GNUNET_NO);
+ session->taskmap = GNUNET_CONTAINER_multihashmap_create (1, GNUNET_NO);
+ session->diffmap = GNUNET_CONTAINER_multihashmap_create (1, GNUNET_NO);
+ session->rfnmap = GNUNET_CONTAINER_multihashmap_create (1, GNUNET_NO);
+
+ {
+ struct SetEntry *client_set;
+ client_set = GNUNET_new (struct SetEntry);
+ client_set->h = GNUNET_SET_create (cfg, GNUNET_SET_OPERATION_UNION);
+ client_set->key = ((struct SetKey) { SET_KIND_CURRENT, 0, 0 });
+ put_set (session, client_set);
+ }
+
+ session->peers_blacklisted = GNUNET_new_array (session->num_peers, int);
+
+ /* Just construct the task graph,
+ but don't run anything until the client calls conclude. */
+ construct_task_graph (session);
+
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "session %s initialized\n", GNUNET_h2s (&session->global_id));
}
}
+static void
+client_insert_done (void *cls)
+{
+ // FIXME: implement
+}
+
+
/**
* Called when a client performs an insert operation.
*
struct GNUNET_CONSENSUS_ElementMessage *msg;
struct GNUNET_SET_Element *element;
ssize_t element_size;
+ struct GNUNET_SET_Handle *initial_set;
session = get_session_by_client (client);
return;
}
- if (CONSENSUS_ROUND_BEGIN != session->current_round)
+ if (GNUNET_YES == session->conclude_started)
{
GNUNET_break (0);
GNUNET_SERVER_client_disconnect (client);
}
element = GNUNET_malloc (sizeof (struct GNUNET_SET_Element) + element_size);
- element->type = msg->element_type;
+ element->element_type = msg->element_type;
element->size = element_size;
memcpy (&element[1], &msg[1], element_size);
element->data = &element[1];
- GNUNET_SET_add_element (session->element_set, element, NULL, NULL);
+ {
+ struct SetKey key = { SET_KIND_CURRENT, 0, 0 };
+ struct SetEntry *entry;
+ entry = lookup_set (session, &key);
+ GNUNET_assert (NULL != entry);
+ initial_set = entry->h;
+ }
+ session->num_client_insert_pending++;
+ GNUNET_SET_add_element (initial_set, element, client_insert_done, session);
+
+#ifdef GNUNET_EXTRA_LOGGING
+ {
+ struct GNUNET_HashCode hash;
+
+ GNUNET_SET_element_hash (element, &hash);
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "P%u: element %s added\n",
+ session->local_peer_idx,
+ GNUNET_h2s (&hash));
+ }
+#endif
+
GNUNET_free (element);
GNUNET_SERVER_receive_done (client, GNUNET_OK);
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "P%u: element added\n", session->local_peer_idx);
}
{
struct ConsensusSession *session;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "conclude requested\n");
session = get_session_by_client (client);
if (NULL == session)
{
GNUNET_SERVER_client_disconnect (client);
return;
}
- if (CONSENSUS_ROUND_BEGIN != session->current_round)
+
+ if (GNUNET_YES == session->conclude_started)
{
- /* client requested conclude twice */
+ /* conclude started twice */
GNUNET_break (0);
+ GNUNET_SERVER_client_disconnect (client);
+ destroy_session (session);
return;
}
- if (session->num_peers <= 1)
- {
- session->current_round = CONSENSUS_ROUND_FINISH;
- GNUNET_SET_iterate (session->element_set, send_to_client_iter, session);
- }
- else
- {
- /* the 'begin' round is over, start with the next, actual round */
- round_over (session, NULL);
- }
- GNUNET_assert (CONSENSUS_ROUND_BEGIN != session->current_round);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "conclude requested\n");
+
+ session->conclude_started = GNUNET_YES;
+
+ install_step_timeouts (session);
+ run_ready_steps (session);
+
+
GNUNET_SERVER_receive_done (client, GNUNET_OK);
}
session = get_session_by_client (client);
if (NULL == session)
return;
- if ((CONSENSUS_ROUND_BEGIN == session->current_round) ||
- (CONSENSUS_ROUND_FINISH == session->current_round))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "client disconnected, destroying session\n");
- destroy_session (session);
- }
- else
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "client disconnected, but waiting for consensus to finish\n");
+ // FIXME: destroy if we can
}
+
/**
* Start processing consensus requests.
*