aboutsummaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorArseny Smalyuk <smalukav@gmail.com>2022-02-10 16:48:05 +0300
committerDaniil Cherednik <dcherednik@yandex-team.ru>2022-02-10 16:48:05 +0300
commit12559cd7f2fa0cf54ffb0d961949fea58c0e18cb (patch)
tree1c6e1bb383ce1ed8ea168386f913410dd55ccb7f /util
parent5b8d95df2f0cfca4d3f5499a4259aa2050ef1571 (diff)
downloadydb-12559cd7f2fa0cf54ffb0d961949fea58c0e18cb.tar.gz
Restoring authorship annotation for Arseny Smalyuk <smalukav@gmail.com>. Commit 1 of 2.
Diffstat (limited to 'util')
-rw-r--r--util/generic/xrange.h4
-rw-r--r--util/network/poller.cpp8
-rw-r--r--util/network/poller.h2
-rw-r--r--util/network/poller_ut.cpp48
-rw-r--r--util/network/pollerimpl.h28
-rw-r--r--util/stream/zlib.cpp32
-rw-r--r--util/stream/zlib_ut.cpp180
7 files changed, 151 insertions, 151 deletions
diff --git a/util/generic/xrange.h b/util/generic/xrange.h
index 5fc8c829121..37e127ee8ed 100644
--- a/util/generic/xrange.h
+++ b/util/generic/xrange.h
@@ -99,7 +99,7 @@ namespace NPrivate {
T Value;
};
- using value_type = T;
+ using value_type = T;
using iterator = TIterator;
using const_iterator = TIterator;
@@ -205,7 +205,7 @@ namespace NPrivate {
const TSteppedXRange* Parent_;
};
- using value_type = T;
+ using value_type = T;
using iterator = TIterator;
using const_iterator = TIterator;
diff --git a/util/network/poller.cpp b/util/network/poller.cpp
index 7954d0e8b55..19cf23ca6a8 100644
--- a/util/network/poller.cpp
+++ b/util/network/poller.cpp
@@ -53,10 +53,10 @@ void TSocketPoller::WaitReadWrite(SOCKET sock, void* cookie) {
Impl_->Set(cookie, sock, CONT_POLL_READ | CONT_POLL_WRITE);
}
-void TSocketPoller::WaitRdhup(SOCKET sock, void* cookie) {
- Impl_->Set(cookie, sock, CONT_POLL_RDHUP);
-}
-
+void TSocketPoller::WaitRdhup(SOCKET sock, void* cookie) {
+ Impl_->Set(cookie, sock, CONT_POLL_RDHUP);
+}
+
void TSocketPoller::WaitReadOneShot(SOCKET sock, void* cookie) {
Impl_->Set(cookie, sock, CONT_POLL_READ | CONT_POLL_ONE_SHOT);
}
diff --git a/util/network/poller.h b/util/network/poller.h
index 8dccd731407..b1307e3d1dd 100644
--- a/util/network/poller.h
+++ b/util/network/poller.h
@@ -13,7 +13,7 @@ public:
void WaitRead(SOCKET sock, void* cookie);
void WaitWrite(SOCKET sock, void* cookie);
void WaitReadWrite(SOCKET sock, void* cookie);
- void WaitRdhup(SOCKET sock, void* cookie);
+ void WaitRdhup(SOCKET sock, void* cookie);
void WaitReadOneShot(SOCKET sock, void* cookie);
void WaitWriteOneShot(SOCKET sock, void* cookie);
diff --git a/util/network/poller_ut.cpp b/util/network/poller_ut.cpp
index 6df0dda8ec5..9324d52c9a5 100644
--- a/util/network/poller_ut.cpp
+++ b/util/network/poller_ut.cpp
@@ -3,7 +3,7 @@
#include "pair.h"
#include "poller.h"
-#include "pollerimpl.h"
+#include "pollerimpl.h"
Y_UNIT_TEST_SUITE(TSocketPollerTest) {
Y_UNIT_TEST(TestSimple) {
@@ -209,28 +209,28 @@ Y_UNIT_TEST_SUITE(TSocketPollerTest) {
poller.Unwait(sockets[1]);
}
}
-
-#if defined(HAVE_EPOLL_POLLER)
- Y_UNIT_TEST(TestRdhup) {
- SOCKET sockets[2];
- UNIT_ASSERT(SocketPair(sockets) == 0);
-
- TSocketHolder s1(sockets[0]);
- TSocketHolder s2(sockets[1]);
-
- char buf[1] = {0};
- UNIT_ASSERT_VALUES_EQUAL(1, send(s1, buf, 1, 0));
- shutdown(s1, SHUT_WR);
-
+
+#if defined(HAVE_EPOLL_POLLER)
+ Y_UNIT_TEST(TestRdhup) {
+ SOCKET sockets[2];
+ UNIT_ASSERT(SocketPair(sockets) == 0);
+
+ TSocketHolder s1(sockets[0]);
+ TSocketHolder s2(sockets[1]);
+
+ char buf[1] = {0};
+ UNIT_ASSERT_VALUES_EQUAL(1, send(s1, buf, 1, 0));
+ shutdown(s1, SHUT_WR);
+
using TPoller = TGenericPoller<TEpollPoller<TWithoutLocking>>;
- TPoller poller;
- poller.Set((void*)17, s2, CONT_POLL_RDHUP);
-
- TPoller::TEvent e;
- UNIT_ASSERT_VALUES_EQUAL(poller.WaitD(&e, 1, TDuration::Zero().ToDeadLine()), 1);
- UNIT_ASSERT_EQUAL(TPoller::ExtractStatus(&e), 0);
- UNIT_ASSERT_EQUAL(TPoller::ExtractFilter(&e), CONT_POLL_RDHUP);
- UNIT_ASSERT_EQUAL(TPoller::ExtractEvent(&e), (void*)17);
- }
-#endif
+ TPoller poller;
+ poller.Set((void*)17, s2, CONT_POLL_RDHUP);
+
+ TPoller::TEvent e;
+ UNIT_ASSERT_VALUES_EQUAL(poller.WaitD(&e, 1, TDuration::Zero().ToDeadLine()), 1);
+ UNIT_ASSERT_EQUAL(TPoller::ExtractStatus(&e), 0);
+ UNIT_ASSERT_EQUAL(TPoller::ExtractFilter(&e), CONT_POLL_RDHUP);
+ UNIT_ASSERT_EQUAL(TPoller::ExtractEvent(&e), (void*)17);
+ }
+#endif
}
diff --git a/util/network/pollerimpl.h b/util/network/pollerimpl.h
index e8c7e40fbaf..25ece427017 100644
--- a/util/network/pollerimpl.h
+++ b/util/network/pollerimpl.h
@@ -36,7 +36,7 @@ enum EContPoll {
CONT_POLL_RDHUP = 4,
CONT_POLL_ONE_SHOT = 8, // Disable after first event
CONT_POLL_MODIFY = 16, // Modify already added event
- CONT_POLL_EDGE_TRIGGERED = 32, // Notify only about new events
+ CONT_POLL_EDGE_TRIGGERED = 32, // Notify only about new events
CONT_POLL_BACKLOG_EMPTY = 64, // Backlog is empty (seen end of request, EAGAIN or truncated read)
};
@@ -245,10 +245,10 @@ public:
e.events |= EPOLLOUT;
}
- if (what & CONT_POLL_RDHUP) {
- e.events |= EPOLLRDHUP;
- }
-
+ if (what & CONT_POLL_RDHUP) {
+ e.events |= EPOLLRDHUP;
+ }
+
e.data.ptr = data;
if ((what & CONT_POLL_MODIFY) || epoll_ctl(Fd_, EPOLL_CTL_ADD, fd, &e) == -1) {
@@ -297,10 +297,10 @@ public:
ret |= CONT_POLL_WRITE;
}
- if (event->events & EPOLLRDHUP) {
- ret |= CONT_POLL_RDHUP;
- }
-
+ if (event->events & EPOLLRDHUP) {
+ ret |= CONT_POLL_RDHUP;
+ }
+
return ret;
}
@@ -495,11 +495,11 @@ public:
SOCKET* keysToDeleteEnd = keysToDeleteBegin;
#if defined(_msan_enabled_) // msan doesn't handle FD_ZERO and cause false positive BALANCER-1347
- memset(in, 0, sizeof(*in));
- memset(out, 0, sizeof(*out));
- memset(errFds, 0, sizeof(*errFds));
+ memset(in, 0, sizeof(*in));
+ memset(out, 0, sizeof(*out));
+ memset(errFds, 0, sizeof(*errFds));
#endif
-
+
FD_ZERO(in);
FD_ZERO(out);
FD_ZERO(errFds);
@@ -669,7 +669,7 @@ public:
static inline int ExtractFilter(const TEvent* event) noexcept {
if (TBase::ExtractStatus(event)) {
- return CONT_POLL_READ | CONT_POLL_WRITE | CONT_POLL_RDHUP;
+ return CONT_POLL_READ | CONT_POLL_WRITE | CONT_POLL_RDHUP;
}
return TBase::ExtractFilterImpl(event);
diff --git a/util/stream/zlib.cpp b/util/stream/zlib.cpp
index 60f4e9439f0..983b753dc23 100644
--- a/util/stream/zlib.cpp
+++ b/util/stream/zlib.cpp
@@ -267,20 +267,20 @@ public:
}
inline void Flush() {
- int ret = deflate(Z(), Z_SYNC_FLUSH);
-
- while ((ret == Z_OK || ret == Z_BUF_ERROR) && !Z()->avail_out) {
- FlushBuffer();
- ret = deflate(Z(), Z_SYNC_FLUSH);
- }
-
- if (ret != Z_OK && ret != Z_BUF_ERROR) {
- ythrow TZLibCompressorError() << "deflate flush error(" << GetErrMsg() << ")";
- }
-
- if (Z()->avail_out < TmpBufLen()) {
- FlushBuffer();
- }
+ int ret = deflate(Z(), Z_SYNC_FLUSH);
+
+ while ((ret == Z_OK || ret == Z_BUF_ERROR) && !Z()->avail_out) {
+ FlushBuffer();
+ ret = deflate(Z(), Z_SYNC_FLUSH);
+ }
+
+ if (ret != Z_OK && ret != Z_BUF_ERROR) {
+ ythrow TZLibCompressorError() << "deflate flush error(" << GetErrMsg() << ")";
+ }
+
+ if (Z()->avail_out < TmpBufLen()) {
+ FlushBuffer();
+ }
}
inline void FlushBuffer() {
@@ -300,7 +300,7 @@ public:
if (ret == Z_STREAM_END) {
Stream_->Write(TmpBuf(), TmpBufLen() - Z()->avail_out);
} else {
- ythrow TZLibCompressorError() << "deflate finish error(" << GetErrMsg() << ")";
+ ythrow TZLibCompressorError() << "deflate finish error(" << GetErrMsg() << ")";
}
}
@@ -339,7 +339,7 @@ size_t TZLibDecompress::DoRead(void* buf, size_t size) {
}
void TZLibCompress::Init(const TParams& params) {
- Y_ENSURE(params.BufLen >= 16, "ZLib buffer too small");
+ Y_ENSURE(params.BufLen >= 16, "ZLib buffer too small");
Impl_.Reset(new (params.BufLen) TImpl(params));
}
diff --git a/util/stream/zlib_ut.cpp b/util/stream/zlib_ut.cpp
index 2290b4a9dee..a03904fe3df 100644
--- a/util/stream/zlib_ut.cpp
+++ b/util/stream/zlib_ut.cpp
@@ -52,14 +52,14 @@ private:
};
Y_UNIT_TEST_SUITE(TZLibTest) {
- static const TString DATA = "8s7d5vc6s5vc67sa4c65ascx6asd4xcv76adsfxv76s";
- static const TString DATA2 = "cn8wk2bd9vb3vdfif83g1ks94bfiovtwv";
+ static const TString DATA = "8s7d5vc6s5vc67sa4c65ascx6asd4xcv76adsfxv76s";
+ static const TString DATA2 = "cn8wk2bd9vb3vdfif83g1ks94bfiovtwv";
Y_UNIT_TEST(Compress) {
TUnbufferedFileOutput o(ZDATA);
TZLibCompress c(&o, ZLib::ZLib);
- c.Write(DATA.data(), DATA.size());
+ c.Write(DATA.data(), DATA.size());
c.Finish();
o.Finish();
}
@@ -71,7 +71,7 @@ Y_UNIT_TEST_SUITE(TZLibTest) {
TUnbufferedFileInput i(ZDATA);
TZLibDecompress d(&i);
- UNIT_ASSERT_EQUAL(d.ReadAll(), DATA);
+ UNIT_ASSERT_EQUAL(d.ReadAll(), DATA);
}
}
@@ -96,10 +96,10 @@ Y_UNIT_TEST_SUITE(TZLibTest) {
{
TUnbufferedFileOutput o(ZDATA);
TZLibCompress c1(&o, ZLib::ZLib);
- c1.Write(DATA.data(), DATA.size());
+ c1.Write(DATA.data(), DATA.size());
c1.Finish();
TZLibCompress c2(&o, ZLib::ZLib);
- c2.Write(DATA2.data(), DATA2.size());
+ c2.Write(DATA2.data(), DATA2.size());
c2.Finish();
o.Finish();
}
@@ -107,7 +107,7 @@ Y_UNIT_TEST_SUITE(TZLibTest) {
TUnbufferedFileInput i(ZDATA);
TZLibDecompress d(&i);
- UNIT_ASSERT_EQUAL(d.ReadAll(), DATA + DATA2);
+ UNIT_ASSERT_EQUAL(d.ReadAll(), DATA + DATA2);
}
}
@@ -132,10 +132,10 @@ Y_UNIT_TEST_SUITE(TZLibTest) {
{
TUnbufferedFileOutput o(ZDATA);
TZLibCompress c1(&o, ZLib::ZLib);
- c1.Write(DATA.data(), DATA.size());
+ c1.Write(DATA.data(), DATA.size());
c1.Finish();
TZLibCompress c2(&o, ZLib::ZLib);
- c2.Write(DATA2.data(), DATA2.size());
+ c2.Write(DATA2.data(), DATA2.size());
c2.Finish();
o.Finish();
}
@@ -144,87 +144,87 @@ Y_UNIT_TEST_SUITE(TZLibTest) {
TZLibDecompress d(&i);
d.SetAllowMultipleStreams(false);
- UNIT_ASSERT_EQUAL(d.ReadAll(), DATA);
- }
- }
-
- Y_UNIT_TEST(CompressFlush) {
- TString data = "";
-
- for (size_t i = 0; i < 32; ++i) {
- TTempFile tmpFile(ZDATA);
-
- TUnbufferedFileOutput output(ZDATA);
- TZLibCompress compressor(&output, ZLib::ZLib);
-
- compressor.Write(data.data(), data.size());
- compressor.Flush();
-
- {
- TUnbufferedFileInput input(ZDATA);
- TZLibDecompress decompressor(&input);
-
- UNIT_ASSERT_EQUAL(decompressor.ReadAll(), data);
- }
-
- data += 'A' + i;
- }
- }
-
- Y_UNIT_TEST(CompressEmptyFlush) {
- TTempFile tmpFile(ZDATA);
-
- TUnbufferedFileOutput output(ZDATA);
- TZLibCompress compressor(&output, ZLib::ZLib);
-
- TUnbufferedFileInput input(ZDATA);
-
- compressor.Write(DATA.data(), DATA.size());
- compressor.Flush();
-
- {
- TZLibDecompress decompressor(&input);
- UNIT_ASSERT_EQUAL(decompressor.ReadAll(), DATA);
- }
-
- for (size_t i = 0; i < 10; ++i) {
- compressor.Flush();
- }
-
- UNIT_ASSERT_EQUAL(input.ReadAll(), "");
- }
-
- Y_UNIT_TEST(CompressFlushSmallBuffer) {
- for (size_t bufferSize = 16; bufferSize < 32; ++bufferSize) {
- TString firstData = "";
-
- for (size_t firstDataSize = 0; firstDataSize < 16; ++firstDataSize) {
- TString secondData = "";
-
- for (size_t secondDataSize = 0; secondDataSize < 16; ++secondDataSize) {
- TTempFile tmpFile(ZDATA);
-
- TUnbufferedFileOutput output(ZDATA);
- TZLibCompress compressor(TZLibCompress::TParams(&output).SetType(ZLib::ZLib).SetBufLen(bufferSize));
-
- TUnbufferedFileInput input(ZDATA);
- TZLibDecompress decompressor(&input);
-
- compressor.Write(firstData.data(), firstData.size());
- compressor.Flush();
-
- UNIT_ASSERT_EQUAL(decompressor.ReadAll(), firstData);
-
- compressor.Write(secondData.data(), secondData.size());
- compressor.Flush();
-
- UNIT_ASSERT_EQUAL(decompressor.ReadAll(), secondData);
-
- secondData += 'A' + secondDataSize;
- }
-
- firstData += 'A' + firstDataSize;
- }
+ UNIT_ASSERT_EQUAL(d.ReadAll(), DATA);
}
}
+
+ Y_UNIT_TEST(CompressFlush) {
+ TString data = "";
+
+ for (size_t i = 0; i < 32; ++i) {
+ TTempFile tmpFile(ZDATA);
+
+ TUnbufferedFileOutput output(ZDATA);
+ TZLibCompress compressor(&output, ZLib::ZLib);
+
+ compressor.Write(data.data(), data.size());
+ compressor.Flush();
+
+ {
+ TUnbufferedFileInput input(ZDATA);
+ TZLibDecompress decompressor(&input);
+
+ UNIT_ASSERT_EQUAL(decompressor.ReadAll(), data);
+ }
+
+ data += 'A' + i;
+ }
+ }
+
+ Y_UNIT_TEST(CompressEmptyFlush) {
+ TTempFile tmpFile(ZDATA);
+
+ TUnbufferedFileOutput output(ZDATA);
+ TZLibCompress compressor(&output, ZLib::ZLib);
+
+ TUnbufferedFileInput input(ZDATA);
+
+ compressor.Write(DATA.data(), DATA.size());
+ compressor.Flush();
+
+ {
+ TZLibDecompress decompressor(&input);
+ UNIT_ASSERT_EQUAL(decompressor.ReadAll(), DATA);
+ }
+
+ for (size_t i = 0; i < 10; ++i) {
+ compressor.Flush();
+ }
+
+ UNIT_ASSERT_EQUAL(input.ReadAll(), "");
+ }
+
+ Y_UNIT_TEST(CompressFlushSmallBuffer) {
+ for (size_t bufferSize = 16; bufferSize < 32; ++bufferSize) {
+ TString firstData = "";
+
+ for (size_t firstDataSize = 0; firstDataSize < 16; ++firstDataSize) {
+ TString secondData = "";
+
+ for (size_t secondDataSize = 0; secondDataSize < 16; ++secondDataSize) {
+ TTempFile tmpFile(ZDATA);
+
+ TUnbufferedFileOutput output(ZDATA);
+ TZLibCompress compressor(TZLibCompress::TParams(&output).SetType(ZLib::ZLib).SetBufLen(bufferSize));
+
+ TUnbufferedFileInput input(ZDATA);
+ TZLibDecompress decompressor(&input);
+
+ compressor.Write(firstData.data(), firstData.size());
+ compressor.Flush();
+
+ UNIT_ASSERT_EQUAL(decompressor.ReadAll(), firstData);
+
+ compressor.Write(secondData.data(), secondData.size());
+ compressor.Flush();
+
+ UNIT_ASSERT_EQUAL(decompressor.ReadAll(), secondData);
+
+ secondData += 'A' + secondDataSize;
+ }
+
+ firstData += 'A' + firstDataSize;
+ }
+ }
+ }
}