diff options
author | Christian Grothoff <christian@grothoff.org> | 2017-03-12 17:16:53 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2017-03-12 17:16:53 +0100 |
commit | a2ac01f46c4d57034b5d40201b29701ff95b456a (patch) | |
tree | 17ed91dbd1f988652bc41e530307673cbd2df11b /src/set | |
parent | a0c2289b8f0a78aebc0e66fed656b5ef59271ae8 (diff) | |
download | gnunet-a2ac01f46c4d57034b5d40201b29701ff95b456a.tar.gz gnunet-a2ac01f46c4d57034b5d40201b29701ff95b456a.zip |
always initialize HT upon state creation
Diffstat (limited to 'src/set')
-rw-r--r-- | src/set/gnunet-service-set_intersection.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/set/gnunet-service-set_intersection.c b/src/set/gnunet-service-set_intersection.c index b298f7b41..bb369a81f 100644 --- a/src/set/gnunet-service-set_intersection.c +++ b/src/set/gnunet-service-set_intersection.c | |||
@@ -849,10 +849,6 @@ static void | |||
849 | begin_bf_exchange (struct Operation *op) | 849 | begin_bf_exchange (struct Operation *op) |
850 | { | 850 | { |
851 | op->state->phase = PHASE_BF_EXCHANGE; | 851 | op->state->phase = PHASE_BF_EXCHANGE; |
852 | GNUNET_assert (NULL == op->state->my_elements); | ||
853 | op->state->my_elements | ||
854 | = GNUNET_CONTAINER_multihashmap_create (op->state->my_element_count, | ||
855 | GNUNET_YES); | ||
856 | GNUNET_CONTAINER_multihashmap_iterate (op->spec->set->content->elements, | 852 | GNUNET_CONTAINER_multihashmap_iterate (op->spec->set->content->elements, |
857 | &initialize_map_unfiltered, | 853 | &initialize_map_unfiltered, |
858 | op); | 854 | op); |
@@ -1034,6 +1030,9 @@ intersection_evaluate (struct Operation *op, | |||
1034 | /* we started the operation, thus we have to send the operation request */ | 1030 | /* we started the operation, thus we have to send the operation request */ |
1035 | op->state->phase = PHASE_INITIAL; | 1031 | op->state->phase = PHASE_INITIAL; |
1036 | op->state->my_element_count = op->spec->set->state->current_set_element_count; | 1032 | op->state->my_element_count = op->spec->set->state->current_set_element_count; |
1033 | op->state->my_elements | ||
1034 | = GNUNET_CONTAINER_multihashmap_create (op->state->my_element_count, | ||
1035 | GNUNET_YES); | ||
1037 | 1036 | ||
1038 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 1037 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
1039 | "Initiating intersection operation evaluation\n"); | 1038 | "Initiating intersection operation evaluation\n"); |