ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-11-20 19:15:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace obsolete OncePerSecond with DeadlineTimer

Browse Source
This commit is contained in:
Vinnie Falco
2013-09-05 04:29:48 -07:00
parent e26a3a1d84
commit e892e9bb4e
6 changed files with 10 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Subtrees/beast/Builds/VisualStudio2012/beast.vcxproj
View File

@@ -275,7 +275,6 @@
<ClInclude Include="..\..\modules\beast_core\thread\beast_InterruptibleThread.h" /> <ClInclude Include="..\..\modules\beast_core\thread\beast_InterruptibleThread.h" />
<ClInclude Include="..\..\modules\beast_core\thread\beast_Listeners.h" /> <ClInclude Include="..\..\modules\beast_core\thread\beast_Listeners.h" />
<ClInclude Include="..\..\modules\beast_core\thread\beast_ManualCallQueue.h" /> <ClInclude Include="..\..\modules\beast_core\thread\beast_ManualCallQueue.h" />
<ClInclude Include="..\..\modules\beast_core\thread\beast_OncePerSecond.h" />
<ClInclude Include="..\..\modules\beast_core\thread\beast_ParallelFor.h" /> <ClInclude Include="..\..\modules\beast_core\thread\beast_ParallelFor.h" />
<ClInclude Include="..\..\modules\beast_core\thread\beast_Semaphore.h" /> <ClInclude Include="..\..\modules\beast_core\thread\beast_Semaphore.h" />
<ClInclude Include="..\..\modules\beast_core\thread\beast_SerialFor.h" /> <ClInclude Include="..\..\modules\beast_core\thread\beast_SerialFor.h" />
@@ -1017,12 +1016,6 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\modules\beast_core\thread\beast_OncePerSecond.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\modules\beast_core\thread\beast_ParallelFor.cpp"> <ClCompile Include="..\..\modules\beast_core\thread\beast_ParallelFor.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>

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

@@ -809,9 +809,6 @@
<ClInclude Include="..\..\modules\beast_core\thread\beast_DeadlineTimer.h"> <ClInclude Include="..\..\modules\beast_core\thread\beast_DeadlineTimer.h">
<Filter>beast_core\thread</Filter> <Filter>beast_core\thread</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\modules\beast_core\thread\beast_OncePerSecond.h">
<Filter>beast_core\thread</Filter>
</ClInclude>
<ClInclude Include="..\..\modules\beast_core\thread\beast_CallQueue.h"> <ClInclude Include="..\..\modules\beast_core\thread\beast_CallQueue.h">
<Filter>beast_core\thread</Filter> <Filter>beast_core\thread</Filter>
</ClInclude> </ClInclude>
@@ -1405,9 +1402,6 @@
<ClCompile Include="..\..\modules\beast_core\thread\beast_DeadlineTimer.cpp"> <ClCompile Include="..\..\modules\beast_core\thread\beast_DeadlineTimer.cpp">
<Filter>beast_core\thread</Filter> <Filter>beast_core\thread</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\modules\beast_core\thread\beast_OncePerSecond.cpp">
<Filter>beast_core\thread</Filter>
</ClCompile>
<ClCompile Include="..\..\modules\beast_core\thread\beast_CallQueue.cpp"> <ClCompile Include="..\..\modules\beast_core\thread\beast_CallQueue.cpp">
<Filter>beast_core\thread</Filter> <Filter>beast_core\thread</Filter>
</ClCompile> </ClCompile>

1
Subtrees/beast/modules/beast_core/beast_core.cpp
View File

@@ -213,7 +213,6 @@ namespace beast
#include "thread/impl/TrackedMutex.cpp" #include "thread/impl/TrackedMutex.cpp"
#include "thread/beast_DeadlineTimer.cpp" #include "thread/beast_DeadlineTimer.cpp"
#include "thread/beast_OncePerSecond.cpp"
#include "thread/beast_InterruptibleThread.cpp" #include "thread/beast_InterruptibleThread.cpp"
#include "thread/beast_Semaphore.cpp" #include "thread/beast_Semaphore.cpp"
#include "thread/beast_CallQueue.cpp" #include "thread/beast_CallQueue.cpp"

