ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-11-22 03:55:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove deprecated SharedObject

Browse Source
This commit is contained in:
Vinnie Falco
2013-07-11 14:54:11 -07:00
parent ebad05a9df
commit ccda3068ef
6 changed files with 0 additions and 361 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Builds/VisualStudio2012/beast.vcxproj
View File

@@ -87,7 +87,6 @@
<ClInclude Include="..\..\modules\beast_basics\threads\beast_ReadWriteMutex.h" /> <ClInclude Include="..\..\modules\beast_basics\threads\beast_ReadWriteMutex.h" />
<ClInclude Include="..\..\modules\beast_basics\threads\beast_Semaphore.h" /> <ClInclude Include="..\..\modules\beast_basics\threads\beast_Semaphore.h" />
<ClInclude Include="..\..\modules\beast_basics\threads\beast_SerialFor.h" /> <ClInclude Include="..\..\modules\beast_basics\threads\beast_SerialFor.h" />
<ClInclude Include="..\..\modules\beast_basics\threads\beast_SharedObject.h" />
<ClInclude Include="..\..\modules\beast_basics\threads\beast_ThreadGroup.h" /> <ClInclude Include="..\..\modules\beast_basics\threads\beast_ThreadGroup.h" />
<ClInclude Include="..\..\modules\beast_basics\threads\beast_ThreadWithCallQueue.h" /> <ClInclude Include="..\..\modules\beast_basics\threads\beast_ThreadWithCallQueue.h" />
<ClInclude Include="..\..\modules\beast_core\beast_core.h" /> <ClInclude Include="..\..\modules\beast_core\beast_core.h" />
@@ -316,12 +315,6 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\modules\beast_basics\threads\beast_SharedObject.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\modules\beast_basics\threads\beast_ThreadGroup.cpp"> <ClCompile Include="..\..\modules\beast_basics\threads\beast_ThreadGroup.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>

6
Builds/VisualStudio2012/beast.vcxproj.filters
View File

@@ -524,9 +524,6 @@
<ClInclude Include="..\..\modules\beast_basics\threads\beast_SerialFor.h"> <ClInclude Include="..\..\modules\beast_basics\threads\beast_SerialFor.h">
<Filter>beast_basics\threads</Filter> <Filter>beast_basics\threads</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\modules\beast_basics\threads\beast_SharedObject.h">
<Filter>beast_basics\threads</Filter>
</ClInclude>
<ClInclude Include="..\..\modules\beast_basics\threads\beast_ThreadGroup.h"> <ClInclude Include="..\..\modules\beast_basics\threads\beast_ThreadGroup.h">
<Filter>beast_basics\threads</Filter> <Filter>beast_basics\threads</Filter>
</ClInclude> </ClInclude>
@@ -904,9 +901,6 @@
<ClCompile Include="..\..\modules\beast_basics\threads\beast_Semaphore.cpp"> <ClCompile Include="..\..\modules\beast_basics\threads\beast_Semaphore.cpp">
<Filter>beast_basics\threads</Filter> <Filter>beast_basics\threads</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\modules\beast_basics\threads\beast_SharedObject.cpp">
<Filter>beast_basics\threads</Filter>
</ClCompile>
<ClCompile Include="..\..\modules\beast_basics\threads\beast_ThreadGroup.cpp"> <ClCompile Include="..\..\modules\beast_basics\threads\beast_ThreadGroup.cpp">
<Filter>beast_basics\threads</Filter> <Filter>beast_basics\threads</Filter>
</ClCompile> </ClCompile>

1
modules/beast_basics/beast_basics.cpp
View File

@@ -58,7 +58,6 @@ namespace beast
#include "threads/beast_ManualCallQueue.cpp" #include "threads/beast_ManualCallQueue.cpp"
#include "threads/beast_ParallelFor.cpp" #include "threads/beast_ParallelFor.cpp"
#include "threads/beast_ReadWriteMutex.cpp" #include "threads/beast_ReadWriteMutex.cpp"
#include "threads/beast_SharedObject.cpp"
#include "threads/beast_ThreadGroup.cpp" #include "threads/beast_ThreadGroup.cpp"
#include "threads/beast_ThreadWithCallQueue.cpp" #include "threads/beast_ThreadWithCallQueue.cpp"

