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 +++++++++++++++++++++++++++++++++++++++++++++++++++++ test/Makefile.am | 7 +++- test/atomictest.cc | 77 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 188 insertions(+), 1 deletion(-) create mode 100644 src/atomic.h create mode 100644 test/atomictest.cc 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; +}; diff --git a/test/Makefile.am b/test/Makefile.am index ccb21e6..ea0912b 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -3,7 +3,7 @@ include $(top_srcdir)/src/Makefile.am.drumgizmo TESTS = resource engine gui resampler lv2 configfile audiocache \ audiocachefile audiocacheidmanager audiocacheeventhandler \ - memchecker random + memchecker random atomictest check_PROGRAMS = $(TESTS) @@ -138,5 +138,10 @@ random_SOURCES = \ test.cc \ randomtest.cc +atomictest_CXXFLAGS = -DOUTPUT=\"atomictest\" $(CPPUNIT_CFLAGS) \ + -I$(top_srcdir)/src -I$(top_srcdir)/hugin +atomictest_LDFLAGS = $(CPPUNIT_LIBS) +atomictest_SOURCES = atomictest.cc test.cc + EXTRA_DIST = \ lv2_test_host.h diff --git a/test/atomictest.cc b/test/atomictest.cc new file mode 100644 index 0000000..d4cacf0 --- /dev/null +++ b/test/atomictest.cc @@ -0,0 +1,77 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/*************************************************************************** + * atomic.cc + * + * Wed Mar 23 09:17:12 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. + */ +#include + +#include + +class AtomicTest + : public CppUnit::TestFixture { + + CPPUNIT_TEST_SUITE(AtomicTest); + CPPUNIT_TEST(atomicIntUsesStandardImpl); + CPPUNIT_TEST(atomicFloatUsesStandardImpl); + CPPUNIT_TEST(atomicBoolUsesStandardImpl); + CPPUNIT_TEST(atomicStringCanBeUsed); + CPPUNIT_TEST_SUITE_END(); + + public: + void setUp() {} + void tearDown() {} + + void atomicIntUsesStandardImpl() { + CPPUNIT_ASSERT(isUsingStandardImpl()); + } + + void atomicFloatUsesStandardImpl() { + CPPUNIT_ASSERT(isUsingStandardImpl()); + } + + void atomicBoolUsesStandardImpl() { + CPPUNIT_ASSERT(isUsingStandardImpl()); + } + + void atomicDoubleUsesStandardImpl() { + CPPUNIT_ASSERT(isUsingStandardImpl()); + } + + void atomicStringCanBeUsed() { + // note: if it couldn't be used, the compiler would complain + Atomic tmp; + } + + // todo: further testing + + private: + template + bool isUsingStandardImpl() { + return std::is_base_of, Atomic>::value; + } +}; + +// Registers the fixture into the 'registry' +CPPUNIT_TEST_SUITE_REGISTRATION(AtomicTest); + -- cgit v1.2.3