[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnunet] 76/164: Final performance check
|
From: |
gnunet |
|
Subject: |
[gnunet] 76/164: Final performance check |
|
Date: |
Fri, 30 Jul 2021 15:32:22 +0200 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository gnunet.
commit ba5276acb52a427998ee6dc1bcbfdaeab927f98b
Author: Elias Summermatter <elias.summermatter@seccom.ch>
AuthorDate: Tue May 11 16:00:53 2021 +0200
Final performance check
---
src/setu/gnunet-service-setu.c | 8 ---
src/setu/ibf.c | 110 ++---------------------------------------
src/setu/perf_setu_api.c | 2 +-
3 files changed, 4 insertions(+), 116 deletions(-)
diff --git a/src/setu/gnunet-service-setu.c b/src/setu/gnunet-service-setu.c
index fdd0ee117..4fe211706 100644
--- a/src/setu/gnunet-service-setu.c
+++ b/src/setu/gnunet-service-setu.c
@@ -1568,8 +1568,6 @@ send_ibf (struct Operation *op,
msg->salt = htonl (op->salt_send);
msg->ibf_counter_bit_length = ibf_get_max_counter(ibf);
- LOG (GNUNET_ERROR_TYPE_ERROR,
- "HERE: %d\n", msg->ibf_counter_bit_length);
ibf_write_slice (ibf, buckets_sent,
buckets_in_message, &msg[1], msg->ibf_counter_bit_length);
@@ -2025,17 +2023,11 @@ decode_and_send (struct Operation *op)
"# of IBF retries",
1,
GNUNET_NO);
- LOG (GNUNET_ERROR_TYPE_ERROR,
- "%d BEFORE RUN %d REMOTE: %d LOCAL:%d\n",op->peer_site,
op->active_passive_switches, op->salt_receive, op->salt_send);
-
perf_rtt.active_passive_switches += 1;
op->active_passive_switches += 1;
op->salt_send = op->salt_receive++;
- LOG (GNUNET_ERROR_TYPE_ERROR,
- "%d AFTER RUN %d REMOTE: %d LOCAL:%d\n",op->peer_site,
op->active_passive_switches, op->salt_receive, op->salt_send );
-
if (GNUNET_OK !=
send_ibf (op, next_size))
{
diff --git a/src/setu/ibf.c b/src/setu/ibf.c
index 08ee1dd39..f4cabafa0 100644
--- a/src/setu/ibf.c
+++ b/src/setu/ibf.c
@@ -381,13 +381,7 @@ pack_counter(const struct InvertibleBloomFilter *ibf,
for (uint64_t i = start; i< (count + start);) {
uint64_t count_val_to_write = ibf->count[i].count_val;
uint8_t count_len_to_write = counter_max_length;
- /**
- LOG (GNUNET_ERROR_TYPE_ERROR,
- "NEW VAL: count_val_to_write: %d count_len_to_write:%u \n",
count_val_to_write, count_len_to_write);
- **/
- LOG (GNUNET_ERROR_TYPE_ERROR,
- "SAVE VALUE: %d\n",
- ibf->count[i].count_val);
+
while(count_len_to_write > 0) {
uint8_t byte_to_write=0;
@@ -398,44 +392,15 @@ pack_counter(const struct InvertibleBloomFilter *ibf,
bit_shift = count_len_to_write - bit_unused;
store = store << bit_unused;
}
- /**
- LOG (GNUNET_ERROR_TYPE_ERROR,
- "DEBUG GT 4 S: byte_to_write: %X, count_val_to_write:
%016Xq count_len_to_write: %u, store_size: %u store: %X, bit_shift: %d \n",
- byte_to_write,
- count_val_to_write,
- count_len_to_write,
- store_size,
- store,
- bit_shift
- ); **/
byte_to_write = (( count_val_to_write >> bit_shift) |
store) & 0xFF;
count_len_to_write -= (8 - store_size);
count_val_to_write = count_val_to_write & (( 1ULL <<
count_len_to_write ) - 1);
- /**
- LOG (GNUNET_ERROR_TYPE_ERROR,
- "DEBUG GT 4 E: byte_to_write: %X, count_val_to_write:
%016X count_len_to_write: %u, store_size: %u store: %X and %X\n",
- byte_to_write,
- count_val_to_write,
- count_len_to_write,
- store_size,
- store,
- (( 1 << count_len_to_write ) - 1)
- ); **/
+
store=0;
store_size=0;
} else {
- /**
- LOG (GNUNET_ERROR_TYPE_ERROR,
- "DEBUG STORE S: byte_to_write: %X,
count_val_to_write: %x count_len_to_write: %u, store_size: %u store: %X\n",
- byte_to_write,
- count_val_to_write,
- count_len_to_write,
- store_size,
- store
- );
- **/
if(0 == store){
store = count_val_to_write;
} else {
@@ -443,36 +408,16 @@ pack_counter(const struct InvertibleBloomFilter *ibf,
}
store_size = store_size + count_len_to_write;
count_len_to_write -= count_len_to_write;
- /**
- LOG (GNUNET_ERROR_TYPE_ERROR,
- "DEBUG STORE E: byte_to_write: %X,
count_val_to_write: %x count_len_to_write: %u, store_size: %u store: %X\n",
- byte_to_write,
- count_val_to_write,
- count_len_to_write,
- store_size,
- store
- ); **/
break;
}
buf[byte_ctr] = byte_to_write;
- /**
- LOG (GNUNET_ERROR_TYPE_ERROR,
- "PACKED %u -> %X\n",
- ibf->count[i].count_val,
- byte_to_write); **/
byte_ctr++;
}
i++;
}
- /**
- LOG (GNUNET_ERROR_TYPE_ERROR,
- "LAST PACKED STORE_ORG: %X, STORE_SH: %x size: %d \n",
- store,
- store << (8 - store_size),
- store_size); **/
buf[byte_ctr] = store << (8 - store_size);
byte_ctr++;
@@ -505,27 +450,12 @@ unpack_counter(const struct InvertibleBloomFilter *ibf,
uint8_t byte_read = buf[byte_ctr];
uint8_t bit_to_read_left = 8;
byte_ctr++;
- /**
- LOG (GNUNET_ERROR_TYPE_ERROR, "DECODED_BYTE: %X\n",byte_read);
- **/
while (bit_to_read_left >= 0) {
if(ibf_counter_ctr > (count - 1))
return;
- /**
- LOG (GNUNET_ERROR_TYPE_ERROR, "CTR: ibf_counter_ctr: %d count:
%d\n", ibf_counter_ctr,count);
- **/
-
if ((store_bit_ctr + bit_to_read_left) >= counter_max_length) {
- /**
- LOG (GNUNET_ERROR_TYPE_ERROR,
- "GT 8 START: byte_read: %X, store: %X store_bit_ctr: %u
bit_to_read_left: %u \n",
- byte_read,
- store,
- store_bit_ctr,
- bit_to_read_left
- );**/
uint8_t bytes_used = counter_max_length - store_bit_ctr;
if(store_bit_ctr > 0) {
store = store << bytes_used;
@@ -537,22 +467,7 @@ unpack_counter(const struct InvertibleBloomFilter *ibf,
ibf->count[ibf_counter_ctr].count_val = store;
byte_read = byte_read & (( 1 << bytes_to_shift ) - 1);
- /**
- LOG (GNUNET_ERROR_TYPE_ERROR,
- "GT 8 END: byte_read: %X, store: %X store_bit_ctr: %u
bit_to_read_left: %u ibf_counter_ctr: %u bytes_used: %u counter_part: %x \n",
- byte_read,
- store,
- store_bit_ctr,
- bit_to_read_left,
- ibf_counter_ctr,
- bytes_used,
- counter_part
- ); **/
-
- LOG (GNUNET_ERROR_TYPE_ERROR,
- "RESULT: %u\n",
- ibf->count[ibf_counter_ctr].count_val
- );
+
bit_to_read_left -= bytes_used;
ibf_counter_ctr++;
@@ -562,13 +477,6 @@ unpack_counter(const struct InvertibleBloomFilter *ibf,
} else {
- /**
- LOG (GNUNET_ERROR_TYPE_ERROR,
- "STORE START: byte_read: %X, store: %X store_bit_ctr: %u
\n",
- byte_read,
- store,
- store_bit_ctr);
- **/
store_bit_ctr += bit_to_read_left;
if(0 == store) {
store=byte_read;
@@ -576,24 +484,12 @@ unpack_counter(const struct InvertibleBloomFilter *ibf,
store=store << bit_to_read_left;
store=store | byte_read;
}
- /**
- LOG (GNUNET_ERROR_TYPE_ERROR,
- "STORE END: byte_read: %X, store: %X store_bit_ctr: %u
\n",
- byte_read,
- store,
- store_bit_ctr);
-**/
break;
}
}
-
- /**
- LOG (GNUNET_ERROR_TYPE_ERROR,
- "UNPACKED %X\n",
- byte_read);**/
}
}
diff --git a/src/setu/perf_setu_api.c b/src/setu/perf_setu_api.c
index 6b8af0d28..73cfdd617 100644
--- a/src/setu/perf_setu_api.c
+++ b/src/setu/perf_setu_api.c
@@ -404,7 +404,7 @@ run (void *cls,
"Running real set-reconciliation\n");
//init_set1 ();
// limit ~23800 element total
- initRandomSets(450, 5000,5000,32);
+ initRandomSets(4500, 5000,5000,32);
}
void perf_thread() {
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [gnunet] 31/164: Fixed a bug in implementation added if max size thresold instead of dont allow ibfs to get smaler, (continued)
- [gnunet] 31/164: Fixed a bug in implementation added if max size thresold instead of dont allow ibfs to get smaler, gnunet, 2021/07/30
- [gnunet] 43/164: 5k element difference, gnunet, 2021/07/30
- [gnunet] 34/164: Make 5000 elements perftest for perftest, gnunet, 2021/07/30
- [gnunet] 39/164: Test to overlap 5000 elements, gnunet, 2021/07/30
- [gnunet] 41/164: Fixed compiler bug, gnunet, 2021/07/30
- [gnunet] 47/164: Extend plot, gnunet, 2021/07/30
- [gnunet] 57/164: Simulation, gnunet, 2021/07/30
- [gnunet] 42/164: Compare check, gnunet, 2021/07/30
- [gnunet] 60/164: Simulation, gnunet, 2021/07/30
- [gnunet] 70/164: Rewritten dynamic counter, gnunet, 2021/07/30
- [gnunet] 76/164: Final performance check,
gnunet <=
- [gnunet] 24/164: uncomented unused perf log file, gnunet, 2021/07/30
- [gnunet] 63/164: Simulation, gnunet, 2021/07/30
- [gnunet] 54/164: Simulation, gnunet, 2021/07/30
- [gnunet] 78/164: Added new algo to determine operation mode, gnunet, 2021/07/30
- [gnunet] 62/164: Simulation, gnunet, 2021/07/30
- [gnunet] 65/164: Simulation, gnunet, 2021/07/30
- [gnunet] 64/164: Added strate remote/local set estimation, gnunet, 2021/07/30
- [gnunet] 66/164: Simulation, gnunet, 2021/07/30
- [gnunet] 68/164: Simulation, gnunet, 2021/07/30
- [gnunet] 55/164: Simulation, gnunet, 2021/07/30