diff options
author | Elias Summermatter <elias.summermatter@seccom.ch> | 2021-04-01 00:15:43 +0200 |
---|---|---|
committer | Elias Summermatter <elias.summermatter@seccom.ch> | 2021-04-01 00:15:43 +0200 |
commit | 12bb6131739c483a8c633f137d4a8c51c441350f (patch) | |
tree | 6691de872cba39b70344774c6ba57826c012ddba /src/setu/gnunet-service-setu.c | |
parent | b26733024c73d991777b2a6546d1f7454aa9a33c (diff) | |
download | gnunet-12bb6131739c483a8c633f137d4a8c51c441350f.tar.gz gnunet-12bb6131739c483a8c633f137d4a8c51c441350f.zip |
Setu fixed some bug in rand element gen and added variable payload for perfmance
Diffstat (limited to 'src/setu/gnunet-service-setu.c')
-rw-r--r-- | src/setu/gnunet-service-setu.c | 13 |
1 files changed, 11 insertions, 2 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); |