/*
This file is part of GNUnet
- Copyright (C) 2012, 2013 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2012, 2013, 2017 GNUnet e.V.
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
#include "platform.h"
#include "gnunet_util_lib.h"
+#include "gnunet_block_lib.h"
#include "gnunet_protocols.h"
#include "gnunet_applications.h"
#include "gnunet_set_service.h"
+#include "gnunet_statistics_service.h"
#include "gnunet_consensus_service.h"
#include "consensus_protocol.h"
#include "consensus.h"
-#define ELEMENT_TYPE_CONTESTED_MARKER (GNUNET_CONSENSUS_ELEMENT_TYPE_USER_MAX + 1)
-
-
enum ReferendumVote
{
/**
};
-GNUNET_NETWORK_STRUCT_BEGIN
-
-
-struct ContestedPayload
+enum EarlyStoppingPhase
{
+ EARLY_STOPPING_NONE = 0,
+ EARLY_STOPPING_ONE_MORE = 1,
+ EARLY_STOPPING_DONE = 2,
};
+
+GNUNET_NETWORK_STRUCT_BEGIN
+
/**
* Tuple of integers that together
* identify a task uniquely.
enum PhaseKind
{
PHASE_KIND_ALL_TO_ALL,
+ PHASE_KIND_ALL_TO_ALL_2,
PHASE_KIND_GRADECAST_LEADER,
PHASE_KIND_GRADECAST_ECHO,
PHASE_KIND_GRADECAST_ECHO_GRADE,
{
SET_KIND_NONE = 0,
SET_KIND_CURRENT,
+ /**
+ * Last result set from a gradecast
+ */
+ SET_KIND_LAST_GRADECAST,
SET_KIND_LEADER_PROPOSAL,
SET_KIND_ECHO_RESULT,
};
struct ConsensusSession *session;
+ /**
+ * Tasks that this step is composed of.
+ */
struct TaskEntry **tasks;
unsigned int tasks_len;
unsigned int tasks_cap;
* the task, used for debugging.
*/
char *debug_name;
+
+ /**
+ * When we're doing an early finish, how should this step be
+ * treated?
+ * If GNUNET_YES, the step will be marked as finished
+ * without actually running its tasks.
+ * Otherwise, the step will still be run even after
+ * an early finish.
+ *
+ * Note that a task may never be finished early if
+ * it is already running.
+ */
+ int early_finishable;
};
/**
* Client that inhabits the session
*/
- struct GNUNET_SERVER_Client *client;
+ struct GNUNET_SERVICE_Client *client;
/**
* Queued messages to the client.
* Uses the session's global id as app id.
*/
struct GNUNET_SET_ListenHandle *set_listener;
+
+ /**
+ * State of our early stopping scheme.
+ */
+ int early_stopping;
+
+ /**
+ * Our set size from the first round.
+ */
+ uint64_t first_size;
+
+ uint64_t *first_sizes_received;
+
+ /**
+ * Bounded Eppstein lower bound.
+ */
+ uint64_t lower_bound;
};
/**
static const struct GNUNET_CONFIGURATION_Handle *cfg;
/**
- * Handle to the server for this service.
+ * Peer that runs this service.
*/
-static struct GNUNET_SERVER_Handle *srv;
+static struct GNUNET_PeerIdentity my_peer;
/**
- * Peer that runs this service.
+ * Statistics handle.
*/
-static struct GNUNET_PeerIdentity my_peer;
+struct GNUNET_STATISTICS_Handle *statistics;
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_ALL_TO_ALL_2: return "ALL_TO_ALL_2";
case PHASE_KIND_FINISH: return "FINISH";
case PHASE_KIND_GRADECAST_LEADER: return "GRADECAST_LEADER";
case PHASE_KIND_GRADECAST_ECHO: return "GRADECAST_ECHO";
#endif /* GNUNET_EXTRA_LOGGING */
-/**
- * Destroy a session, free all resources associated with it.
- *
- * @param session the session to destroy
- */
-static void
-destroy_session (struct ConsensusSession *session)
-{
- GNUNET_CONTAINER_DLL_remove (sessions_head, sessions_tail, session);
- if (NULL != session->set_listener)
- {
- GNUNET_SET_listen_cancel (session->set_listener);
- session->set_listener = NULL;
- }
- if (NULL != session->client_mq)
- {
- 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;
- }
- GNUNET_free (session);
-}
-
-
/**
* Send the final result set of the consensus to the client, element by
* element.
if (NULL != element)
{
struct GNUNET_CONSENSUS_ElementMessage *m;
+ const struct ConsensusElement *ce;
+
+ GNUNET_assert (GNUNET_BLOCK_TYPE_CONSENSUS_ELEMENT == element->element_type);
+ ce = element->data;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "marker is %u\n", (unsigned) ce->marker);
+
+ if (0 != ce->marker)
+ return GNUNET_YES;
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,
+ ev = GNUNET_MQ_msg_extra (m, element->size - sizeof (struct ConsensusElement),
GNUNET_MESSAGE_TYPE_CONSENSUS_CLIENT_RECEIVED_ELEMENT);
- m->element_type = htons (element->element_type);
- memcpy (&m[1], element->data, element->size);
+ m->element_type = ce->payload_type;
+ GNUNET_memcpy (&m[1], &ce[1], element->size - sizeof (struct ConsensusElement));
GNUNET_MQ_send (session->client_mq, ev);
}
else
return ret;
}
+
static void
rfn_vote (struct ReferendumEntry *rfn,
uint16_t voting_peer,
}
-uint16_t
+static uint16_t
task_other_peer (struct TaskEntry *task)
{
uint16_t me = task->step->session->local_peer_idx;
}
+static int
+cmp_uint64_t (const void *pa, const void *pb)
+{
+ uint64_t a = *(uint64_t *) pa;
+ uint64_t b = *(uint64_t *) pb;
+
+ if (a == b)
+ return 0;
+ if (a < b)
+ return -1;
+ return 1;
+}
+
+
/**
* 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 current_size current set size
* @param status see enum GNUNET_SET_Status
*/
static void
set_result_cb (void *cls,
const struct GNUNET_SET_Element *element,
+ uint64_t current_size,
enum GNUNET_SET_Status status)
{
struct TaskEntry *task = cls;
struct ReferendumEntry *output_rfn = NULL;
unsigned int other_idx;
struct SetOpCls *setop;
+ const struct ConsensusElement *consensus_element = NULL;
+
+ if (NULL != element)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "P%u: got element of type %u, status %u\n",
+ session->local_peer_idx,
+ (unsigned) element->element_type,
+ (unsigned) status);
+ GNUNET_assert (GNUNET_BLOCK_TYPE_CONSENSUS_ELEMENT == element->element_type);
+ consensus_element = element->data;
+ }
setop = &task->cls.setop;
-
+
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"P%u: got set result for {%s}, status %u\n",
session->local_peer_idx,
return;
}
- if ( (GNUNET_SET_STATUS_ADD_LOCAL == status) || (GNUNET_SET_STATUS_ADD_REMOTE == status) )
+ if ( (NULL != consensus_element) && (0 != consensus_element->marker) )
{
- if ( (GNUNET_YES == setop->transceive_contested) && (ELEMENT_TYPE_CONTESTED_MARKER == element->element_type) )
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "P%u: got some marker\n",
+ session->local_peer_idx);
+ if ( (GNUNET_YES == setop->transceive_contested) &&
+ (CONSENSUS_MARKER_CONTESTED == consensus_element->marker) )
{
GNUNET_assert (NULL != output_rfn);
rfn_contest (output_rfn, task_other_peer (task));
return;
}
+
+ if (CONSENSUS_MARKER_SIZE == consensus_element->marker)
+ {
+
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "P%u: got size marker\n",
+ session->local_peer_idx);
+
+
+ struct ConsensusSizeElement *cse = (void *) consensus_element;
+
+ if (cse->sender_index == other_idx)
+ {
+ if (NULL == session->first_sizes_received)
+ session->first_sizes_received = GNUNET_new_array (session->num_peers, uint64_t);
+ session->first_sizes_received[other_idx] = GNUNET_ntohll (cse->size);
+
+ uint64_t *copy = GNUNET_memdup (session->first_sizes_received, sizeof (uint64_t) * session->num_peers);
+ qsort (copy, session->num_peers, sizeof (uint64_t), cmp_uint64_t);
+ session->lower_bound = copy[session->num_peers / 3 + 1];
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "P%u: lower bound %llu\n",
+ session->local_peer_idx,
+ (long long) session->lower_bound);
+ }
+ return;
+ }
+
+ return;
}
switch (status)
{
case GNUNET_SET_STATUS_ADD_LOCAL:
+ GNUNET_assert (NULL != consensus_element);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Adding element in Task {%s}\n",
debug_str_task_key (&task->key));
// XXX: add result to structures in task
break;
case GNUNET_SET_STATUS_ADD_REMOTE:
+ GNUNET_assert (NULL != consensus_element);
if (GNUNET_YES == setop->do_not_remove)
break;
- if (ELEMENT_TYPE_CONTESTED_MARKER == element->element_type)
+ if (CONSENSUS_MARKER_CONTESTED == consensus_element->marker)
break;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Removing element in Task {%s}\n",
{
rfn_commit (output_rfn, task_other_peer (task));
}
+ if (PHASE_KIND_ALL_TO_ALL == task->key.kind)
+ {
+ session->first_size = current_size;
+ }
finish_task (task);
break;
case GNUNET_SET_STATUS_FAILURE:
#ifdef EVIL
-enum Evilness
+enum EvilnessType
{
EVILNESS_NONE,
- EVILNESS_CRAM,
+ EVILNESS_CRAM_ALL,
+ EVILNESS_CRAM_LEAD,
+ EVILNESS_CRAM_ECHO,
EVILNESS_SLACK,
+ EVILNESS_SLACK_A2A,
};
+enum EvilnessSubType
+{
+ EVILNESS_SUB_NONE,
+ EVILNESS_SUB_REPLACEMENT,
+ EVILNESS_SUB_NO_REPLACEMENT,
+};
+
+struct Evilness
+{
+ enum EvilnessType type;
+ enum EvilnessSubType subtype;
+ unsigned int num;
+};
+
+
+static int
+parse_evilness_cram_subtype (const char *evil_subtype_str, struct Evilness *evil)
+{
+ if (0 == strcmp ("replace", evil_subtype_str))
+ {
+ evil->subtype = EVILNESS_SUB_REPLACEMENT;
+ }
+ else if (0 == strcmp ("noreplace", evil_subtype_str))
+ {
+ evil->subtype = EVILNESS_SUB_NO_REPLACEMENT;
+ }
+ else
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Malformed field '%s' in EVIL_SPEC (unknown subtype), behaving like a good peer.\n",
+ evil_subtype_str);
+ return GNUNET_SYSERR;
+ }
+ return GNUNET_OK;
+}
+
+
static void
-get_evilness (struct ConsensusSession *session, enum Evilness *ret_type, unsigned int *ret_num)
+get_evilness (struct ConsensusSession *session, struct Evilness *evil)
{
char *evil_spec;
char *field;
char *evil_type_str = NULL;
+ char *evil_subtype_str = NULL;
+
+ GNUNET_assert (NULL != evil);
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;
+ evil->type = EVILNESS_NONE;
return;
}
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
int ret;
evil_type_str = NULL;
+ evil_subtype_str = NULL;
- ret = sscanf (field, "%u;%m[a-z];%u", &peer_num, &evil_type_str, &evil_num);
+ ret = sscanf (field, "%u;%m[a-z-];%m[a-z-];%u", &peer_num, &evil_type_str, &evil_subtype_str, &evil_num);
- if (ret != 3)
+ if (ret != 4)
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Malformed field '%s' in EVIL_SPEC, behaving like a good peer.\n",
- field);
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Malformed field '%s' in EVIL_SPEC (expected 4 components got %d), behaving like a good peer.\n",
+ field,
+ ret);
goto not_evil;
}
GNUNET_assert (NULL != evil_type_str);
+ GNUNET_assert (NULL != evil_subtype_str);
if (peer_num == session->local_peer_idx)
{
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;
+ evil->type = EVILNESS_SLACK;
+ }
+ if (0 == strcmp ("slack-a2a", evil_type_str))
+ {
+ evil->type = EVILNESS_SLACK_A2A;
+ }
+ else if (0 == strcmp ("cram-all", evil_type_str))
+ {
+ evil->type = EVILNESS_CRAM_ALL;
+ evil->num = evil_num;
+ if (GNUNET_OK != parse_evilness_cram_subtype (evil_subtype_str, evil))
+ goto not_evil;
+ }
+ else if (0 == strcmp ("cram-lead", evil_type_str))
+ {
+ evil->type = EVILNESS_CRAM_LEAD;
+ evil->num = evil_num;
+ if (GNUNET_OK != parse_evilness_cram_subtype (evil_subtype_str, evil))
+ goto not_evil;
+ }
+ else if (0 == strcmp ("cram-echo", evil_type_str))
+ {
+ evil->type = EVILNESS_CRAM_ECHO;
+ evil->num = evil_num;
+ if (GNUNET_OK != parse_evilness_cram_subtype (evil_subtype_str, evil))
+ goto not_evil;
}
else
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Malformed field '%s' in EVIL_SPEC (unknown type), behaving like a good peer.\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Malformed field '%s' in EVIL_SPEC (unknown type), behaving like a good peer.\n",
+ evil_type_str);
goto not_evil;
}
goto cleanup;
/* No GNUNET_free since memory was allocated by libc */
free (evil_type_str);
evil_type_str = NULL;
+ evil_subtype_str = NULL;
}
not_evil:
- *ret_type = EVILNESS_NONE;
+ evil->type = EVILNESS_NONE;
cleanup:
GNUNET_free (evil_spec);
+ /* no GNUNET_free_non_null since it wasn't
+ * allocated with GNUNET_malloc */
if (NULL != evil_type_str)
free (evil_type_str);
+ if (NULL != evil_subtype_str)
+ free (evil_subtype_str);
}
#endif
set = lookup_set (session, &setop->input_set);
GNUNET_assert (NULL != set);
+ if ( (GNUNET_YES == setop->transceive_contested) && (GNUNET_YES == set->is_contested) )
+ {
+ struct GNUNET_SET_Element element;
+ struct ConsensusElement ce = { 0 };
+ ce.marker = CONSENSUS_MARKER_CONTESTED;
+ element.data = &ce;
+ element.size = sizeof (struct ConsensusElement);
+ element.element_type = GNUNET_BLOCK_TYPE_CONSENSUS_ELEMENT;
+ GNUNET_SET_add_element (set->h, &element, NULL, NULL);
+ }
+
+ if (PHASE_KIND_ALL_TO_ALL_2 == task->key.kind)
+ {
+ struct GNUNET_SET_Element element;
+ struct ConsensusSizeElement cse = { 0 };
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "inserting size marker\n");
+ cse.ce.marker = CONSENSUS_MARKER_SIZE;
+ cse.size = GNUNET_htonll (session->first_size);
+ cse.sender_index = session->local_peer_idx;
+ element.data = &cse;
+ element.size = sizeof (struct ConsensusSizeElement);
+ element.element_type = GNUNET_BLOCK_TYPE_CONSENSUS_ELEMENT;
+ GNUNET_SET_add_element (set->h, &element, NULL, NULL);
+ }
+
#ifdef EVIL
{
unsigned int i;
- unsigned int evil_num;
- enum Evilness evilness;
+ struct Evilness evil;
- get_evilness (session, &evilness, &evil_num);
- switch (evilness)
+ get_evilness (session, &evil);
+ if (EVILNESS_NONE != evil.type)
+ {
+ /* Useful for evaluation */
+ GNUNET_STATISTICS_set (statistics,
+ "is evil",
+ 1,
+ GNUNET_NO);
+ }
+ switch (evil.type)
{
- case EVILNESS_CRAM:
+ case EVILNESS_CRAM_ALL:
+ case EVILNESS_CRAM_LEAD:
+ case EVILNESS_CRAM_ECHO:
/* We're not cramming elements in the
all-to-all round, since that would just
add more elements to the result set, but
GNUNET_SET_commit (setop->op, set->h);
break;
}
- for (i = 0; i < evil_num; i++)
+ if ((EVILNESS_CRAM_LEAD == evil.type) &&
+ ((PHASE_KIND_GRADECAST_LEADER != task->key.kind) || SET_KIND_CURRENT != set->key.set_kind))
+ {
+ GNUNET_SET_commit (setop->op, set->h);
+ break;
+ }
+ if (EVILNESS_CRAM_ECHO == evil.type && (PHASE_KIND_GRADECAST_ECHO != 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);
+ struct ConsensusStuffedElement se = { 0 };
+ element.data = &se;
+ element.size = sizeof (struct ConsensusStuffedElement);
+ element.element_type = GNUNET_BLOCK_TYPE_CONSENSUS_ELEMENT;
+
+ if (EVILNESS_SUB_REPLACEMENT == evil.subtype)
+ {
+ /* Always generate a new element. */
+ GNUNET_CRYPTO_hash_create_random (GNUNET_CRYPTO_QUALITY_WEAK, &se.rand);
+ }
+ else if (EVILNESS_SUB_NO_REPLACEMENT == evil.subtype)
+ {
+ /* Always cram the same elements, derived from counter. */
+ GNUNET_CRYPTO_hash (&i, sizeof (i), &se.rand);
+ }
+ else
+ {
+ GNUNET_assert (0);
+ }
GNUNET_SET_add_element (set->h, &element, NULL, NULL);
#ifdef GNUNET_EXTRA_LOGGING
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
debug_str_task_key (&task->key));
#endif
}
+ GNUNET_STATISTICS_update (statistics,
+ "# stuffed elements",
+ evil.num,
+ GNUNET_NO);
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);
+ (unsigned int) session->local_peer_idx);
/* Do nothing. */
+ case EVILNESS_SLACK_A2A:
+ if ( (PHASE_KIND_ALL_TO_ALL_2 == task->key.kind ) ||
+ (PHASE_KIND_ALL_TO_ALL == task->key.kind) )
+ {
+ struct GNUNET_SET_Handle *empty_set;
+ empty_set = GNUNET_SET_create (cfg, GNUNET_SET_OPERATION_UNION);
+ GNUNET_SET_commit (setop->op, empty_set);
+ GNUNET_SET_destroy (empty_set);
+ }
+ else
+ {
+ GNUNET_SET_commit (setop->op, set->h);
+ }
break;
case EVILNESS_NONE:
GNUNET_SET_commit (setop->op, set->h);
}
}
#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);
debug_str_set_key (&set->key));
GNUNET_CRYPTO_hash (&set->key, sizeof (struct SetKey), &hash);
- GNUNET_assert (GNUNET_OK ==
+ GNUNET_assert (GNUNET_SYSERR !=
GNUNET_CONTAINER_multihashmap_put (session->setmap, &hash, set,
- GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_REPLACE));
}
struct DiffEntry *d = GNUNET_new (struct DiffEntry);
d->changes = GNUNET_CONTAINER_multihashmap_create (8, GNUNET_NO);
-
+
return d;
}
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);
}
-void
+#if UNUSED
+static void
diff_destroy (struct DiffEntry *diff)
{
GNUNET_CONTAINER_multihashmap_destroy (diff->changes);
GNUNET_free (diff);
}
+#endif
+/**
+ * For a given majority, count what the outcome
+ * is (add/remove/keep), and give the number
+ * of peers that voted for this outcome.
+ */
static void
rfn_majority (const struct ReferendumEntry *rfn,
const struct RfnElementInfo *ri,
}
}
+
+static void
+try_finish_step_early (struct Step *step)
+{
+ unsigned int i;
+
+ if (GNUNET_YES == step->is_running)
+ return;
+ if (GNUNET_YES == step->is_finished)
+ return;
+ if (GNUNET_NO == step->early_finishable)
+ return;
+
+ step->is_finished = GNUNET_YES;
+
+#ifdef GNUNET_EXTRA_LOGGING
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Finishing step `%s' early.\n",
+ step->debug_name);
+#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",
+ (unsigned int) step->subordinates[i]->pending_prereq,
+ step->subordinates[i]->debug_name);
+
+#endif
+ try_finish_step_early (step->subordinates[i]);
+ }
+
+ // XXX: maybe schedule as task to avoid recursion?
+ run_ready_steps (step->session);
+}
+
+
+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",
+ (unsigned int) 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);
+}
+
+
+
+/**
+ * Apply the result from one round of gradecasts (i.e. every peer
+ * should have gradecasted) to the peer's current set.
+ *
+ * @param task the task with context information
+ */
static void
task_start_apply_round (struct TaskEntry *task)
{
struct GNUNET_CONTAINER_MultiHashMapIterator *iter;
struct RfnElementInfo *ri;
struct SetMutationProgressCls *progress_cls;
+ uint16_t worst_majority = UINT16_MAX;
sk_in = (struct SetKey) { SET_KIND_CURRENT, task->key.repetition };
rk_in = (struct RfnKey) { RFN_KIND_GRADECAST_RESULT, task->key.repetition };
iter = GNUNET_CONTAINER_multihashmap_iterator_create (rfn_in->rfn_elements);
- while (GNUNET_YES == GNUNET_CONTAINER_multihashmap_iterator_next (iter, NULL, (const void **) &ri))
+ while (GNUNET_YES ==
+ GNUNET_CONTAINER_multihashmap_iterator_next (iter,
+ NULL,
+ (const void **) &ri))
{
uint16_t majority_num;
enum ReferendumVote majority_vote;
rfn_majority (rfn_in, ri, &majority_num, &majority_vote);
+ if (worst_majority > majority_num)
+ worst_majority = majority_num;
+
switch (majority_vote)
{
case VOTE_ADD:
GNUNET_assert (GNUNET_OK ==
GNUNET_SET_add_element (set_out->h,
ri->element,
- set_mutation_done,
+ &set_mutation_done,
progress_cls));
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "P%u: apply round: adding element %s with %u-majority.\n",
+ session->local_peer_idx,
+ debug_str_element (ri->element), majority_num);
break;
case VOTE_REMOVE:
progress_cls->num_pending++;
GNUNET_assert (GNUNET_OK ==
GNUNET_SET_remove_element (set_out->h,
ri->element,
- set_mutation_done,
+ &set_mutation_done,
progress_cls));
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "P%u: apply round: deleting element %s with %u-majority.\n",
+ session->local_peer_idx,
+ debug_str_element (ri->element), majority_num);
break;
case VOTE_STAY:
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "P%u: apply round: keeping element %s with %u-majority.\n",
+ session->local_peer_idx,
+ debug_str_element (ri->element), majority_num);
// do nothing
break;
default:
}
}
- if (progress_cls->num_pending == 0)
+ if (0 == progress_cls->num_pending)
{
// call closure right now, no pending ops
GNUNET_free (progress_cls);
finish_task (task);
}
-}
+ {
+ uint16_t thresh = (session->num_peers / 3) * 2;
-#define THRESH(s) (((s)->num_peers / 3))
+ if (worst_majority >= thresh)
+ {
+ switch (session->early_stopping)
+ {
+ case EARLY_STOPPING_NONE:
+ session->early_stopping = EARLY_STOPPING_ONE_MORE;
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "P%u: Stopping early (after one more superround)\n",
+ session->local_peer_idx);
+ break;
+ case EARLY_STOPPING_ONE_MORE:
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "P%u: finishing steps due to early finish\n",
+ session->local_peer_idx);
+ session->early_stopping = EARLY_STOPPING_DONE;
+ {
+ struct Step *step;
+ for (step = session->steps_head; NULL != step; step = step->next)
+ try_finish_step_early (step);
+ }
+ break;
+ case EARLY_STOPPING_DONE:
+ /* We shouldn't be here anymore after early stopping */
+ GNUNET_break (0);
+ break;
+ default:
+ GNUNET_assert (0);
+ break;
+ }
+ }
+ else if (EARLY_STOPPING_NONE != session->early_stopping)
+ {
+ // Our assumption about the number of bad peers
+ // has been broken.
+ GNUNET_break_op (0);
+ }
+ else
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "P%u: NOT finishing early (majority not good enough)\n",
+ session->local_peer_idx);
+ }
+ }
+ GNUNET_CONTAINER_multihashmap_iterator_destroy (iter);
+}
static void
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))
+ 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;
- }
+ if (majority_num <= session->num_peers / 3)
+ majority_vote = VOTE_REMOVE;
switch (majority_vote)
{
break;
}
}
+ GNUNET_CONTAINER_multihashmap_iterator_destroy (iter);
{
uint16_t noncontested;
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));
+ struct GNUNET_SET_Option opts[] = {
+ { GNUNET_SET_OPTION_BYZANTINE, { .num = session->lower_bound } },
+ { GNUNET_SET_OPTION_END },
+ };
+
// 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,
+ opts,
set_result_cb,
task);
- if (GNUNET_OK != GNUNET_SET_commit (setop->op, input->h))
- {
- GNUNET_break (0);
- /* XXX: cleanup? */
- return;
- }
+ commit_set (session, task);
}
else if (task->key.peer2 == session->local_peer_idx)
{
return;
}
+
+ {
+ // FIXME: should be marked as a shallow copy, so
+ // we can destroy everything correctly
+ struct SetEntry *last_set = GNUNET_new (struct SetEntry);
+ last_set->h = output_set->h;
+ last_set->key = (struct SetKey) { SET_KIND_LAST_GRADECAST };
+ put_set (session, last_set);
+ }
+
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Evaluating referendum in Task {%s}\n",
debug_str_task_key (&task->key));
GNUNET_CONTAINER_multihashmap_iterator_destroy (iter);
- if (progress_cls->num_pending == 0)
+ if (0 == progress_cls->num_pending)
{
// call closure right now, no pending ops
GNUNET_free (progress_cls);
}
-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);
-}
/*
while (NULL != step)
{
- if ( (GNUNET_NO == step->is_running) && (0 == step->pending_prereq) )
+ if ( (GNUNET_NO == step->is_running) && (0 == step->pending_prereq) && (GNUNET_NO == step->is_finished) )
{
size_t i;
/**
* Create the sorted list of peers for the session,
* add the local peer if not in the join message.
+ *
+ * @param session session to initialize
+ * @param join_msg join message with the list of peers participating at the end
*/
static void
initialize_session_peer_list (struct ConsensusSession *session,
- struct GNUNET_CONSENSUS_JoinMessage *join_msg)
+ const struct GNUNET_CONSENSUS_JoinMessage *join_msg)
{
- unsigned int local_peer_in_list;
- uint32_t listed_peers;
- const struct GNUNET_PeerIdentity *msg_peers;
- unsigned int i;
-
- GNUNET_assert (NULL != join_msg);
+ const struct GNUNET_PeerIdentity *msg_peers
+ = (const struct GNUNET_PeerIdentity *) &join_msg[1];
+ int local_peer_in_list;
- /* peers in the join message, may or may not include the local peer */
- listed_peers = ntohl (join_msg->num_peers);
-
- session->num_peers = listed_peers;
-
- msg_peers = (struct GNUNET_PeerIdentity *) &join_msg[1];
+ session->num_peers = ntohl (join_msg->num_peers);
+ /* Peers in the join message, may or may not include the local peer,
+ Add it if it is missing. */
local_peer_in_list = GNUNET_NO;
- for (i = 0; i < listed_peers; i++)
+ for (unsigned int i = 0; i < session->num_peers; i++)
{
- if (0 == memcmp (&msg_peers[i], &my_peer, sizeof (struct GNUNET_PeerIdentity)))
+ if (0 == memcmp (&msg_peers[i],
+ &my_peer,
+ sizeof (struct GNUNET_PeerIdentity)))
{
local_peer_in_list = GNUNET_YES;
break;
}
}
-
if (GNUNET_NO == local_peer_in_list)
session->num_peers++;
- session->peers = GNUNET_malloc (session->num_peers * sizeof (struct GNUNET_PeerIdentity));
-
+ session->peers = GNUNET_new_array (session->num_peers,
+ struct GNUNET_PeerIdentity);
if (GNUNET_NO == local_peer_in_list)
session->peers[session->num_peers - 1] = my_peer;
- memcpy (session->peers, msg_peers, listed_peers * sizeof (struct GNUNET_PeerIdentity));
- qsort (session->peers, session->num_peers, sizeof (struct GNUNET_PeerIdentity), &peer_id_cmp);
+ GNUNET_memcpy (session->peers,
+ msg_peers,
+ ntohl (join_msg->num_peers) * sizeof (struct GNUNET_PeerIdentity));
+ qsort (session->peers,
+ session->num_peers,
+ sizeof (struct GNUNET_PeerIdentity),
+ &peer_id_cmp);
}
GNUNET_assert (! ((task->key.peer1 == session->local_peer_idx) &&
(task->key.peer2 == session->local_peer_idx)));
+ struct GNUNET_SET_Option opts[] = {
+ { GNUNET_SET_OPTION_BYZANTINE, { .num = session->lower_bound } },
+ { GNUNET_SET_OPTION_END },
+ };
+
task->cls.setop.op = GNUNET_SET_accept (request,
GNUNET_SET_RESULT_SYMMETRIC,
+ opts,
set_result_cb,
task);
-
- /* If the task hasn't been started yet,
+
+ /* If the task hasn't been started yet,
we wait for that until we commit. */
if (GNUNET_YES == task->is_started)
/* Given the fully constructed task graph
with rounds for tasks, we can give the tasks timeouts. */
+ // unsigned int max_round;
+
/* XXX: implement! */
}
/**
- * Record @a dep as a dependency of @step.
+ * Record @a dep as a dependency of @a step.
*/
static void
step_depend_on (struct Step *step, struct Step *dep)
static struct Step *
-create_step (struct ConsensusSession *session, int round)
+create_step (struct ConsensusSession *session, int round, int early_finishable)
{
struct Step *step;
step = GNUNET_new (struct Step);
step->session = session;
step->round = round;
+ step->early_finishable = early_finishable;
GNUNET_CONTAINER_DLL_insert_tail (session->steps_head,
session->steps_tail,
step);
/* gcast step 1: leader disseminates */
- step = create_step (session, round);
+ step = create_step (session, round, GNUNET_YES);
#ifdef GNUNET_EXTRA_LOGGING
GNUNET_asprintf (&step->debug_name, "disseminate leader %u rep %u", lead, rep);
arrange_peers (&p1, &p2, n);
task = ((struct TaskEntry) {
.step = step,
- .key = (struct TaskKey) { PHASE_KIND_GRADECAST_LEADER, p1, p2, rep, lead},
+ .key = (struct TaskKey) { PHASE_KIND_GRADECAST_LEADER, p1, p2, rep, lead },
.start = task_start_reconcile,
.cancel = task_cancel_reconcile,
});
/* gcast phase 2: echo */
prev_step = step;
round += 1;
- step = create_step (session, round);
+ step = create_step (session, round, GNUNET_YES);
#ifdef GNUNET_EXTRA_LOGGING
GNUNET_asprintf (&step->debug_name, "echo leader %u rep %u", lead, rep);
#endif
prev_step = step;
/* Same round, since step only has local tasks */
- step = create_step (session, round);
+ step = create_step (session, round, GNUNET_YES);
#ifdef GNUNET_EXTRA_LOGGING
GNUNET_asprintf (&step->debug_name, "echo grade leader %u rep %u", lead, rep);
#endif
prev_step = step;
round += 1;
- step = create_step (session, round);
+ step = create_step (session, round, GNUNET_YES);
#ifdef GNUNET_EXTRA_LOGGING
GNUNET_asprintf (&step->debug_name, "confirm leader %u rep %u", lead, rep);
#endif
prev_step = step;
/* Same round, since step only has local tasks */
- step = create_step (session, round);
+ step = create_step (session, round, GNUNET_YES);
#ifdef GNUNET_EXTRA_LOGGING
GNUNET_asprintf (&step->debug_name, "confirm grade leader %u rep %u", lead, rep);
#endif
uint16_t me = session->local_peer_idx;
- uint16_t p1;
- uint16_t p2;
-
/* The task we're currently setting up. */
struct TaskEntry task;
// 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);
+ step = create_step (session, round, GNUNET_NO);
#ifdef GNUNET_EXTRA_LOGGING
step->debug_name = GNUNET_strdup ("all to all");
for (i = 0; i < n; i++)
{
+ uint16_t p1;
+ uint16_t p2;
+
p1 = me;
p2 = i;
arrange_peers (&p1, &p2, n);
put_task (session->taskmap, &task);
}
+ round += 1;
prev_step = step;
- step = NULL;
+ step = create_step (session, round, GNUNET_NO);;
+#ifdef GNUNET_EXTRA_LOGGING
+ step->debug_name = GNUNET_strdup ("all to all 2");
+#endif
+ step_depend_on (step, prev_step);
+
+
+ for (i = 0; i < n; i++)
+ {
+ uint16_t p1;
+ uint16_t p2;
+
+ p1 = me;
+ p2 = i;
+ arrange_peers (&p1, &p2, n);
+ task = ((struct TaskEntry) {
+ .key = (struct TaskKey) { PHASE_KIND_ALL_TO_ALL_2, 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);
+ }
round += 1;
+ prev_step = step;
+ step = NULL;
+
+
+
/* Byzantine union */
/* sequential repetitions of the gradecasts */
struct Step *step_rep_end;
/* Every repetition is in a separate round. */
- step_rep_start = create_step (session, round);
+ step_rep_start = create_step (session, round, GNUNET_YES);
#ifdef GNUNET_EXTRA_LOGGING
GNUNET_asprintf (&step_rep_start->debug_name, "gradecast start rep %u", i);
#endif
/* gradecast has three rounds */
round += 3;
- step_rep_end = create_step (session, round);
+ step_rep_end = create_step (session, round, GNUNET_YES);
#ifdef GNUNET_EXTRA_LOGGING
GNUNET_asprintf (&step_rep_end->debug_name, "gradecast end rep %u", i);
#endif
/* 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);
+ step = create_step (session, round, GNUNET_NO);
#ifdef GNUNET_EXTRA_LOGGING
GNUNET_asprintf (&step->debug_name, "finish");
#endif
.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 };
+ task.cls.finish.input_set = (struct SetKey) { SET_KIND_LAST_GRADECAST };
put_task (session->taskmap, &task);
}
+
+/**
+ * Check join message.
+ *
+ * @param cls session of client that sent the message
+ * @param m message sent by the client
+ * @return #GNUNET_OK if @a m is well-formed
+ */
+static int
+check_client_join (void *cls,
+ const struct GNUNET_CONSENSUS_JoinMessage *m)
+{
+ uint32_t listed_peers = ntohl (m->num_peers);
+
+ if ( (ntohs (m->header.size) - sizeof (*m)) !=
+ listed_peers * sizeof (struct GNUNET_PeerIdentity))
+ {
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
+ }
+ return GNUNET_OK;
+}
+
+
/**
- * Initialize the session, continue receiving messages from the owning client
+ * Called when a client wants to join a consensus session.
*
- * @param session the session to initialize
- * @param join_msg the join message from the client
+ * @param cls session of client that sent the message
+ * @param m message sent by the client
*/
static void
-initialize_session (struct ConsensusSession *session,
- struct GNUNET_CONSENSUS_JoinMessage *join_msg)
+handle_client_join (void *cls,
+ const struct GNUNET_CONSENSUS_JoinMessage *m)
{
+ struct ConsensusSession *session = cls;
struct ConsensusSession *other_session;
- initialize_session_peer_list (session, join_msg);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "session with %u peers\n", session->num_peers);
- compute_global_id (session, &join_msg->session_id);
+ initialize_session_peer_list (session,
+ m);
+ compute_global_id (session,
+ &m->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.*/
- other_session = sessions_head;
- while (NULL != other_session)
+ for (other_session = sessions_head;
+ NULL != other_session;
+ other_session = other_session->next)
{
- 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 ( (other_session != session) &&
+ (0 == GNUNET_CRYPTO_hash_cmp (&session->global_id,
+ &other_session->global_id)) )
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);
+ session->conclude_deadline
+ = GNUNET_TIME_absolute_ntoh (m->deadline);
+ session->conclude_start
+ = GNUNET_TIME_absolute_ntoh (m->start);
+ session->local_peer_idx = get_peer_idx (&my_peer,
+ session);
GNUNET_assert (-1 != session->local_peer_idx);
- 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);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Joining consensus session %s containing %u peers as %u with timeout %s\n",
+ GNUNET_h2s (&m->session_id),
+ session->num_peers,
+ session->local_peer_idx,
+ GNUNET_STRINGS_relative_time_to_string
+ (GNUNET_TIME_absolute_get_difference (session->conclude_start,
+ session->conclude_deadline),
+ GNUNET_YES));
+
+ session->set_listener
+ = GNUNET_SET_listen (cfg,
+ GNUNET_SET_OPERATION_UNION,
+ &session->global_id,
+ &set_listen_cb,
+ session);
+
+ 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->h = GNUNET_SET_create (cfg,
+ GNUNET_SET_OPERATION_UNION);
client_set->key = ((struct SetKey) { SET_KIND_CURRENT, 0, 0 });
- put_set (session, client_set);
+ put_set (session,
+ client_set);
}
- session->peers_blacklisted = GNUNET_new_array (session->num_peers, int);
+ 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));
+ GNUNET_SERVICE_client_continue (session->client);
}
-static struct ConsensusSession *
-get_session_by_client (struct GNUNET_SERVER_Client *client)
+static void
+client_insert_done (void *cls)
{
- struct ConsensusSession *session;
-
- session = sessions_head;
- while (NULL != session)
- {
- if (session->client == client)
- return session;
- session = session->next;
- }
- return NULL;
+ // FIXME: implement
}
/**
- * Called when a client wants to join a consensus session.
+ * Called when a client performs an insert operation.
*
- * @param cls unused
- * @param client client that sent the message
- * @param m message sent by the client
+ * @param cls client handle
+ * @param msg message sent by the client
+ * @return #GNUNET_OK (always well-formed)
*/
-static void
-client_join (void *cls,
- struct GNUNET_SERVER_Client *client,
- const struct GNUNET_MessageHeader *m)
-{
- struct ConsensusSession *session;
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "join message sent by client\n");
-
- session = get_session_by_client (client);
- if (NULL != session)
- {
- GNUNET_break (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- return;
- }
- session = GNUNET_new (struct ConsensusSession);
- session->client = client;
- session->client_mq = GNUNET_MQ_queue_for_server_client (client);
- GNUNET_CONTAINER_DLL_insert (sessions_head, sessions_tail, session);
- initialize_session (session, (struct GNUNET_CONSENSUS_JoinMessage *) m);
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "join done\n");
-}
-
-
-static void
-client_insert_done (void *cls)
+static int
+check_client_insert (void *cls,
+ const struct GNUNET_CONSENSUS_ElementMessage *msg)
{
- // FIXME: implement
+ return GNUNET_OK;
}
/**
* Called when a client performs an insert operation.
*
- * @param cls (unused)
- * @param client client handle
- * @param m message sent by the client
+ * @param cls client handle
+ * @param msg message sent by the client
*/
-void
-client_insert (void *cls,
- struct GNUNET_SERVER_Client *client,
- const struct GNUNET_MessageHeader *m)
+static void
+handle_client_insert (void *cls,
+ const struct GNUNET_CONSENSUS_ElementMessage *msg)
{
- struct ConsensusSession *session;
- struct GNUNET_CONSENSUS_ElementMessage *msg;
- struct GNUNET_SET_Element *element;
+ struct ConsensusSession *session = cls;
ssize_t element_size;
struct GNUNET_SET_Handle *initial_set;
-
- session = get_session_by_client (client);
-
- if (NULL == session)
- {
- GNUNET_break (0);
- GNUNET_SERVER_client_disconnect (client);
- return;
- }
+ struct ConsensusElement *ce;
if (GNUNET_YES == session->conclude_started)
{
GNUNET_break (0);
- GNUNET_SERVER_client_disconnect (client);
+ GNUNET_SERVICE_client_drop (session->client);
return;
}
- msg = (struct GNUNET_CONSENSUS_ElementMessage *) m;
element_size = ntohs (msg->header.size) - sizeof (struct GNUNET_CONSENSUS_ElementMessage);
- if (element_size < 0)
- {
- GNUNET_break (0);
- return;
- }
+ ce = GNUNET_malloc (sizeof (struct ConsensusElement) + element_size);
+ GNUNET_memcpy (&ce[1], &msg[1], element_size);
+ ce->payload_type = msg->element_type;
+
+ struct GNUNET_SET_Element element = {
+ .element_type = GNUNET_BLOCK_TYPE_CONSENSUS_ELEMENT,
+ .size = sizeof (struct ConsensusElement) + element_size,
+ .data = ce,
+ };
- element = GNUNET_malloc (sizeof (struct GNUNET_SET_Element) + element_size);
- element->element_type = msg->element_type;
- element->size = element_size;
- memcpy (&element[1], &msg[1], element_size);
- element->data = &element[1];
{
struct SetKey key = { SET_KIND_CURRENT, 0, 0 };
struct SetEntry *entry;
- entry = lookup_set (session, &key);
+
+ 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);
+ 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",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "P%u: element %s added\n",
session->local_peer_idx,
- GNUNET_h2s (&hash));
+ debug_str_element (&element));
}
#endif
-
- GNUNET_free (element);
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ GNUNET_free (ce);
+ GNUNET_SERVICE_client_continue (session->client);
}
/**
* Called when a client performs the conclude operation.
*
- * @param cls (unused)
- * @param client client handle
+ * @param cls client handle
* @param message message sent by the client
*/
static void
-client_conclude (void *cls,
- struct GNUNET_SERVER_Client *client,
- const struct GNUNET_MessageHeader *message)
+handle_client_conclude (void *cls,
+ const struct GNUNET_MessageHeader *message)
{
- struct ConsensusSession *session;
-
- session = get_session_by_client (client);
- if (NULL == session)
- {
- /* client not found */
- GNUNET_break (0);
- GNUNET_SERVER_client_disconnect (client);
- return;
- }
+ struct ConsensusSession *session = cls;
if (GNUNET_YES == session->conclude_started)
{
/* conclude started twice */
GNUNET_break (0);
- GNUNET_SERVER_client_disconnect (client);
- destroy_session (session);
+ GNUNET_SERVICE_client_drop (session->client);
return;
}
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "conclude requested\n");
-
+ 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);
+ GNUNET_SERVICE_client_continue (session->client);
}
* Called to clean up, after a shutdown has been requested.
*
* @param cls closure
- * @param tc context information (why was this task triggered now)
*/
static void
-shutdown_task (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+shutdown_task (void *cls)
{
- while (NULL != sessions_head)
- destroy_session (sessions_head);
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "handled shutdown request\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "shutting down\n");
+ GNUNET_STATISTICS_destroy (statistics,
+ GNUNET_NO);
+ statistics = NULL;
}
-/**
- * Clean up after a client after it is
- * disconnected (either by us or by itself)
- *
- * @param cls closure, unused
- * @param client the client to clean up after
- */
-void
-handle_client_disconnect (void *cls, struct GNUNET_SERVER_Client *client)
-{
- struct ConsensusSession *session;
-
- session = get_session_by_client (client);
- if (NULL == session)
- return;
- // FIXME: destroy if we can
-}
-
-
-
/**
* Start processing consensus requests.
*
* @param cls closure
- * @param server the initialized server
* @param c configuration to use
+ * @param service the initialized service
*/
static void
-run (void *cls, struct GNUNET_SERVER_Handle *server,
- const struct GNUNET_CONFIGURATION_Handle *c)
-{
- static const struct GNUNET_SERVER_MessageHandler server_handlers[] = {
- {&client_conclude, NULL, GNUNET_MESSAGE_TYPE_CONSENSUS_CLIENT_CONCLUDE,
- sizeof (struct GNUNET_MessageHeader)},
- {&client_insert, NULL, GNUNET_MESSAGE_TYPE_CONSENSUS_CLIENT_INSERT, 0},
- {&client_join, NULL, GNUNET_MESSAGE_TYPE_CONSENSUS_CLIENT_JOIN, 0},
- {NULL, NULL, 0, 0}
- };
-
+run (void *cls,
+ const struct GNUNET_CONFIGURATION_Handle *c,
+ struct GNUNET_SERVICE_Handle *service)
+{
cfg = c;
- srv = server;
- if (GNUNET_OK != GNUNET_CRYPTO_get_peer_identity (cfg, &my_peer))
+ if (GNUNET_OK !=
+ GNUNET_CRYPTO_get_peer_identity (cfg,
+ &my_peer))
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "could not retrieve host identity\n");
- GNUNET_break (0);
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Could not retrieve host identity\n");
GNUNET_SCHEDULER_shutdown ();
return;
}
- GNUNET_SERVER_add_handlers (server, server_handlers);
- GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &shutdown_task, NULL);
- GNUNET_SERVER_disconnect_notify (server, handle_client_disconnect, NULL);
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "consensus running\n");
+ statistics = GNUNET_STATISTICS_create ("consensus",
+ cfg);
+ GNUNET_SCHEDULER_add_shutdown (&shutdown_task,
+ NULL);
}
/**
- * The main function for the consensus service.
+ * Callback called when a client connects to the service.
*
- * @param argc number of arguments from the command line
- * @param argv command line arguments
- * @return 0 ok, 1 on error
+ * @param cls closure for the service
+ * @param c the new client that connected to the service
+ * @param mq the message queue used to send messages to the client
+ * @return @a c
*/
-int
-main (int argc, char *const *argv)
+static void *
+client_connect_cb (void *cls,
+ struct GNUNET_SERVICE_Client *c,
+ struct GNUNET_MQ_Handle *mq)
{
- int ret;
- ret = GNUNET_SERVICE_run (argc, argv, "consensus", GNUNET_SERVICE_OPTION_NONE, &run, NULL);
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "exit (%d)\n", GNUNET_OK != ret);
- return (GNUNET_OK == ret) ? 0 : 1;
+ struct ConsensusSession *session = GNUNET_new (struct ConsensusSession);
+
+ session->client = c;
+ session->client_mq = mq;
+ GNUNET_CONTAINER_DLL_insert (sessions_head,
+ sessions_tail,
+ session);
+ return session;
}
+
+/**
+ * Callback called when a client disconnected from the service
+ *
+ * @param cls closure for the service
+ * @param c the client that disconnected
+ * @param internal_cls should be equal to @a c
+ */
+static void
+client_disconnect_cb (void *cls,
+ struct GNUNET_SERVICE_Client *c,
+ void *internal_cls)
+{
+ struct ConsensusSession *session = internal_cls;
+
+ if (NULL != session->set_listener)
+ {
+ GNUNET_SET_listen_cancel (session->set_listener);
+ session->set_listener = NULL;
+ }
+ GNUNET_CONTAINER_DLL_remove (sessions_head,
+ sessions_tail,
+ session);
+ GNUNET_free (session);
+}
+
+
+/**
+ * Define "main" method using service macro.
+ */
+GNUNET_SERVICE_MAIN
+("consensus",
+ GNUNET_SERVICE_OPTION_NONE,
+ &run,
+ &client_connect_cb,
+ &client_disconnect_cb,
+ NULL,
+ GNUNET_MQ_hd_fixed_size (client_conclude,
+ GNUNET_MESSAGE_TYPE_CONSENSUS_CLIENT_CONCLUDE,
+ struct GNUNET_MessageHeader,
+ NULL),
+ GNUNET_MQ_hd_var_size (client_insert,
+ GNUNET_MESSAGE_TYPE_CONSENSUS_CLIENT_INSERT,
+ struct GNUNET_CONSENSUS_ElementMessage,
+ NULL),
+ GNUNET_MQ_hd_var_size (client_join,
+ GNUNET_MESSAGE_TYPE_CONSENSUS_CLIENT_JOIN,
+ struct GNUNET_CONSENSUS_JoinMessage,
+ NULL),
+ GNUNET_MQ_handler_end ());
+
+/* end of gnunet-service-consensus.c */