summaryrefslogtreecommitdiff
path: root/src/consensus
diff options
context:
space:
mode:
authorFlorian Dold <florian.dold@gmail.com>2017-06-18 02:24:03 +0200
committerFlorian Dold <florian.dold@gmail.com>2017-06-18 02:24:03 +0200
commitab4573d4f7dafe44d414a6d1f23397682ac0ca70 (patch)
tree756ebcac00448e600e06d0346854105e62099b8d /src/consensus
parentb31387163769ceeeffa0037390f28d70ba530bc6 (diff)
CONSENSUS/SET: even uglier CADET workarounds
Diffstat (limited to 'src/consensus')
-rw-r--r--src/consensus/gnunet-service-consensus.c15
1 files changed, 13 insertions, 2 deletions
diff --git a/src/consensus/gnunet-service-consensus.c b/src/consensus/gnunet-service-consensus.c
index 4af7199aa..6b76efb18 100644
--- a/src/consensus/gnunet-service-consensus.c
+++ b/src/consensus/gnunet-service-consensus.c
@@ -1133,8 +1133,11 @@ set_result_cb (void *cls,
// 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));
+ "P%u: Finishing setop in Task {%s} (%u/%u)\n",
+ session->local_peer_idx,
+ debug_str_task_key (&task->key),
+ (unsigned int) task->step->finished_tasks,
+ (unsigned int) task->step->tasks_len);
if (NULL != output_rfn)
{
rfn_commit (output_rfn, task_other_peer (task));
@@ -1470,6 +1473,7 @@ commit_set (struct ConsensusSession *session,
peers to wait. */
GNUNET_SET_operation_cancel (setop->op);
setop->op = NULL;
+ finish_task (task);
}
#endif
}
@@ -2378,6 +2382,13 @@ finish_task (struct TaskEntry *task)
task->step->finished_tasks++;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "P%u: Finishing setop in Task {%s} (now %u/%u tasks finished in step)\n",
+ task->step->session->local_peer_idx,
+ debug_str_task_key (&task->key),
+ (unsigned int) task->step->finished_tasks,
+ (unsigned int) task->step->tasks_len);
+
if (task->step->finished_tasks == task->step->tasks_len)
finish_step (task->step);
}