From a900b29ddaa9ea46c731b054b5e3ef3e725b95a8 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Wed, 19 Jun 2013 10:48:54 +0000 Subject: - opaque mq structs - mq for mesh - faster hashing for IBFs - mesh replaces stream in set - new set profiler (work in progress) --- src/dv/gnunet-service-dv.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/dv') diff --git a/src/dv/gnunet-service-dv.c b/src/dv/gnunet-service-dv.c index b76fd9ab0..92ca5d9da 100644 --- a/src/dv/gnunet-service-dv.c +++ b/src/dv/gnunet-service-dv.c @@ -769,7 +769,7 @@ build_set (void *cls) if (DEFAULT_FISHEYE_DEPTH - 1 == neighbor->consensus_insertion_distance) { /* we have added all elements to the set, run the operation */ - GNUNET_SET_conclude (neighbor->set_op, + GNUNET_SET_commit (neighbor->set_op, neighbor->my_set); GNUNET_SET_destroy (neighbor->my_set); neighbor->my_set = NULL; @@ -1425,13 +1425,13 @@ initiate_set_union (void *cls, neighbor->initiate_task = GNUNET_SCHEDULER_NO_TASK; neighbor->my_set = GNUNET_SET_create (cfg, GNUNET_SET_OPERATION_UNION); - neighbor->set_op = GNUNET_SET_evaluate (&neighbor->peer, - &neighbor->real_session_id, - NULL, - 0 /* FIXME: salt */, - GNUNET_SET_RESULT_ADDED, - &handle_set_union_result, - neighbor); + neighbor->set_op = GNUNET_SET_prepare (&neighbor->peer, + &neighbor->real_session_id, + NULL, + 0 /* FIXME: salt */, + GNUNET_SET_RESULT_ADDED, + &handle_set_union_result, + neighbor); build_set (neighbor); } -- cgit v1.2.3