1
modules/beast_basics/beast_basics.h
View File

@@ -270,7 +270,6 @@ namespace beast
#include "threads/beast_ManualCallQueue.h" #include "threads/beast_ManualCallQueue.h"
#include "threads/beast_ParallelFor.h" #include "threads/beast_ParallelFor.h"
#include "threads/beast_ThreadWithCallQueue.h" #include "threads/beast_ThreadWithCallQueue.h"
#include "threads/beast_SharedObject.h"
} }

36
modules/beast_basics/threads/beast_SharedObject.cpp
View File

@@ -1,36 +0,0 @@
//------------------------------------------------------------------------------
/*
This file is part of Beast: https://github.com/vinniefalco/Beast
Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
Permission to use, copy, modify, and/or distribute this software for any
purpose with or without fee is hereby granted, provided that the above
copyright notice and this permission notice appear in all copies.
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
ANY SPECIAL , DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
//==============================================================================
SharedObject::ThreadedScope::ThreadedScope (char const* name)
: m_thread (name)
{
m_thread.start (this);
}
void SharedObject::ThreadedScope::destroySharedObject (SharedObject* const object)
{
deleteAsync (object);
}
//------------------------------------------------------------------------------
void SharedObject::destroySharedObject ()
{
delete this;
}

310
modules/beast_basics/threads/beast_SharedObject.h
View File

@@ -1,310 +0,0 @@
//------------------------------------------------------------------------------
/*
This file is part of Beast: https://github.com/vinniefalco/Beast
Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
Permission to use, copy, modify, and/or distribute this software for any
purpose with or without fee is hereby granted, provided that the above
copyright notice and this permission notice appear in all copies.
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
ANY SPECIAL , DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
//==============================================================================
#ifndef BEAST_SHAREDOBJECT_BEASTHEADER
#define BEAST_SHAREDOBJECT_BEASTHEADER
//==============================================================================
/**
A reference counted object with overridable destroy behavior.
This is a reference counted object compatible with SharedObjectPtr or
ReferenceCountedObjectPtr. When the last reference is removed, an
overridable virtual function is called to destroy the object. The default
behavior simply calls operator delete. Overrides can perform more complex
dispose actions, typically to destroy the object on a separate thread.
@ingroup beast_concurrent
*/
class BEAST_API SharedObject : Uncopyable
{
public:
/** Abstract SharedObject scope.
The scope is invoked to destroy the object.
*/
class Scope
{
public:
virtual ~Scope () { }
virtual void destroySharedObject (SharedObject* const object) = 0;
};
public:
/** Separate thread for a SharedObject scope.
This Scope deletes the shared object on a separate provided thread.
*/
class ThreadedScope
: public Scope
, private ThreadWithCallQueue::EntryPoints
{
public:
/** Create a ThreadedScope.
@param name The name of the provided thread, for diagnostics.
*/
explicit ThreadedScope (char const* name);
void destroySharedObject (SharedObject* const object);
/** Delete a dynamic object asynchronously.
This convenient template will delete a dynamically allocated
object on the provided thread.
*/
template <class Object>
void deleteAsync (Object* const object)
{
// If an object being deleted recursively triggers async deletes,
// it is possible that the call queue has already been closed.
// We detect this condition by checking the associated thread and
// doing the delete directly.
//
if (m_thread.isAssociatedWithCurrentThread ())
delete object;
else
m_thread.callf (Delete <Object> (object));
}
private:
// Simple functor to delete an object.
//
template <class Object>
struct Delete
{
Delete (Object* const object) : m_object (object)
{
}
void operator () ()
{
delete m_object;
}
private:
Delete& operator= (Delete const&);
Object* const m_object;
};
private:
ThreadWithCallQueue m_thread;
};
protected:
/** Construct a SharedObject.
The constructor is protected to require subclassing.
*/
SharedObject () { }
virtual ~SharedObject () { }
/** Delete the object.
The default behavior calls operator delete.
*/
virtual void destroySharedObject ();
public:
/** Increment the reference count.
It should not be necessary to call this function directly. Use one of
the RAII containers that manages the reference count to hold the
object instead.
*/
inline void incReferenceCount () noexcept
{
m_refs.addref ();
}
/** Decrement the reference count.
It should not be necessary to call this function directly. Use one of
the RAII containers that manages the reference count to hold the
object instead.
*/
inline void decReferenceCount () noexcept
{
if (m_refs.release ())
destroySharedObject ();
}
private:
AtomicCounter m_refs;
};
//------------------------------------------------------------------------------
/** RAII container for SharedObject.
This container is used to hold a pointer to a SharedObject and manage the
reference counts for you.
*/
template <class Object>
class SharedObjectPtr
{
public:
typedef Object ReferencedType;
inline SharedObjectPtr () noexcept
:
m_object (nullptr)
{
}
inline SharedObjectPtr (Object* const refCountedObject) noexcept
:
m_object (refCountedObject)
{
if (refCountedObject != nullptr)
refCountedObject->incReferenceCount ();
}
inline SharedObjectPtr (const SharedObjectPtr& other) noexcept
:
m_object (other.m_object)
{
if (m_object != nullptr)
m_object->incReferenceCount ();
}
#if BEAST_COMPILER_SUPPORTS_MOVE_SEMANTICS
inline SharedObjectPtr (SharedObjectPtr&& other) noexcept
:
m_object (other.m_object)
{
other.m_object = nullptr;
}
#endif
template <class DerivedClass>
inline SharedObjectPtr (const SharedObjectPtr <DerivedClass>& other) noexcept
:
m_object (static_cast <Object*> (other.get ()))
{
if (m_object != nullptr)
m_object->incReferenceCount ();
}
SharedObjectPtr& operator= (const SharedObjectPtr& other)
{
return operator= (other.m_object);
}
template <class DerivedClass>
SharedObjectPtr& operator= (const SharedObjectPtr <DerivedClass>& other)
{
return operator= (static_cast <Object*> (other.get ()));
}
#if BEAST_COMPILER_SUPPORTS_MOVE_SEMANTICS
SharedObjectPtr& operator= (SharedObjectPtr && other)
{
std::swap (m_object, other.m_object);
return *this;
}
#endif
SharedObjectPtr& operator= (Object* const newObject)
{
if (m_object != newObject)
{
if (newObject != nullptr)
newObject->incReferenceCount ();
Object* const oldObject = m_object;
m_object = newObject;
if (oldObject != nullptr)
oldObject->decReferenceCount ();
}
return *this;
}
inline ~SharedObjectPtr ()
{
if (m_object != nullptr)
m_object->decReferenceCount ();
}
inline operator Object* () const noexcept
{
return m_object;
}
inline Object* operator-> () const noexcept
{
return m_object;
}
inline Object* get () const noexcept
{
return m_object;
}
inline Object* getObject () const noexcept
{
return m_object;
}
private:
Object* m_object;
};
template <class Object>
bool operator== (const SharedObjectPtr <Object>& object1, Object* const object2) noexcept
{
return object1.get () == object2;
}
template <class Object>
bool operator== (const SharedObjectPtr <Object>& object1, const SharedObjectPtr <Object>& object2) noexcept
{
return object1.get () == object2.get ();
}
template <class Object>
bool operator== (Object* object1, SharedObjectPtr <Object>& object2) noexcept
{
return object1 == object2.get ();
}
template <class Object>
bool operator!= (const SharedObjectPtr <Object>& object1, const Object* object2) noexcept
{
return object1.get () != object2;
}
template <class Object>
bool operator!= (const SharedObjectPtr <Object>& object1, SharedObjectPtr <Object>& object2) noexcept
{
return object1.get () != object2.get ();
}
template <class Object>
bool operator!= (Object* object1, SharedObjectPtr <Object>& object2) noexcept
{
return object1 != object2.get ();
}
#endif