From 6265f9a0d8b213529905324f90059941a4f2a99a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Gl=C3=B6ckner?= Date: Wed, 23 Mar 2016 22:40:27 +0100 Subject: atomic workaround --- src/atomic.h | 105 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 105 insertions(+) create mode 100644 src/atomic.h (limited to 'src/atomic.h') diff --git a/src/atomic.h b/src/atomic.h new file mode 100644 index 0000000..11c87fc --- /dev/null +++ b/src/atomic.h @@ -0,0 +1,105 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/*************************************************************************** + * atomic.h + * + * Wed Mar 23 09:15:05 CET 2016 + * Copyright 2016 Christian Glöckner + * cgloeckner@freenet.de + ****************************************************************************/ + +/* + * This file is part of DrumGizmo. + * + * DrumGizmo is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * DrumGizmo is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with DrumGizmo; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. + */ +#pragma once + +#include +#include +#include + +template +class Atomic; + +// use std::atomic if possible +template +class Atomic::value>::type> + : public std::atomic { +}; + +// else work around it using a mutex +template +class Atomic::value>::type> { + public: + using self_type = Atomic::value>::type>; + + Atomic() + : data{} + , mutex{} { + } + + Atomic(T data) + : data{std::move(data)} + , mutex{} { + } + + Atomic(self_type const & other) + : data{} + , mutex{} { + std::lock_guard lock{other.mutex}; + data = other.data; + } + + Atomic(self_type&& other) + : data{} + , mutex{} { + std::lock_guard lock{other.mutex}; + std::swap(data, other.data); + } + + T operator=(T data) { + std::lock_guard lock{mutex}; + this->data = std::move(data); + return this->data; + } + + operator T() const { + return load(); + } + + bool is_lock_free() const { + return false; + } + + void store(T data) { + std::lock_guard lock{mutex}; + this->data = std::move(data); + } + + T load() const { + std::lock_guard lock{mutex}; + return data; + } + + T exchange(T data){ + std::lock_guard lock{mutex}; + std::swap(data, this->data); + return data; + } + + private: + T data; + mutable std::mutex mutex; +}; -- cgit v1.2.3 From bd1434b6cfc59c37362ea6f462034f8265072c9a Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Wed, 23 Mar 2016 23:02:35 +0100 Subject: Use new Atomic class. --- src/atomic.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/atomic.h') diff --git a/src/atomic.h b/src/atomic.h index 11c87fc..f800f68 100644 --- a/src/atomic.h +++ b/src/atomic.h @@ -35,15 +35,15 @@ class Atomic; // use std::atomic if possible template -class Atomic::value>::type> +class Atomic::value>::type> : public std::atomic { }; // else work around it using a mutex template -class Atomic::value>::type> { +class Atomic::value>::type> { public: - using self_type = Atomic::value>::type>; + using self_type = Atomic::value>::type>; Atomic() : data{} -- cgit v1.2.3 From 0d2668121d2b3e188dc60cb7bdb5d9dcc39beab4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Gl=C3=B6ckner?= Date: Thu, 31 Mar 2016 08:10:44 +0200 Subject: Fixed API of class Atomic for POD --- src/atomic.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/atomic.h') diff --git a/src/atomic.h b/src/atomic.h index f800f68..1b92257 100644 --- a/src/atomic.h +++ b/src/atomic.h @@ -37,6 +37,11 @@ class Atomic; template class Atomic::value>::type> : public std::atomic { + + public: + // inherit methods + using std::atomic::atomic; + using std::atomic::operator=; }; // else work around it using a mutex -- cgit v1.2.3 From f2b504f25d8cc44206518121259920314c2c80a9 Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Thu, 31 Mar 2016 14:51:36 +0200 Subject: Fix compilation on windows. --- src/atomic.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/atomic.h') diff --git a/src/atomic.h b/src/atomic.h index 1b92257..ed6fa39 100644 --- a/src/atomic.h +++ b/src/atomic.h @@ -28,7 +28,8 @@ #include #include -#include + +#include "mutex.h" template class Atomic; -- cgit v1.2.3 From e5614c828c7c470d26890ea31f72610278d0eeb2 Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Thu, 31 Mar 2016 15:12:37 +0200 Subject: Fix mutex include issue. --- src/atomic.h | 1 + 1 file changed, 1 insertion(+) (limited to 'src/atomic.h') diff --git a/src/atomic.h b/src/atomic.h index ed6fa39..84ef949 100644 --- a/src/atomic.h +++ b/src/atomic.h @@ -29,6 +29,7 @@ #include #include +#include #include "mutex.h" template -- cgit v1.2.3 From 02784b77bb4f652d362297d947b8305dea2b195a Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Sat, 2 Apr 2016 10:19:20 +0200 Subject: Make Atimoc fit style-guide. --- src/atomic.h | 144 ++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 77 insertions(+), 67 deletions(-) (limited to 'src/atomic.h') diff --git a/src/atomic.h b/src/atomic.h index 84ef949..e0b80b1 100644 --- a/src/atomic.h +++ b/src/atomic.h @@ -38,75 +38,85 @@ class Atomic; // use std::atomic if possible template class Atomic::value>::type> - : public std::atomic { - - public: - // inherit methods - using std::atomic::atomic; - using std::atomic::operator=; + : public std::atomic +{ +public: + // inherit methods + using std::atomic::atomic; + using std::atomic::operator=; }; // else work around it using a mutex template -class Atomic::value>::type> { - public: - using self_type = Atomic::value>::type>; - - Atomic() - : data{} - , mutex{} { - } - - Atomic(T data) - : data{std::move(data)} - , mutex{} { - } - - Atomic(self_type const & other) - : data{} - , mutex{} { - std::lock_guard lock{other.mutex}; - data = other.data; - } - - Atomic(self_type&& other) - : data{} - , mutex{} { - std::lock_guard lock{other.mutex}; - std::swap(data, other.data); - } - - T operator=(T data) { - std::lock_guard lock{mutex}; - this->data = std::move(data); - return this->data; - } - - operator T() const { - return load(); - } - - bool is_lock_free() const { - return false; - } - - void store(T data) { - std::lock_guard lock{mutex}; - this->data = std::move(data); - } - - T load() const { - std::lock_guard lock{mutex}; - return data; - } - - T exchange(T data){ - std::lock_guard lock{mutex}; - std::swap(data, this->data); - return data; - } - - private: - T data; - mutable std::mutex mutex; +class Atomic::value>::type> +{ +public: + using self_type = + Atomic::value>::type>; + + Atomic() + : data{} + , mutex{} + { + } + + Atomic(T data) + : data{std::move(data)} + , mutex{} + { + } + + Atomic(self_type const & other) + : data{} + , mutex{} + { + std::lock_guard lock{other.mutex}; + data = other.data; + } + + Atomic(self_type&& other) + : data{} + , mutex{} + { + std::lock_guard lock{other.mutex}; + std::swap(data, other.data); + } + + T operator=(T data) + { + std::lock_guard lock{mutex}; + this->data = std::move(data); + return this->data; + } + + operator T() const + { + return load(); + } + + bool is_lock_free() const + { + return false; + } + + void store(T data) + { + std::lock_guard lock{mutex}; + this->data = std::move(data); + } + + T load() const { + std::lock_guard lock{mutex}; + return data; + } + + T exchange(T data){ + std::lock_guard lock{mutex}; + std::swap(data, this->data); + return data; + } + +private: + T data; + mutable std::mutex mutex; }; -- cgit v1.2.3 From 057ef1d83ba263fb2adf1aa86f8e281ab0065c43 Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Fri, 8 Apr 2016 00:15:32 +0200 Subject: Refactoring to finally get rid of MessageHandler/Receiver in favor of the new Settings mechanism. --- src/atomic.h | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) (limited to 'src/atomic.h') diff --git a/src/atomic.h b/src/atomic.h index e0b80b1..95a5e9d 100644 --- a/src/atomic.h +++ b/src/atomic.h @@ -116,7 +116,67 @@ public: return data; } + bool operator==(const T& other) const + { + std::lock_guard lock{mutex}; + return other == data; + } + + bool operator!=(const T& other) const + { + std::lock_guard lock{mutex}; + return !(other == data); + } + + bool operator==(const Atomic& other) const + { + std::lock_guard lock{mutex}; + return other.load() == data; + } + + bool operator!=(const Atomic& other) const + { + std::lock_guard lock{mutex}; + return !(other.load() == data); + } + private: T data; mutable std::mutex mutex; }; + +//! Getter utility class. +template class SettingRef +{ +public: + SettingRef(Atomic& value) + : value(value) + { + // string isn't lock free either + assert((std::is_same::value || value.is_lock_free())); + } + + bool hasChanged() + { + T tmp = cache; + cache.exchange(value); + + if(firstAccess) + { + firstAccess = false; + return true; + } + + return cache != tmp; + } + + T getValue() const + { + return cache; + } + +private: + bool firstAccess{true}; + Atomic& value; + Atomic cache; +}; -- cgit v1.2.3