diff options
author | Florian Dold <florian.dold@gmail.com> | 2013-06-19 10:48:54 +0000 |
---|---|---|
committer | Florian Dold <florian.dold@gmail.com> | 2013-06-19 10:48:54 +0000 |
commit | a900b29ddaa9ea46c731b054b5e3ef3e725b95a8 (patch) | |
tree | 52e1a9697b0abf4618cd5684359ec5f0a040898a /src/dv | |
parent | 17353bc0a47c89bda205f23e7995377c9bfe7769 (diff) | |
download | gnunet-a900b29ddaa9ea46c731b054b5e3ef3e725b95a8.tar.gz gnunet-a900b29ddaa9ea46c731b054b5e3ef3e725b95a8.zip |
- opaque mq structs
- mq for mesh
- faster hashing for IBFs
- mesh replaces stream in set
- new set profiler (work in progress)
Diffstat (limited to 'src/dv')
-rw-r--r-- | src/dv/gnunet-service-dv.c | 16 |
1 files changed, 8 insertions, 8 deletions
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) | |||
769 | if (DEFAULT_FISHEYE_DEPTH - 1 == neighbor->consensus_insertion_distance) | 769 | if (DEFAULT_FISHEYE_DEPTH - 1 == neighbor->consensus_insertion_distance) |
770 | { | 770 | { |
771 | /* we have added all elements to the set, run the operation */ | 771 | /* we have added all elements to the set, run the operation */ |
772 | GNUNET_SET_conclude (neighbor->set_op, | 772 | GNUNET_SET_commit (neighbor->set_op, |
773 | neighbor->my_set); | 773 | neighbor->my_set); |
774 | GNUNET_SET_destroy (neighbor->my_set); | 774 | GNUNET_SET_destroy (neighbor->my_set); |
775 | neighbor->my_set = NULL; | 775 | neighbor->my_set = NULL; |
@@ -1425,13 +1425,13 @@ initiate_set_union (void *cls, | |||
1425 | neighbor->initiate_task = GNUNET_SCHEDULER_NO_TASK; | 1425 | neighbor->initiate_task = GNUNET_SCHEDULER_NO_TASK; |
1426 | neighbor->my_set = GNUNET_SET_create (cfg, | 1426 | neighbor->my_set = GNUNET_SET_create (cfg, |
1427 | GNUNET_SET_OPERATION_UNION); | 1427 | GNUNET_SET_OPERATION_UNION); |
1428 | neighbor->set_op = GNUNET_SET_evaluate (&neighbor->peer, | 1428 | neighbor->set_op = GNUNET_SET_prepare (&neighbor->peer, |
1429 | &neighbor->real_session_id, | 1429 | &neighbor->real_session_id, |
1430 | NULL, | 1430 | NULL, |
1431 | 0 /* FIXME: salt */, | 1431 | 0 /* FIXME: salt */, |
1432 | GNUNET_SET_RESULT_ADDED, | 1432 | GNUNET_SET_RESULT_ADDED, |
1433 | &handle_set_union_result, | 1433 | &handle_set_union_result, |
1434 | neighbor); | 1434 | neighbor); |
1435 | build_set (neighbor); | 1435 | build_set (neighbor); |
1436 | } | 1436 | } |
1437 | 1437 | ||