From: Sergey Nikiforov <void@tarantool.org> To: tarantool-patches@dev.tarantool.org Cc: Vladislav Shpilevoy <v.shpilevoy@tarantool.org> Subject: [Tarantool-patches] [PATCH v2 2/2] base64: Improve decoder performance Date: Tue, 15 Dec 2020 17:22:46 +0300 [thread overview] Message-ID: <f41878133643cd7ad19985071f775d95d553f08a.1608041781.git.void@tarantool.org> (raw) In-Reply-To: <cover.1608041781.git.void@tarantool.org> Unnecessary checks were removed from internal loops. Benchmark shows that performance is now ~1.15 times higher (release build, Intel Core I7-9700K, only one thread). --- Branch: https://github.com/tarantool/tarantool/tree/void234/gh-3069-fix-base64-memory-overrun-v2 third_party/base64.c | 36 +++++++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/third_party/base64.c b/third_party/base64.c index 3350a98ff..f4fbbf477 100644 --- a/third_party/base64.c +++ b/third_party/base64.c @@ -257,7 +257,7 @@ base64_decode_block(const char *in_base64, int in_len, { case step_a: do { - if (in_pos == in_end || out_pos >= out_end) + if (in_pos >= in_end) { state->step = step_a; state->result = curr_byte; @@ -268,7 +268,7 @@ base64_decode_block(const char *in_base64, int in_len, curr_byte = (fragment & 0x03f) << 2; case step_b: do { - if (in_pos == in_end || out_pos >= out_end) + if (in_pos >= in_end) { state->step = step_b; state->result = curr_byte; @@ -277,13 +277,17 @@ base64_decode_block(const char *in_base64, int in_len, fragment = base64_decode_value(*in_pos++); } while (fragment < 0); curr_byte |= (fragment & 0x030) >> 4; - *out_pos++ = curr_byte; + *out_pos = curr_byte; curr_byte = (fragment & 0x00f) << 4; - if (out_pos < out_end) - *out_pos = curr_byte; + if (++out_pos >= out_end) + { + state->step = step_c; + state->result = curr_byte; + return out_pos - out_bin; + } case step_c: do { - if (in_pos == in_end || out_pos >= out_end) + if (in_pos >= in_end) { state->step = step_c; state->result = curr_byte; @@ -292,13 +296,17 @@ base64_decode_block(const char *in_base64, int in_len, fragment = base64_decode_value(*in_pos++); } while (fragment < 0); curr_byte |= (fragment & 0x03c) >> 2; - *out_pos++ = curr_byte; + *out_pos = curr_byte; curr_byte = (fragment & 0x003) << 6; - if (out_pos < out_end) - *out_pos = curr_byte; + if (++out_pos >= out_end) + { + state->step = step_d; + state->result = curr_byte; + return out_pos - out_bin; + } case step_d: do { - if (in_pos == in_end || out_pos >= out_end) + if (in_pos >= in_end) { state->step = step_d; state->result = curr_byte; @@ -307,7 +315,13 @@ base64_decode_block(const char *in_base64, int in_len, fragment = base64_decode_value(*in_pos++); } while (fragment < 0); curr_byte |= (fragment & 0x03f); - *out_pos++ = curr_byte; + *out_pos = curr_byte; + if (++out_pos >= out_end) + { + state->step = step_a; + state->result = curr_byte; + return out_pos - out_bin; + } } } /* control should not reach here */ -- 2.25.1
next prev parent reply other threads:[~2020-12-15 14:23 UTC|newest] Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-12-15 14:22 [Tarantool-patches] [PATCH v2 0/2] base64: Fix decoder, improve its performance Sergey Nikiforov 2020-12-15 14:22 ` [Tarantool-patches] [PATCH v2 1/2] base64: Fix decoder output buffer overrun (reads) Sergey Nikiforov 2020-12-15 14:22 ` Sergey Nikiforov [this message] 2020-12-16 23:22 ` [Tarantool-patches] [PATCH v2 2/2] base64: Improve decoder performance Vladislav Shpilevoy 2020-12-17 12:43 ` Sergey Nikiforov 2020-12-20 16:27 ` Vladislav Shpilevoy 2020-12-22 10:30 ` Sergey Nikiforov 2020-12-22 15:05 ` Vladislav Shpilevoy 2020-12-22 16:08 ` Sergey Nikiforov 2020-12-22 16:39 ` Vladislav Shpilevoy 2020-12-25 10:39 ` Sergey Nikiforov 2020-12-26 13:25 ` Vladislav Shpilevoy
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=f41878133643cd7ad19985071f775d95d553f08a.1608041781.git.void@tarantool.org \ --to=void@tarantool.org \ --cc=tarantool-patches@dev.tarantool.org \ --cc=v.shpilevoy@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH v2 2/2] base64: Improve decoder performance' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox