aboutsummaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authornsofya <nsofya@yandex-team.ru>2022-02-10 16:49:52 +0300
committerDaniil Cherednik <dcherednik@yandex-team.ru>2022-02-10 16:49:52 +0300
commit3f5911a056d3dbc4bfd724740244a3a9c11575ef (patch)
tree5d5cb817648f650d76cf1076100726fd9b8448e8 /util
parent2ea6d2c7415473747379b1c65468241b431057ad (diff)
downloadydb-3f5911a056d3dbc4bfd724740244a3a9c11575ef.tar.gz
Restoring authorship annotation for <nsofya@yandex-team.ru>. Commit 2 of 2.
Diffstat (limited to 'util')
-rw-r--r--util/system/guard_ut.cpp50
-rw-r--r--util/system/rwlock.h18
2 files changed, 34 insertions, 34 deletions
diff --git a/util/system/guard_ut.cpp b/util/system/guard_ut.cpp
index c470ef788d..404ede99ab 100644
--- a/util/system/guard_ut.cpp
+++ b/util/system/guard_ut.cpp
@@ -1,5 +1,5 @@
#include "guard.h"
-#include "rwlock.h"
+#include "rwlock.h"
#include <library/cpp/testing/unittest/registar.h>
@@ -12,7 +12,7 @@ struct TTestGuard: public TTestBase {
UNIT_TEST(TestMove)
UNIT_TEST(TestSync)
UNIT_TEST(TestUnguard)
- UNIT_TEST(TestTryReadGuard)
+ UNIT_TEST(TestTryReadGuard)
UNIT_TEST(TestWithLock)
UNIT_TEST(TestWithLockScope);
UNIT_TEST_SUITE_END();
@@ -129,29 +129,29 @@ struct TTestGuard: public TTestBase {
}
UNIT_ASSERT(!checker.guarded);
}
-
- void TestTryReadGuard() {
- TRWMutex mutex;
- {
- TTryReadGuard tryGuard(mutex);
- UNIT_ASSERT(tryGuard.WasAcquired());
- TReadGuard readGuard(mutex);
- TTryReadGuard anotherTryGuard(mutex);
- UNIT_ASSERT(tryGuard.WasAcquired());
- }
- {
- TReadGuard readGuard(mutex);
- TTryReadGuard tryGuard(mutex);
- UNIT_ASSERT(tryGuard.WasAcquired());
- }
- {
- TWriteGuard writeGuard(mutex);
- TTryReadGuard tryGuard(mutex);
- UNIT_ASSERT(!tryGuard.WasAcquired());
- }
- TTryReadGuard tryGuard(mutex);
- UNIT_ASSERT(tryGuard.WasAcquired());
- }
+
+ void TestTryReadGuard() {
+ TRWMutex mutex;
+ {
+ TTryReadGuard tryGuard(mutex);
+ UNIT_ASSERT(tryGuard.WasAcquired());
+ TReadGuard readGuard(mutex);
+ TTryReadGuard anotherTryGuard(mutex);
+ UNIT_ASSERT(tryGuard.WasAcquired());
+ }
+ {
+ TReadGuard readGuard(mutex);
+ TTryReadGuard tryGuard(mutex);
+ UNIT_ASSERT(tryGuard.WasAcquired());
+ }
+ {
+ TWriteGuard writeGuard(mutex);
+ TTryReadGuard tryGuard(mutex);
+ UNIT_ASSERT(!tryGuard.WasAcquired());
+ }
+ TTryReadGuard tryGuard(mutex);
+ UNIT_ASSERT(tryGuard.WasAcquired());
+ }
int WithLockIncrement(TGuardChecker& m, int n) {
with_lock (m) {
diff --git a/util/system/rwlock.h b/util/system/rwlock.h
index 52b188a67f..0bb9b3fe1c 100644
--- a/util/system/rwlock.h
+++ b/util/system/rwlock.h
@@ -39,11 +39,11 @@ struct TReadGuardOps {
template <class T>
struct TTryReadGuardOps: public TReadGuardOps<T> {
static inline bool TryAcquire(T* t) noexcept {
- return t->TryAcquireRead();
- }
-};
-
-template <class T>
+ return t->TryAcquireRead();
+ }
+};
+
+template <class T>
struct TWriteGuardOps {
static inline void Acquire(T* t) noexcept {
t->AcquireWrite();
@@ -63,8 +63,8 @@ struct TTryWriteGuardOps: public TWriteGuardOps<T> {
template <class T>
using TReadGuardBase = TGuard<T, TReadGuardOps<T>>;
-template <class T>
-using TTryReadGuardBase = TTryGuard<T, TTryReadGuardOps<T>>;
+template <class T>
+using TTryReadGuardBase = TTryGuard<T, TTryReadGuardOps<T>>;
template <class T>
using TWriteGuardBase = TGuard<T, TWriteGuardOps<T>>;
@@ -72,7 +72,7 @@ template <class T>
using TTryWriteGuardBase = TTryGuard<T, TTryWriteGuardOps<T>>;
using TReadGuard = TReadGuardBase<TRWMutex>;
-using TTryReadGuard = TTryReadGuardBase<TRWMutex>;
-
+using TTryReadGuard = TTryReadGuardBase<TRWMutex>;
+
using TWriteGuard = TWriteGuardBase<TRWMutex>;
using TTryWriteGuard = TTryWriteGuardBase<TRWMutex>;