From 154f2ded6cd11570c9cc2ea51919da08ec524077 Mon Sep 17 00:00:00 2001 From: psychocrypt Date: Thu, 3 May 2018 20:35:56 +0200 Subject: add read write lock class add log class from Will Zhang: Package: cpputil Source: https://github.com/willzhang4a58/cpputil License: MIT License --- xmrstak/cpputil/LICENSE.txt | 21 +++++++++++++ xmrstak/cpputil/read_write_lock.h | 63 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 84 insertions(+) create mode 100644 xmrstak/cpputil/LICENSE.txt create mode 100644 xmrstak/cpputil/read_write_lock.h (limited to 'xmrstak/cpputil') diff --git a/xmrstak/cpputil/LICENSE.txt b/xmrstak/cpputil/LICENSE.txt new file mode 100644 index 0000000..7615431 --- /dev/null +++ b/xmrstak/cpputil/LICENSE.txt @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2018 Will Zhang + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/xmrstak/cpputil/read_write_lock.h b/xmrstak/cpputil/read_write_lock.h new file mode 100644 index 0000000..b2db609 --- /dev/null +++ b/xmrstak/cpputil/read_write_lock.h @@ -0,0 +1,63 @@ +#ifndef CPPUTIL_READ_WRITE_LOCK_H_ +#define CPPUTIL_READ_WRITE_LOCK_H_ + +#include +#include + +namespace cpputil { + +class RWLock { + public: + RWLock() : status_(0), waiting_readers_(0), waiting_writers_(0) {} + RWLock(const RWLock&) = delete; + RWLock(RWLock&&) = delete; + RWLock& operator = (const RWLock&) = delete; + RWLock& operator = (RWLock&&) = delete; + + void ReadLock() { + std::unique_lock lck(mtx_); + waiting_readers_ += 1; + read_cv_.wait(lck, [&]() { return waiting_writers_ == 0 && status_ >= 0; }); + waiting_readers_ -= 1; + status_ += 1; + } + + void WriteLock() { + std::unique_lock lck(mtx_); + waiting_writers_ += 1; + write_cv_.wait(lck, [&]() { return status_ == 0; }); + waiting_writers_ -= 1; + status_ = -1; + } + + void UnLock() { + std::unique_lock lck(mtx_); + if (status_ == -1) { + status_ = 0; + } else { + status_ -= 1; + } + if (waiting_writers_ > 0) { + if (status_ == 0) { + write_cv_.notify_one(); + } + } else { + read_cv_.notify_all(); + } + } + + private: + // -1 : one writer + // 0 : no reader and no writer + // n > 0 : n reader + int32_t status_; + int32_t waiting_readers_; + int32_t waiting_writers_; + std::mutex mtx_; + std::condition_variable read_cv_; + std::condition_variable write_cv_; +}; + +} // namespace cpputil + +#endif // CPPUTIL_READ_WRITE_LOCK_H_ -- cgit v1.1 From 0aa7498e122589f2afe0bfc6a565db2f8a61b02d Mon Sep 17 00:00:00 2001 From: psychocrypt Date: Thu, 3 May 2018 20:39:32 +0200 Subject: add license header to `read_write_lock.h` --- xmrstak/cpputil/read_write_lock.h | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'xmrstak/cpputil') diff --git a/xmrstak/cpputil/read_write_lock.h b/xmrstak/cpputil/read_write_lock.h index b2db609..41ebc69 100644 --- a/xmrstak/cpputil/read_write_lock.h +++ b/xmrstak/cpputil/read_write_lock.h @@ -1,3 +1,26 @@ +/* MIT License + * + * Copyright (c) 2018 Will Zhang + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + #ifndef CPPUTIL_READ_WRITE_LOCK_H_ #define CPPUTIL_READ_WRITE_LOCK_H_ -- cgit v1.1 From 460aa90d252645a6351f8557b564fcd5686ddcc1 Mon Sep 17 00:00:00 2001 From: psychocrypt Date: Fri, 4 May 2018 20:18:48 +0200 Subject: github annotations - reformat `read_write_lock.h` - fix spelling issue - move job id increase of the write to the buttom --- xmrstak/cpputil/read_write_lock.h | 108 +++++++++++++++++++++----------------- 1 file changed, 59 insertions(+), 49 deletions(-) (limited to 'xmrstak/cpputil') diff --git a/xmrstak/cpputil/read_write_lock.h b/xmrstak/cpputil/read_write_lock.h index 41ebc69..9139dfd 100644 --- a/xmrstak/cpputil/read_write_lock.h +++ b/xmrstak/cpputil/read_write_lock.h @@ -21,66 +21,76 @@ * SOFTWARE. */ -#ifndef CPPUTIL_READ_WRITE_LOCK_H_ -#define CPPUTIL_READ_WRITE_LOCK_H_ +#pragma once #include #include -namespace cpputil { +namespace cpputil +{ -class RWLock { +class RWLock +{ public: - RWLock() : status_(0), waiting_readers_(0), waiting_writers_(0) {} - RWLock(const RWLock&) = delete; - RWLock(RWLock&&) = delete; - RWLock& operator = (const RWLock&) = delete; - RWLock& operator = (RWLock&&) = delete; + RWLock() : status_(0), waiting_readers_(0), waiting_writers_(0) {} + RWLock(const RWLock&) = delete; + RWLock(RWLock&&) = delete; + RWLock& operator = (const RWLock&) = delete; + RWLock& operator = (RWLock&&) = delete; - void ReadLock() { - std::unique_lock lck(mtx_); - waiting_readers_ += 1; - read_cv_.wait(lck, [&]() { return waiting_writers_ == 0 && status_ >= 0; }); - waiting_readers_ -= 1; - status_ += 1; - } + void ReadLock() + { + std::unique_lock lck(mtx_); + waiting_readers_ += 1; + read_cv_.wait(lck, [&]() { return waiting_writers_ == 0 && status_ >= 0; }); + waiting_readers_ -= 1; + status_ += 1; + } - void WriteLock() { - std::unique_lock lck(mtx_); - waiting_writers_ += 1; - write_cv_.wait(lck, [&]() { return status_ == 0; }); - waiting_writers_ -= 1; - status_ = -1; - } + void WriteLock() + { + std::unique_lock lck(mtx_); + waiting_writers_ += 1; + write_cv_.wait(lck, [&]() { return status_ == 0; }); + waiting_writers_ -= 1; + status_ = -1; + } - void UnLock() { - std::unique_lock lck(mtx_); - if (status_ == -1) { - status_ = 0; - } else { - status_ -= 1; - } - if (waiting_writers_ > 0) { - if (status_ == 0) { - write_cv_.notify_one(); - } - } else { - read_cv_.notify_all(); - } - } + void UnLock() + { + std::unique_lock lck(mtx_); + if (status_ == -1) { + status_ = 0; + } + else + { + status_ -= 1; + } + if (waiting_writers_ > 0) + { + if (status_ == 0) + { + write_cv_.notify_one(); + } + } + else + { + read_cv_.notify_all(); + } + } private: - // -1 : one writer - // 0 : no reader and no writer - // n > 0 : n reader - int32_t status_; - int32_t waiting_readers_; - int32_t waiting_writers_; - std::mutex mtx_; - std::condition_variable read_cv_; - std::condition_variable write_cv_; + /** status of the lock + * -1 : one writer + * 0 : no reader and no writer + * n > 0 : n reader + */ + int32_t status_; + int32_t waiting_readers_; + int32_t waiting_writers_; + std::mutex mtx_; + std::condition_variable read_cv_; + std::condition_variable write_cv_; }; } // namespace cpputil - -#endif // CPPUTIL_READ_WRITE_LOCK_H_ -- cgit v1.1