diff options
author | Florian Dold <florian.dold@gmail.com> | 2015-10-07 22:01:03 +0000 |
---|---|---|
committer | Florian Dold <florian.dold@gmail.com> | 2015-10-07 22:01:03 +0000 |
commit | 383814672c031e49c4dffca0a69af3b0973d2248 (patch) | |
tree | 1c889a53a32ce6fd5786e23cd4f45e7de06db403 /src/set/gnunet-service-set_union.c | |
parent | af432574e5009cc4748e512f6b78b43f40fdc19c (diff) | |
download | gnunet-383814672c031e49c4dffca0a69af3b0973d2248.tar.gz gnunet-383814672c031e49c4dffca0a69af3b0973d2248.zip |
statistics in set profiler, temp. fix for salt
Diffstat (limited to 'src/set/gnunet-service-set_union.c')
-rw-r--r-- | src/set/gnunet-service-set_union.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/set/gnunet-service-set_union.c b/src/set/gnunet-service-set_union.c index 04fbba348..1c5dfe3fb 100644 --- a/src/set/gnunet-service-set_union.c +++ b/src/set/gnunet-service-set_union.c | |||
@@ -341,6 +341,10 @@ get_ibf_key (const struct GNUNET_HashCode *src, | |||
341 | { | 341 | { |
342 | struct IBF_Key key; | 342 | struct IBF_Key key; |
343 | 343 | ||
344 | /* FIXME: Ensure that the salt is handled correctly. | ||
345 | This is a quick fix so that consensus works for now. */ | ||
346 | salt = 0; | ||
347 | |||
344 | GNUNET_CRYPTO_kdf (&key, sizeof (key), | 348 | GNUNET_CRYPTO_kdf (&key, sizeof (key), |
345 | src, sizeof *src, | 349 | src, sizeof *src, |
346 | &salt, sizeof (salt), | 350 | &salt, sizeof (salt), |
@@ -499,7 +503,7 @@ init_key_to_element_iterator (void *cls, | |||
499 | */ | 503 | */ |
500 | static void | 504 | static void |
501 | prepare_ibf (struct Operation *op, | 505 | prepare_ibf (struct Operation *op, |
502 | uint16_t size) | 506 | uint32_t size) |
503 | { | 507 | { |
504 | if (NULL == op->state->key_to_element) | 508 | if (NULL == op->state->key_to_element) |
505 | { | 509 | { |
@@ -540,6 +544,12 @@ send_ibf (struct Operation *op, | |||
540 | "sending ibf of size %u\n", | 544 | "sending ibf of size %u\n", |
541 | 1<<ibf_order); | 545 | 1<<ibf_order); |
542 | 546 | ||
547 | { | ||
548 | char name[64] = { 0 }; | ||
549 | snprintf (name, sizeof (name), "# sent IBF (order %u)", ibf_order); | ||
550 | GNUNET_STATISTICS_update (_GSS_statistics, name, 1, GNUNET_NO); | ||
551 | } | ||
552 | |||
543 | ibf = op->state->local_ibf; | 553 | ibf = op->state->local_ibf; |
544 | 554 | ||
545 | while (buckets_sent < (1 << ibf_order)) | 555 | while (buckets_sent < (1 << ibf_order)) |
@@ -1116,7 +1126,6 @@ handle_p2p_elements (void *cls, | |||
1116 | "# repeated elements", | 1126 | "# repeated elements", |
1117 | 1, | 1127 | 1, |
1118 | GNUNET_NO); | 1128 | GNUNET_NO); |
1119 | GNUNET_break (0); | ||
1120 | GNUNET_free (ee); | 1129 | GNUNET_free (ee); |
1121 | } | 1130 | } |
1122 | else | 1131 | else |