From fd827937edbeaa3bea3c17bf6a9c25b5fbbe73f1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fr=C3=A9d=C3=A9ric=20L=C3=A9caille?= Date: Fri, 7 Jun 2019 10:34:04 +0200 Subject: [PATCH] MINOR: peers: A bit of optimization when encoding cached server names. When a server name is cached we only send its cache entry ID which has an encoded length of 1 (because smaller than PEER_ENC_2BYTES_MIN). So, in this case we only have to encode 1, the already known encoded length of this ID before encoding it. Furthermore we do not have to call strlen() to compute the lengths of server name strings thanks to this commit: "MINOR: dict: Store the length of the dictionary entries". --- src/peers.c | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/src/peers.c b/src/peers.c index 6cb01a946c..7cc817cbc1 100644 --- a/src/peers.c +++ b/src/peers.c @@ -537,23 +537,31 @@ static int peer_prepare_updatemsg(char *msg, size_t size, struct peer_prep_param dc = peer->dcache; cde.entry.key = de; cached_de = dcache_tx_insert(dc, &cde); - /* Leave enough room to encode the remaining data length. */ - end = beg = cursor + PEER_MSG_ENC_LENGTH_MAXLEN; - /* Encode the dictionary entry key */ - intencode(cde.id + 1, &end); - if (cached_de != &cde.entry) { + if (cached_de == &cde.entry) { + if (cde.id + 1 >= PEER_ENC_2BYTES_MIN) + break; + /* Encode the length of the remaining data -> 1 */ + intencode(1, &cursor); + /* Encode the cache entry ID */ + intencode(cde.id + 1, &cursor); + } + else { + /* Leave enough room to encode the remaining data length. */ + end = beg = cursor + PEER_MSG_ENC_LENGTH_MAXLEN; + /* Encode the dictionary entry key */ + intencode(cde.id + 1, &end); /* Encode the length of the dictionary entry data */ - value_len = strlen(de->value.key); + value_len = de->len; intencode(value_len, &end); /* Copy the data */ memcpy(end, de->value.key, value_len); end += value_len; + /* Encode the length of the data */ + data_len = end - beg; + intencode(data_len, &cursor); + memmove(cursor, beg, data_len); + cursor += data_len; } - /* Encode the length of the data */ - data_len = end - beg; - intencode(data_len, &cursor); - memmove(cursor, beg, data_len); - cursor += data_len; break; } } -- 2.47.3