diff options
Diffstat (limited to 'src/set/gnunet-set-ibf-profiler.c')
-rw-r--r-- | src/set/gnunet-set-ibf-profiler.c | 42 |
1 files changed, 29 insertions, 13 deletions
diff --git a/src/set/gnunet-set-ibf-profiler.c b/src/set/gnunet-set-ibf-profiler.c index 577c78cf2..9420c5666 100644 --- a/src/set/gnunet-set-ibf-profiler.c +++ b/src/set/gnunet-set-ibf-profiler.c | |||
@@ -56,16 +56,24 @@ register_hashcode (struct GNUNET_HashCode *hash) | |||
56 | struct IBF_Key key; | 56 | struct IBF_Key key; |
57 | key = ibf_key_from_hashcode (hash); | 57 | key = ibf_key_from_hashcode (hash); |
58 | ibf_hashcode_from_key (key, &replicated); | 58 | ibf_hashcode_from_key (key, &replicated); |
59 | GNUNET_CONTAINER_multihashmap_put (key_to_hashcode, &replicated, GNUNET_memdup (hash, sizeof *hash), | 59 | (void) GNUNET_CONTAINER_multihashmap_put (key_to_hashcode, |
60 | GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE); | 60 | &replicated, |
61 | GNUNET_memdup (hash, sizeof *hash), | ||
62 | GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE); | ||
61 | } | 63 | } |
62 | 64 | ||
65 | |||
63 | static void | 66 | static void |
64 | iter_hashcodes (struct IBF_Key key, GNUNET_CONTAINER_HashMapIterator iter, void *cls) | 67 | iter_hashcodes (struct IBF_Key key, |
68 | GNUNET_CONTAINER_HashMapIterator iter, | ||
69 | void *cls) | ||
65 | { | 70 | { |
66 | struct GNUNET_HashCode replicated; | 71 | struct GNUNET_HashCode replicated; |
72 | |||
67 | ibf_hashcode_from_key (key, &replicated); | 73 | ibf_hashcode_from_key (key, &replicated); |
68 | GNUNET_CONTAINER_multihashmap_get_multiple (key_to_hashcode, &replicated, iter, cls); | 74 | GNUNET_CONTAINER_multihashmap_get_multiple (key_to_hashcode, |
75 | &replicated, | ||
76 | iter, cls); | ||
69 | } | 77 | } |
70 | 78 | ||
71 | 79 | ||
@@ -74,7 +82,8 @@ insert_iterator (void *cls, | |||
74 | const struct GNUNET_HashCode *key, | 82 | const struct GNUNET_HashCode *key, |
75 | void *value) | 83 | void *value) |
76 | { | 84 | { |
77 | struct InvertibleBloomFilter *ibf = (struct InvertibleBloomFilter *) cls; | 85 | struct InvertibleBloomFilter *ibf = cls; |
86 | |||
78 | ibf_insert (ibf, ibf_key_from_hashcode (key)); | 87 | ibf_insert (ibf, ibf_key_from_hashcode (key)); |
79 | return GNUNET_YES; | 88 | return GNUNET_YES; |
80 | } | 89 | } |
@@ -123,8 +132,9 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
123 | GNUNET_CRYPTO_hash_create_random (random_quality, &id); | 132 | GNUNET_CRYPTO_hash_create_random (random_quality, &id); |
124 | if (GNUNET_YES == GNUNET_CONTAINER_multihashmap_contains (set_a, &id)) | 133 | if (GNUNET_YES == GNUNET_CONTAINER_multihashmap_contains (set_a, &id)) |
125 | continue; | 134 | continue; |
126 | GNUNET_CONTAINER_multihashmap_put ( | 135 | GNUNET_break (GNUNET_OK == |
127 | set_a, &id, NULL, GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY); | 136 | GNUNET_CONTAINER_multihashmap_put (set_a, &id, NULL, |
137 | GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY); | ||
128 | register_hashcode (&id); | 138 | register_hashcode (&id); |
129 | i++; | 139 | i++; |
130 | } | 140 | } |
@@ -136,8 +146,9 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
136 | continue; | 146 | continue; |
137 | if (GNUNET_YES == GNUNET_CONTAINER_multihashmap_contains (set_b, &id)) | 147 | if (GNUNET_YES == GNUNET_CONTAINER_multihashmap_contains (set_b, &id)) |
138 | continue; | 148 | continue; |
139 | GNUNET_CONTAINER_multihashmap_put ( | 149 | GNUNET_break (GNUNET_OK == |
140 | set_b, &id, NULL, GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY); | 150 | GNUNET_CONTAINER_multihashmap_put (set_b, &id, NULL, |
151 | GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY)); | ||
141 | register_hashcode (&id); | 152 | register_hashcode (&id); |
142 | i++; | 153 | i++; |
143 | } | 154 | } |
@@ -151,8 +162,9 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
151 | continue; | 162 | continue; |
152 | if (GNUNET_YES == GNUNET_CONTAINER_multihashmap_contains (set_c, &id)) | 163 | if (GNUNET_YES == GNUNET_CONTAINER_multihashmap_contains (set_c, &id)) |
153 | continue; | 164 | continue; |
154 | GNUNET_CONTAINER_multihashmap_put ( | 165 | GNUNET_break (GNUNET_OK == |
155 | set_c, &id, NULL, GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY); | 166 | GNUNET_CONTAINER_multihashmap_put (set_c, &id, NULL, |
167 | GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY)); | ||
156 | register_hashcode (&id); | 168 | register_hashcode (&id); |
157 | i++; | 169 | i++; |
158 | } | 170 | } |
@@ -171,7 +183,9 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
171 | 183 | ||
172 | delta_time = GNUNET_TIME_absolute_get_duration (start_time); | 184 | delta_time = GNUNET_TIME_absolute_get_duration (start_time); |
173 | 185 | ||
174 | printf ("encoded in: %s\n", GNUNET_STRINGS_relative_time_to_string (delta_time, GNUNET_NO)); | 186 | printf ("encoded in: %s\n", |
187 | GNUNET_STRINGS_relative_time_to_string (delta_time, | ||
188 | GNUNET_NO)); | ||
175 | 189 | ||
176 | ibf_subtract (ibf_a, ibf_b); | 190 | ibf_subtract (ibf_a, ibf_b); |
177 | 191 | ||
@@ -194,7 +208,9 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
194 | (0 == GNUNET_CONTAINER_multihashmap_size (set_a))) | 208 | (0 == GNUNET_CONTAINER_multihashmap_size (set_a))) |
195 | { | 209 | { |
196 | delta_time = GNUNET_TIME_absolute_get_duration (start_time); | 210 | delta_time = GNUNET_TIME_absolute_get_duration (start_time); |
197 | printf ("decoded successfully in: %s\n", GNUNET_STRINGS_relative_time_to_string (delta_time, GNUNET_NO)); | 211 | printf ("decoded successfully in: %s\n", |
212 | GNUNET_STRINGS_relative_time_to_string (delta_time, | ||
213 | GNUNET_NO)); | ||
198 | } | 214 | } |
199 | else | 215 | else |
200 | { | 216 | { |