1
Subtrees/beast/modules/beast_core/beast_core.h
View File

@@ -409,7 +409,6 @@ extern BEAST_API void BEAST_CALLTYPE logAssertion (char const* file, int line) n
#include "functional/beast_Function.h" #include "functional/beast_Function.h"
#include "thread/beast_DeadlineTimer.h" #include "thread/beast_DeadlineTimer.h"
#include "thread/beast_OncePerSecond.h"
#include "memory/beast_AllocatedBy.h" #include "memory/beast_AllocatedBy.h"
#include "memory/beast_PagedFreeStore.h" #include "memory/beast_PagedFreeStore.h"

11
Subtrees/beast/modules/beast_core/memory/beast_PagedFreeStore.cpp
View File

@@ -81,7 +81,8 @@ inline PagedFreeStore::Page* PagedFreeStore::toPage (void* const p)
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
PagedFreeStore::PagedFreeStore (const size_t pageBytes) PagedFreeStore::PagedFreeStore (const size_t pageBytes)
: m_pageBytes (pageBytes) : m_timer (this)
, m_pageBytes (pageBytes)
, m_pageBytesAvailable (pageBytes - Memory::sizeAdjustedForAlignment (sizeof (Page))) , m_pageBytesAvailable (pageBytes - Memory::sizeAdjustedForAlignment (sizeof (Page)))
, m_newPagesLeft (int ((hardLimitMegaBytes * 1024 * 1024) / m_pageBytes)) , m_newPagesLeft (int ((hardLimitMegaBytes * 1024 * 1024) / m_pageBytes))
#if LOG_GC #if LOG_GC
@@ -91,12 +92,12 @@ PagedFreeStore::PagedFreeStore (const size_t pageBytes)
m_hot = m_pool1; m_hot = m_pool1;
m_cold = m_pool2; m_cold = m_pool2;
startOncePerSecond (); m_timer.setExpiration (1.0);
} }
PagedFreeStore::~PagedFreeStore () PagedFreeStore::~PagedFreeStore ()
{ {
endOncePerSecond (); m_timer.reset ();
#if LOG_GC #if LOG_GC
bassert (!m_used.isSignaled ()); bassert (!m_used.isSignaled ());
@@ -162,7 +163,7 @@ void PagedFreeStore::deallocate (void* const p)
// //
// Perform garbage collection. // Perform garbage collection.
// //
void PagedFreeStore::doOncePerSecond () void PagedFreeStore::onDeadlineTimer (DeadlineTimer&)
{ {
// Physically free one page. // Physically free one page.
// This will reduce the working set over time after a spike. // This will reduce the working set over time after a spike.
@@ -195,6 +196,8 @@ void PagedFreeStore::doOncePerSecond ()
<< String (m_newPagesLeft.get ()) << ")"; << String (m_newPagesLeft.get ()) << ")";
Logger::outputDebugString (s); Logger::outputDebugString (s);
#endif #endif
m_timer.setExpiration (1.0);
} }
void PagedFreeStore::dispose (Pages& pages) void PagedFreeStore::dispose (Pages& pages)

5
Subtrees/beast/modules/beast_core/memory/beast_PagedFreeStore.h
View File

@@ -29,7 +29,7 @@
@ingroup beast_concurrent @ingroup beast_concurrent
*/ */
class BEAST_API PagedFreeStore : private OncePerSecond class BEAST_API PagedFreeStore : private DeadlineTimer::Listener
{ {
public: public:
explicit PagedFreeStore (const size_t pageBytes); explicit PagedFreeStore (const size_t pageBytes);
@@ -56,7 +56,7 @@ public:
private: private:
void* newPage (); void* newPage ();
void doOncePerSecond (); void onDeadlineTimer (DeadlineTimer&);
private: private:
struct Page; struct Page;
@@ -75,6 +75,7 @@ private:
void dispose (Pool& pool); void dispose (Pool& pool);
private: private:
DeadlineTimer m_timer;
const size_t m_pageBytes; const size_t m_pageBytes;
const size_t m_pageBytesAvailable; const size_t m_pageBytesAvailable;
CacheLine::Aligned <Pool> m_pool1; // pair of pools CacheLine::Aligned <Pool> m_pool1; // pair of pools