flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-14 08:45:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Issue #77 Break dependency of lockfree on variant

Browse Source
This commit is contained in:
Mat Sutcliffe
2020-08-28 00:37:45 +01:00
parent f6a908510e
commit 67397c7cdd
1 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/blackmisc/lockfree.h
View File

@@ -12,9 +12,6 @@
#define BLACKMISC_LOCKFREE_H #define BLACKMISC_LOCKFREE_H
#include "blackmisc/blackmiscexport.h" #include "blackmisc/blackmiscexport.h"
#include "blackmisc/integersequence.h"
#include "blackmisc/variant.h"
#include "blackmisc/variantprivate.h"
#include <stddef.h> #include <stddef.h>
#include <QMetaType> #include <QMetaType>
@@ -108,7 +105,7 @@ namespace BlackMisc
{ {
if (m_ptr.use_count() == 0) { return; } // *this has been moved from if (m_ptr.use_count() == 0) { return; } // *this has been moved from
bool success = std::atomic_compare_exchange_strong(m_now, &m_old, std::shared_ptr<const T>(m_ptr)); bool success = std::atomic_compare_exchange_strong(m_now, &m_old, std::shared_ptr<const T>(m_ptr));
Q_ASSERT_X(success, qPrintable(name()), "UniqueWriter detected simultaneous writes"); Q_ASSERT_X(success, Q_FUNC_INFO, "UniqueWriter detected simultaneous writes");
Q_UNUSED(success); Q_UNUSED(success);
} }
@@ -119,8 +116,6 @@ namespace BlackMisc
std::shared_ptr<const T> m_old; std::shared_ptr<const T> m_old;
std::shared_ptr<const T> *m_now; std::shared_ptr<const T> *m_now;
std::shared_ptr<T> m_ptr; std::shared_ptr<T> m_ptr;
static QString name() { return QString("LockFree<") + QMetaType::typeName(Private::MetaTypeHelper<T>::maybeGetMetaTypeId()) + ">"; }
}; };
/*! /*!
@@ -152,7 +147,7 @@ namespace BlackMisc
//! If false is returned, then the caller must try again. This would happen if another simultaneous write had occurred. //! If false is returned, then the caller must try again. This would happen if another simultaneous write had occurred.
operator bool() operator bool()
{ {
Q_ASSERT_X(m_ptr.use_count() > 0, qPrintable(name()), "SharedWriter tried to commit changes twice"); Q_ASSERT_X(m_ptr.use_count() > 0, Q_FUNC_INFO, "SharedWriter tried to commit changes twice");
if (std::atomic_compare_exchange_strong(m_now, &m_old, std::shared_ptr<const T>(m_ptr))) if (std::atomic_compare_exchange_strong(m_now, &m_old, std::shared_ptr<const T>(m_ptr)))
{ {
m_ptr.reset(); m_ptr.reset();
@@ -167,7 +162,7 @@ namespace BlackMisc
//! Destructor. The writer's changes must be committed before this is called. //! Destructor. The writer's changes must be committed before this is called.
~LockFreeSharedWriter() ~LockFreeSharedWriter()
{ {
Q_ASSERT_X(m_ptr.use_count() == 0, qPrintable(name()), "SharedWriter destroyed without committing changes"); Q_ASSERT_X(m_ptr.use_count() == 0, Q_FUNC_INFO, "SharedWriter destroyed without committing changes");
} }
//! LockFreeSharedWriter cannot be copied. //! LockFreeSharedWriter cannot be copied.
@@ -193,8 +188,6 @@ namespace BlackMisc
std::shared_ptr<const T> m_old; std::shared_ptr<const T> m_old;
std::shared_ptr<const T> *m_now; std::shared_ptr<const T> *m_now;
std::shared_ptr<T> m_ptr; std::shared_ptr<T> m_ptr;
static QString name() { return QString("LockFree<") + QMetaType::typeName(Private::MetaTypeHelper<T>::maybeGetMetaTypeId()) + ">"; }
}; };
/*! /*!