diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/setu/gnunet-service-setu.c | 13 | ||||
-rw-r--r-- | src/setu/perf_setu_api.c | 10 | ||||
-rw-r--r-- | src/setu/test_setu_api.c | 10 |
3 files changed, 21 insertions, 12 deletions
diff --git a/src/setu/gnunet-service-setu.c b/src/setu/gnunet-service-setu.c index b3cbf6d0e..9d555aee3 100644 --- a/src/setu/gnunet-service-setu.c +++ b/src/setu/gnunet-service-setu.c | |||
@@ -643,7 +643,9 @@ static uint32_t suggest_id; | |||
643 | 643 | ||
644 | struct perf_num_send_resived_msg { | 644 | struct perf_num_send_resived_msg { |
645 | int sent; | 645 | int sent; |
646 | int sent_var_bytes; | ||
646 | int received; | 647 | int received; |
648 | int received_var_bytes; | ||
647 | }; | 649 | }; |
648 | 650 | ||
649 | 651 | ||
@@ -668,7 +670,10 @@ struct perf_rtt_struct perf_rtt; | |||
668 | 670 | ||
669 | static int | 671 | static int |
670 | sum_sent_received_bytes(int size, struct perf_num_send_resived_msg perf_rtt_struct) { | 672 | sum_sent_received_bytes(int size, struct perf_num_send_resived_msg perf_rtt_struct) { |
671 | return (size * perf_rtt_struct.sent) + (size * perf_rtt_struct.received); | 673 | return (size * perf_rtt_struct.sent) + |
674 | (size * perf_rtt_struct.received) + | ||
675 | perf_rtt_struct.sent_var_bytes + | ||
676 | perf_rtt_struct.received_var_bytes; | ||
672 | } | 677 | } |
673 | 678 | ||
674 | static float | 679 | static float |
@@ -2089,9 +2094,12 @@ handle_union_p2p_elements (void *cls, | |||
2089 | struct KeyEntry *ke; | 2094 | struct KeyEntry *ke; |
2090 | uint16_t element_size; | 2095 | uint16_t element_size; |
2091 | 2096 | ||
2092 | perf_rtt.element.received += 1; | 2097 | |
2093 | element_size = ntohs (emsg->header.size) - sizeof(struct | 2098 | element_size = ntohs (emsg->header.size) - sizeof(struct |
2094 | GNUNET_SETU_ElementMessage); | 2099 | GNUNET_SETU_ElementMessage); |
2100 | perf_rtt.element.received += 1; | ||
2101 | perf_rtt.element.received_var_bytes += element_size; | ||
2102 | |||
2095 | ee = GNUNET_malloc (sizeof(struct ElementEntry) + element_size); | 2103 | ee = GNUNET_malloc (sizeof(struct ElementEntry) + element_size); |
2096 | GNUNET_memcpy (&ee[1], | 2104 | GNUNET_memcpy (&ee[1], |
2097 | &emsg[1], | 2105 | &emsg[1], |
@@ -2557,6 +2565,7 @@ handle_union_p2p_demand (void *cls, | |||
2557 | return; | 2565 | return; |
2558 | } | 2566 | } |
2559 | perf_rtt.element.sent += 1; | 2567 | perf_rtt.element.sent += 1; |
2568 | perf_rtt.element.sent_var_bytes += ee->element.size; | ||
2560 | ev = GNUNET_MQ_msg_extra (emsg, | 2569 | ev = GNUNET_MQ_msg_extra (emsg, |
2561 | ee->element.size, | 2570 | ee->element.size, |
2562 | GNUNET_MESSAGE_TYPE_SETU_P2P_ELEMENTS); | 2571 | GNUNET_MESSAGE_TYPE_SETU_P2P_ELEMENTS); |
diff --git a/src/setu/perf_setu_api.c b/src/setu/perf_setu_api.c index 73b61c02a..60a5e5e85 100644 --- a/src/setu/perf_setu_api.c +++ b/src/setu/perf_setu_api.c | |||
@@ -212,7 +212,7 @@ init_set2 (void *cls) | |||
212 | unsigned char *gen_rdm_bytestream (size_t num_bytes) | 212 | unsigned char *gen_rdm_bytestream (size_t num_bytes) |
213 | { | 213 | { |
214 | unsigned char *stream = GNUNET_malloc (num_bytes); | 214 | unsigned char *stream = GNUNET_malloc (num_bytes); |
215 | GNUNET_CRYPTO_random_block(GNUNET_CRYPTO_QUALITY_WEAK, stream, sizeof(stream)); | 215 | GNUNET_CRYPTO_random_block(GNUNET_CRYPTO_QUALITY_WEAK, stream, num_bytes); |
216 | return stream; | 216 | return stream; |
217 | } | 217 | } |
218 | 218 | ||
@@ -229,7 +229,7 @@ initRandomSets(int overlap, int set1_size, int set2_size, int element_size_in_by | |||
229 | // Add elements to both sets | 229 | // Add elements to both sets |
230 | for (int i = 0; i < overlap; i++) { | 230 | for (int i = 0; i < overlap; i++) { |
231 | element.data = gen_rdm_bytestream(element_size_in_bytes); | 231 | element.data = gen_rdm_bytestream(element_size_in_bytes); |
232 | element.size = strlen (element.data); | 232 | element.size = element_size_in_bytes; |
233 | GNUNET_SETU_add_element (set1, &element, NULL, NULL); | 233 | GNUNET_SETU_add_element (set1, &element, NULL, NULL); |
234 | GNUNET_SETU_add_element (set2, &element, NULL, NULL); | 234 | GNUNET_SETU_add_element (set2, &element, NULL, NULL); |
235 | set1_size--; | 235 | set1_size--; |
@@ -240,7 +240,7 @@ initRandomSets(int overlap, int set1_size, int set2_size, int element_size_in_by | |||
240 | // Add other elements to set 1 | 240 | // Add other elements to set 1 |
241 | while(set1_size>0) { | 241 | while(set1_size>0) { |
242 | element.data = gen_rdm_bytestream(element_size_in_bytes); | 242 | element.data = gen_rdm_bytestream(element_size_in_bytes); |
243 | element.size = strlen (element.data); | 243 | element.size = element_size_in_bytes; |
244 | GNUNET_SETU_add_element (set1, &element, NULL, NULL); | 244 | GNUNET_SETU_add_element (set1, &element, NULL, NULL); |
245 | set1_size--; | 245 | set1_size--; |
246 | } | 246 | } |
@@ -249,7 +249,7 @@ initRandomSets(int overlap, int set1_size, int set2_size, int element_size_in_by | |||
249 | // Add other elements to set 2 | 249 | // Add other elements to set 2 |
250 | while(set2_size > 0) { | 250 | while(set2_size > 0) { |
251 | element.data = gen_rdm_bytestream(element_size_in_bytes); | 251 | element.data = gen_rdm_bytestream(element_size_in_bytes); |
252 | element.size = strlen (element.data); | 252 | element.size = element_size_in_bytes; |
253 | 253 | ||
254 | if(set2_size != 1) { | 254 | if(set2_size != 1) { |
255 | GNUNET_SETU_add_element (set2, &element,NULL, NULL); | 255 | GNUNET_SETU_add_element (set2, &element,NULL, NULL); |
@@ -395,7 +395,7 @@ run (void *cls, | |||
395 | "Running real set-reconciliation\n"); | 395 | "Running real set-reconciliation\n"); |
396 | //init_set1 (); | 396 | //init_set1 (); |
397 | // limit ~23800 element total | 397 | // limit ~23800 element total |
398 | initRandomSets(88,100,90,32); | 398 | initRandomSets(99,100,100,64); |
399 | } | 399 | } |
400 | 400 | ||
401 | static void execute_perf() | 401 | static void execute_perf() |
diff --git a/src/setu/test_setu_api.c b/src/setu/test_setu_api.c index d573cfe3c..d5c9f5b7a 100644 --- a/src/setu/test_setu_api.c +++ b/src/setu/test_setu_api.c | |||
@@ -210,8 +210,8 @@ init_set2 (void *cls) | |||
210 | 210 | ||
211 | unsigned char *gen_rdm_bytestream (size_t num_bytes) | 211 | unsigned char *gen_rdm_bytestream (size_t num_bytes) |
212 | { | 212 | { |
213 | unsigned char *stream = GNUNET_malloc (num_bytes + 1); | 213 | unsigned char *stream = GNUNET_malloc (num_bytes); |
214 | GNUNET_CRYPTO_random_block(GNUNET_CRYPTO_QUALITY_WEAK, stream, num_bytes - 1); | 214 | GNUNET_CRYPTO_random_block(GNUNET_CRYPTO_QUALITY_WEAK, stream, num_bytes); |
215 | return stream; | 215 | return stream; |
216 | } | 216 | } |
217 | 217 | ||
@@ -228,7 +228,7 @@ initRandomSets(int overlap, int set1_size, int set2_size, int element_size_in_by | |||
228 | // Add elements to both sets | 228 | // Add elements to both sets |
229 | for (int i = 0; i < overlap; i++) { | 229 | for (int i = 0; i < overlap; i++) { |
230 | element.data = gen_rdm_bytestream(element_size_in_bytes); | 230 | element.data = gen_rdm_bytestream(element_size_in_bytes); |
231 | element.size = strlen (element.data); | 231 | element.size = element_size_in_bytes; |
232 | GNUNET_SETU_add_element (set1, &element, NULL, NULL); | 232 | GNUNET_SETU_add_element (set1, &element, NULL, NULL); |
233 | GNUNET_SETU_add_element (set2, &element, NULL, NULL); | 233 | GNUNET_SETU_add_element (set2, &element, NULL, NULL); |
234 | set1_size--; | 234 | set1_size--; |
@@ -239,7 +239,7 @@ initRandomSets(int overlap, int set1_size, int set2_size, int element_size_in_by | |||
239 | // Add other elements to set 1 | 239 | // Add other elements to set 1 |
240 | while(set1_size>0) { | 240 | while(set1_size>0) { |
241 | element.data = gen_rdm_bytestream(element_size_in_bytes); | 241 | element.data = gen_rdm_bytestream(element_size_in_bytes); |
242 | element.size = strlen (element.data); | 242 | element.size = element_size_in_bytes; |
243 | GNUNET_SETU_add_element (set1, &element, NULL, NULL); | 243 | GNUNET_SETU_add_element (set1, &element, NULL, NULL); |
244 | set1_size--; | 244 | set1_size--; |
245 | } | 245 | } |
@@ -248,7 +248,7 @@ initRandomSets(int overlap, int set1_size, int set2_size, int element_size_in_by | |||
248 | // Add other elements to set 2 | 248 | // Add other elements to set 2 |
249 | while(set2_size > 0) { | 249 | while(set2_size > 0) { |
250 | element.data = gen_rdm_bytestream(element_size_in_bytes); | 250 | element.data = gen_rdm_bytestream(element_size_in_bytes); |
251 | element.size = strlen (element.data); | 251 | element.size = element_size_in_bytes; |
252 | 252 | ||
253 | if(set2_size != 1) { | 253 | if(set2_size != 1) { |
254 | GNUNET_SETU_add_element (set2, &element,NULL, NULL); | 254 | GNUNET_SETU_add_element (set2, &element,NULL, NULL); |