From e9e085685a69f84b51ea1420e735e9c004f6ca1f Mon Sep 17 00:00:00 2001 From: Yagiz Nizipli Date: Wed, 21 Aug 2024 13:48:27 -0400 Subject: [PATCH] remove unnecessary mutex guard --- src/workerd/api/node/zlib-util.c++ | 7 ++++--- src/workerd/api/node/zlib-util.h | 3 +-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/workerd/api/node/zlib-util.c++ b/src/workerd/api/node/zlib-util.c++ index 01d58c47f9a..77632c6c9b5 100644 --- a/src/workerd/api/node/zlib-util.c++ +++ b/src/workerd/api/node/zlib-util.c++ @@ -66,6 +66,7 @@ kj::Maybe ZlibContext::getError() const { if (stream.avail_out != 0 && flush == Z_FINISH) { return constructError("unexpected end of file"_kj); } + break; case Z_STREAM_END: // normal statuses, not fatal break; @@ -108,7 +109,7 @@ kj::Maybe ZlibContext::setDictionary() { } bool ZlibContext::initializeZlib() { - if (initialized.lockExclusive()) { + if (initialized) { return false; } switch (mode) { @@ -134,7 +135,7 @@ bool ZlibContext::initializeZlib() { } setDictionary(); - *initialized.lockExclusive() = true; + initialized = true; return true; } @@ -284,7 +285,7 @@ kj::Maybe ZlibContext::setParams(int _level, int _strategy) { } void ZlibContext::close() { - if (!initialized.lockExclusive()) { + if (!initialized) { dictionary.clear(); mode = ZlibMode::NONE; return; diff --git a/src/workerd/api/node/zlib-util.h b/src/workerd/api/node/zlib-util.h index ce4239969df..ecf34a2aa37 100644 --- a/src/workerd/api/node/zlib-util.h +++ b/src/workerd/api/node/zlib-util.h @@ -10,7 +10,6 @@ #include "zlib.h" #include #include -#include #include #include @@ -142,7 +141,7 @@ class ZlibContext final { return {kj::str(message), kj::str(ZlibStrerror(err)), err}; }; - kj::MutexGuarded initialized{false}; + bool initialized = false; ZlibMode mode = ZlibMode::NONE; int flush = Z_NO_FLUSH; int windowBits = 0;