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

General refactoring of beast framework classes

Browse Source
This commit is contained in:
Vinnie Falco
2013-09-12 08:26:25 -07:00
parent 8c1c7b48bb
commit 681f98ad07
34 changed files with 533 additions and 339 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Builds/QtCreator/rippled.pro
View File

@@ -31,6 +31,8 @@ TEMPLATE = app
CONFIG += console thread warn_off CONFIG += console thread warn_off
CONFIG -= qt gui CONFIG -= qt gui
DEFINES += _DEBUG
linux-g++:QMAKE_CXXFLAGS += \ linux-g++:QMAKE_CXXFLAGS += \
-Wall \ -Wall \
-Wno-sign-compare \ -Wno-sign-compare \

4
Builds/VisualStudio2012/RippleD.vcxproj
View File

@@ -208,7 +208,7 @@
<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="..\..\src\ripple_app\main\ripple_FatalErrorReporter.cpp"> <ClCompile Include="..\..\src\ripple_app\main\FatalErrorReporter.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>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
@@ -1421,7 +1421,7 @@
<ClInclude Include="..\..\src\ripple_app\ledger\SerializedValidation.h" /> <ClInclude Include="..\..\src\ripple_app\ledger\SerializedValidation.h" />
<ClInclude Include="..\..\src\ripple_app\main\ParameterTable.h" /> <ClInclude Include="..\..\src\ripple_app\main\ParameterTable.h" />
<ClInclude Include="..\..\src\ripple_app\main\ripple_Application.h" /> <ClInclude Include="..\..\src\ripple_app\main\ripple_Application.h" />
<ClInclude Include="..\..\src\ripple_app\main\ripple_FatalErrorReporter.h" /> <ClInclude Include="..\..\src\ripple_app\main\FatalErrorReporter.h" />
<ClInclude Include="..\..\src\ripple_app\main\ripple_LoadManager.h" /> <ClInclude Include="..\..\src\ripple_app\main\ripple_LoadManager.h" />
<ClInclude Include="..\..\src\ripple_app\main\ripple_LocalCredentials.h" /> <ClInclude Include="..\..\src\ripple_app\main\ripple_LocalCredentials.h" />
<ClInclude Include="..\..\src\ripple_app\main\ripple_RippleMain.h" /> <ClInclude Include="..\..\src\ripple_app\main\ripple_RippleMain.h" />

12
Builds/VisualStudio2012/RippleD.vcxproj.filters
View File

@@ -738,9 +738,6 @@
<ClCompile Include="..\..\src\ripple_app\tx\WalletAddTransactor.cpp"> <ClCompile Include="..\..\src\ripple_app\tx\WalletAddTransactor.cpp">
<Filter>[1] Ripple\ripple_app\tx</Filter> <Filter>[1] Ripple\ripple_app\tx</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\ripple_app\main\ripple_FatalErrorReporter.cpp">
<Filter>[1] Ripple\ripple_app\main</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple_app\main\ripple_RippleMain.cpp"> <ClCompile Include="..\..\src\ripple_app\main\ripple_RippleMain.cpp">
<Filter>[1] Ripple\ripple_app\main</Filter> <Filter>[1] Ripple\ripple_app\main</Filter>
</ClCompile> </ClCompile>
@@ -903,6 +900,9 @@
<ClCompile Include="..\..\src\ripple\validators\impl\ValidatorsUtilities.cpp"> <ClCompile Include="..\..\src\ripple\validators\impl\ValidatorsUtilities.cpp">
<Filter>[2] Ripple %28New%29\validators\impl</Filter> <Filter>[2] Ripple %28New%29\validators\impl</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\ripple_app\main\FatalErrorReporter.cpp">
<Filter>[1] Ripple\ripple_app\main</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\src\ripple_app\ripple_app.h"> <ClInclude Include="..\..\src\ripple_app\ripple_app.h">
@@ -1517,9 +1517,6 @@
<ClInclude Include="..\..\src\ripple_app\tx\WalletAddTransactor.h"> <ClInclude Include="..\..\src\ripple_app\tx\WalletAddTransactor.h">
<Filter>[1] Ripple\ripple_app\tx</Filter> <Filter>[1] Ripple\ripple_app\tx</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\ripple_app\main\ripple_FatalErrorReporter.h">
<Filter>[1] Ripple\ripple_app\main</Filter>
</ClInclude>
<ClInclude Include="..\..\src\ripple_app\main\ripple_RippleMain.h"> <ClInclude Include="..\..\src\ripple_app\main\ripple_RippleMain.h">
<Filter>[1] Ripple\ripple_app\main</Filter> <Filter>[1] Ripple\ripple_app\main</Filter>
</ClInclude> </ClInclude>
@@ -1761,6 +1758,9 @@
<ClInclude Include="..\..\src\ripple\validators\api\Validators.h"> <ClInclude Include="..\..\src\ripple\validators\api\Validators.h">
<Filter>[2] Ripple %28New%29\validators\api</Filter> <Filter>[2] Ripple %28New%29\validators\api</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\ripple_app\main\FatalErrorReporter.h">
<Filter>[1] Ripple\ripple_app\main</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<CustomBuild Include="..\..\src\ripple_data\protocol\ripple.proto"> <CustomBuild Include="..\..\src\ripple_data\protocol\ripple.proto">

2
SConstruct
View File

@@ -227,7 +227,7 @@ if not OSX:
'-rdynamic', '-pthread', '-rdynamic', '-pthread',
]) ])
DEBUGFLAGS = ['-g', '-DDEBUG'] DEBUGFLAGS = ['-g', '-DDEBUG', '-D_DEBUG']
env.Append(CCFLAGS = ['-pthread', '-Wall', '-Wno-sign-compare', '-Wno-char-subscripts']+DEBUGFLAGS) env.Append(CCFLAGS = ['-pthread', '-Wall', '-Wno-sign-compare', '-Wno-char-subscripts']+DEBUGFLAGS)
env.Append(CXXFLAGS = ['-O1', '-pthread', '-Wno-invalid-offsetof', '-Wformat']+DEBUGFLAGS) env.Append(CXXFLAGS = ['-O1', '-pthread', '-Wno-invalid-offsetof', '-Wformat']+DEBUGFLAGS)

30
src/beast/Builds/VisualStudio2012/beast.vcxproj
View File

@@ -153,8 +153,8 @@
<ClInclude Include="..\..\modules\beast_core\containers\beast_Variant.h" /> <ClInclude Include="..\..\modules\beast_core\containers\beast_Variant.h" />
<ClInclude Include="..\..\modules\beast_core\diagnostic\beast_Debug.h" /> <ClInclude Include="..\..\modules\beast_core\diagnostic\beast_Debug.h" />
<ClInclude Include="..\..\modules\beast_core\diagnostic\beast_Error.h" /> <ClInclude Include="..\..\modules\beast_core\diagnostic\beast_Error.h" />
<ClInclude Include="..\..\modules\beast_core\diagnostic\beast_FatalError.h" /> <ClInclude Include="..\..\modules\beast_core\diagnostic\FatalError.h" />
<ClInclude Include="..\..\modules\beast_core\diagnostic\beast_ProtectedCall.h" /> <ClInclude Include="..\..\modules\beast_core\diagnostic\ProtectedCall.h" />
<ClInclude Include="..\..\modules\beast_core\diagnostic\beast_FPUFlags.h" /> <ClInclude Include="..\..\modules\beast_core\diagnostic\beast_FPUFlags.h" />
<ClInclude Include="..\..\modules\beast_core\diagnostic\beast_LeakChecked.h" /> <ClInclude Include="..\..\modules\beast_core\diagnostic\beast_LeakChecked.h" />
<ClInclude Include="..\..\modules\beast_core\diagnostic\beast_SafeBool.h" /> <ClInclude Include="..\..\modules\beast_core\diagnostic\beast_SafeBool.h" />
@@ -211,11 +211,11 @@
<ClInclude Include="..\..\modules\beast_core\memory\SharedObject.h" /> <ClInclude Include="..\..\modules\beast_core\memory\SharedObject.h" />
<ClInclude Include="..\..\modules\beast_core\memory\beast_ScopedPointer.h" /> <ClInclude Include="..\..\modules\beast_core\memory\beast_ScopedPointer.h" />
<ClInclude Include="..\..\modules\beast_core\memory\SharedSingleton.h" /> <ClInclude Include="..\..\modules\beast_core\memory\SharedSingleton.h" />
<ClInclude Include="..\..\modules\beast_core\memory\beast_StaticObject.h" />
<ClInclude Include="..\..\modules\beast_core\memory\beast_Uncopyable.h" /> <ClInclude Include="..\..\modules\beast_core\memory\beast_Uncopyable.h" />
<ClInclude Include="..\..\modules\beast_core\memory\beast_WeakReference.h" /> <ClInclude Include="..\..\modules\beast_core\memory\beast_WeakReference.h" />
<ClInclude Include="..\..\modules\beast_core\memory\SharedPtr.h" /> <ClInclude Include="..\..\modules\beast_core\memory\SharedPtr.h" />
<ClInclude Include="..\..\modules\beast_core\misc\beast_Main.h" /> <ClInclude Include="..\..\modules\beast_core\memory\StaticObject.h" />
<ClInclude Include="..\..\modules\beast_core\misc\Main.h" />
<ClInclude Include="..\..\modules\beast_core\misc\beast_Result.h" /> <ClInclude Include="..\..\modules\beast_core\misc\beast_Result.h" />
<ClInclude Include="..\..\modules\beast_core\misc\beast_Uuid.h" /> <ClInclude Include="..\..\modules\beast_core\misc\beast_Uuid.h" />
<ClInclude Include="..\..\modules\beast_core\misc\beast_WindowsRegistry.h" /> <ClInclude Include="..\..\modules\beast_core\misc\beast_WindowsRegistry.h" />
@@ -302,7 +302,7 @@
<ClInclude Include="..\..\modules\beast_core\thread\MutexTraits.h" /> <ClInclude Include="..\..\modules\beast_core\thread\MutexTraits.h" />
<ClInclude Include="..\..\modules\beast_core\thread\TrackedMutex.h" /> <ClInclude Include="..\..\modules\beast_core\thread\TrackedMutex.h" />
<ClInclude Include="..\..\modules\beast_core\time\beast_PerformanceCounter.h" /> <ClInclude Include="..\..\modules\beast_core\time\beast_PerformanceCounter.h" />
<ClInclude Include="..\..\modules\beast_core\time\beast_PerformedAtExit.h" /> <ClInclude Include="..\..\modules\beast_core\time\AtExitHook.h" />
<ClInclude Include="..\..\modules\beast_core\time\beast_RelativeTime.h" /> <ClInclude Include="..\..\modules\beast_core\time\beast_RelativeTime.h" />
<ClInclude Include="..\..\modules\beast_core\time\beast_Time.h" /> <ClInclude Include="..\..\modules\beast_core\time\beast_Time.h" />
<ClInclude Include="..\..\modules\beast_core\xml\beast_XmlDocument.h" /> <ClInclude Include="..\..\modules\beast_core\xml\beast_XmlDocument.h" />
@@ -557,6 +557,12 @@
<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\diagnostic\Assert.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\diagnostic\beast_Debug.cpp"> <ClCompile Include="..\..\modules\beast_core\diagnostic\beast_Debug.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>
@@ -569,11 +575,11 @@
<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\diagnostic\beast_FatalError.cpp"> <ClCompile Include="..\..\modules\beast_core\diagnostic\FatalError.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>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\modules\beast_core\diagnostic\beast_ProtectedCall.cpp"> <ClCompile Include="..\..\modules\beast_core\diagnostic\ProtectedCall.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>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
@@ -723,7 +729,13 @@
<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\misc\beast_Main.cpp"> <ClCompile Include="..\..\modules\beast_core\memory\StaticObject.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\misc\Main.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>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
@@ -1131,7 +1143,7 @@
<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_core\time\beast_PerformedAtExit.cpp"> <ClCompile Include="..\..\modules\beast_core\time\AtExitHook.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>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>

60
src/beast/Builds/VisualStudio2012/beast.vcxproj.filters
View File

@@ -527,9 +527,6 @@
<ClInclude Include="..\..\modules\beast_core\threads\beast_SpinDelay.h"> <ClInclude Include="..\..\modules\beast_core\threads\beast_SpinDelay.h">
<Filter>beast_core\threads</Filter> <Filter>beast_core\threads</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\modules\beast_core\memory\beast_StaticObject.h">
<Filter>beast_core\memory</Filter>
</ClInclude>
<ClInclude Include="..\..\modules\beast_core\containers\beast_SharedTable.h"> <ClInclude Include="..\..\modules\beast_core\containers\beast_SharedTable.h">
<Filter>beast_core\containers</Filter> <Filter>beast_core\containers</Filter>
</ClInclude> </ClInclude>
@@ -560,9 +557,6 @@
<ClInclude Include="..\..\modules\beast_core\maths\beast_Interval.h"> <ClInclude Include="..\..\modules\beast_core\maths\beast_Interval.h">
<Filter>beast_core\maths</Filter> <Filter>beast_core\maths</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\modules\beast_core\time\beast_PerformedAtExit.h">
<Filter>beast_core\time</Filter>
</ClInclude>
<ClInclude Include="..\..\modules\beast_core\diagnostic\beast_UnitTest.h"> <ClInclude Include="..\..\modules\beast_core\diagnostic\beast_UnitTest.h">
<Filter>beast_core\diagnostic</Filter> <Filter>beast_core\diagnostic</Filter>
</ClInclude> </ClInclude>
@@ -662,18 +656,9 @@
<ClInclude Include="..\..\modules\beast_core\maths\beast_MurmurHash.h"> <ClInclude Include="..\..\modules\beast_core\maths\beast_MurmurHash.h">
<Filter>beast_core\maths</Filter> <Filter>beast_core\maths</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\modules\beast_core\diagnostic\beast_ProtectedCall.h">
<Filter>beast_core\diagnostic</Filter>
</ClInclude>
<ClInclude Include="..\..\modules\beast_core\misc\beast_Main.h">
<Filter>beast_core\misc</Filter>
</ClInclude>
<ClInclude Include="..\..\modules\beast_core\text\beast_LexicalCast.h"> <ClInclude Include="..\..\modules\beast_core\text\beast_LexicalCast.h">
<Filter>beast_core\text</Filter> <Filter>beast_core\text</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\modules\beast_core\diagnostic\beast_FatalError.h">
<Filter>beast_core\diagnostic</Filter>
</ClInclude>
<ClInclude Include="..\..\modules\beast_core\diagnostic\beast_SemanticVersion.h"> <ClInclude Include="..\..\modules\beast_core\diagnostic\beast_SemanticVersion.h">
<Filter>beast_core\diagnostic</Filter> <Filter>beast_core\diagnostic</Filter>
</ClInclude> </ClInclude>
@@ -1025,6 +1010,21 @@
<ClInclude Include="..\..\modules\beast_core\memory\SharedSingleton.h"> <ClInclude Include="..\..\modules\beast_core\memory\SharedSingleton.h">
<Filter>beast_core\memory</Filter> <Filter>beast_core\memory</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\modules\beast_core\time\AtExitHook.h">
<Filter>beast_core\time</Filter>
</ClInclude>
<ClInclude Include="..\..\modules\beast_core\misc\Main.h">
<Filter>beast_core\misc</Filter>
</ClInclude>
<ClInclude Include="..\..\modules\beast_core\diagnostic\ProtectedCall.h">
<Filter>beast_core\diagnostic</Filter>
</ClInclude>
<ClInclude Include="..\..\modules\beast_core\diagnostic\FatalError.h">
<Filter>beast_core\diagnostic</Filter>
</ClInclude>
<ClInclude Include="..\..\modules\beast_core\memory\StaticObject.h">
<Filter>beast_core\memory</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\modules\beast_core\containers\beast_AbstractFifo.cpp"> <ClCompile Include="..\..\modules\beast_core\containers\beast_AbstractFifo.cpp">
@@ -1300,9 +1300,6 @@
<ClCompile Include="..\..\modules\beast_core\native\beast_win32_FPUFlags.cpp"> <ClCompile Include="..\..\modules\beast_core\native\beast_win32_FPUFlags.cpp">
<Filter>beast_core\native</Filter> <Filter>beast_core\native</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\modules\beast_core\time\beast_PerformedAtExit.cpp">
<Filter>beast_core\time</Filter>
</ClCompile>
<ClCompile Include="..\..\modules\beast_core\diagnostic\beast_UnitTest.cpp"> <ClCompile Include="..\..\modules\beast_core\diagnostic\beast_UnitTest.cpp">
<Filter>beast_core\diagnostic</Filter> <Filter>beast_core\diagnostic</Filter>
</ClCompile> </ClCompile>
@@ -1369,18 +1366,9 @@
<ClCompile Include="..\..\modules\beast_core\maths\beast_MurmurHash.cpp"> <ClCompile Include="..\..\modules\beast_core\maths\beast_MurmurHash.cpp">
<Filter>beast_core\maths</Filter> <Filter>beast_core\maths</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\modules\beast_core\diagnostic\beast_ProtectedCall.cpp">
<Filter>beast_core\diagnostic</Filter>
</ClCompile>
<ClCompile Include="..\..\modules\beast_core\misc\beast_Main.cpp">
<Filter>beast_core\misc</Filter>
</ClCompile>
<ClCompile Include="..\..\modules\beast_core\text\beast_LexicalCast.cpp"> <ClCompile Include="..\..\modules\beast_core\text\beast_LexicalCast.cpp">
<Filter>beast_core\text</Filter> <Filter>beast_core\text</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\modules\beast_core\diagnostic\beast_FatalError.cpp">
<Filter>beast_core\diagnostic</Filter>
</ClCompile>
<ClCompile Include="..\..\modules\beast_core\diagnostic\beast_SemanticVersion.cpp"> <ClCompile Include="..\..\modules\beast_core\diagnostic\beast_SemanticVersion.cpp">
<Filter>beast_core\diagnostic</Filter> <Filter>beast_core\diagnostic</Filter>
</ClCompile> </ClCompile>
@@ -1540,6 +1528,24 @@
<ClCompile Include="..\..\modules\beast_asio\beast_asio.cpp"> <ClCompile Include="..\..\modules\beast_asio\beast_asio.cpp">
<Filter>beast_asio</Filter> <Filter>beast_asio</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\modules\beast_core\time\AtExitHook.cpp">
<Filter>beast_core\time</Filter>
</ClCompile>
<ClCompile Include="..\..\modules\beast_core\misc\Main.cpp">
<Filter>beast_core\misc</Filter>
</ClCompile>
<ClCompile Include="..\..\modules\beast_core\diagnostic\ProtectedCall.cpp">
<Filter>beast_core\diagnostic</Filter>
</ClCompile>
<ClCompile Include="..\..\modules\beast_core\diagnostic\FatalError.cpp">
<Filter>beast_core\diagnostic</Filter>
</ClCompile>
<ClCompile Include="..\..\modules\beast_core\memory\StaticObject.cpp">
<Filter>beast_core\memory</Filter>
</ClCompile>
<ClCompile Include="..\..\modules\beast_core\diagnostic\Assert.cpp">
<Filter>beast_core\diagnostic</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Text Include="..\..\TODO.txt" /> <Text Include="..\..\TODO.txt" />

9
src/beast/modules/beast_core/beast_core.cpp
View File

@@ -149,10 +149,10 @@ namespace beast
#include "diagnostic/beast_Debug.cpp" #include "diagnostic/beast_Debug.cpp"
#include "diagnostic/beast_Error.cpp" #include "diagnostic/beast_Error.cpp"
#include "diagnostic/beast_FatalError.cpp" #include "diagnostic/FatalError.cpp"
#include "diagnostic/beast_FPUFlags.cpp" #include "diagnostic/beast_FPUFlags.cpp"
#include "diagnostic/beast_LeakChecked.cpp" #include "diagnostic/beast_LeakChecked.cpp"
#include "diagnostic/beast_ProtectedCall.cpp" #include "diagnostic/ProtectedCall.cpp"
#include "diagnostic/beast_SemanticVersion.cpp" #include "diagnostic/beast_SemanticVersion.cpp"
#include "diagnostic/beast_UnitTest.cpp" #include "diagnostic/beast_UnitTest.cpp"
#include "diagnostic/beast_UnitTestUtilities.cpp" #include "diagnostic/beast_UnitTestUtilities.cpp"
@@ -180,8 +180,9 @@ namespace beast
#include "memory/beast_FifoFreeStoreWithoutTLS.cpp" #include "memory/beast_FifoFreeStoreWithoutTLS.cpp"
#include "memory/beast_GlobalPagedFreeStore.cpp" #include "memory/beast_GlobalPagedFreeStore.cpp"
#include "memory/beast_PagedFreeStore.cpp" #include "memory/beast_PagedFreeStore.cpp"
#include "memory/StaticObject.cpp"
#include "misc/beast_Main.cpp" #include "misc/Main.cpp"
#include "misc/beast_Result.cpp" #include "misc/beast_Result.cpp"
#include "misc/beast_Uuid.cpp" #include "misc/beast_Uuid.cpp"
@@ -232,7 +233,7 @@ namespace beast
#include "threads/beast_TimeSliceThread.cpp" #include "threads/beast_TimeSliceThread.cpp"
#include "time/beast_PerformanceCounter.cpp" #include "time/beast_PerformanceCounter.cpp"
#include "time/beast_PerformedAtExit.cpp" #include "time/AtExitHook.cpp"
#include "time/beast_RelativeTime.cpp" #include "time/beast_RelativeTime.cpp"
#include "time/beast_Time.cpp" #include "time/beast_Time.cpp"

18
src/beast/modules/beast_core/beast_core.h
View File

@@ -172,10 +172,14 @@ Some files contain portions of these external projects, licensed separately:
@copyright Provided under the [ISC LIcense][11] @copyright Provided under the [ISC LIcense][11]
*/ */
// TargetPlatform.h should not use anything from BeastConfig.h
#include "system/TargetPlatform.h"
#include "system/BeastConfigCheck.h"
# include "system/BeforeBoost.h" # include "system/BeforeBoost.h"
# include "system/BoostIncludes.h" # include "system/BoostIncludes.h"
#include "system/FunctionalIncludes.h" #include "system/FunctionalIncludes.h"
#include "system/PlatformDefs.h"
#include "system/StandardHeader.h" #include "system/StandardHeader.h"
#if BEAST_MSVC #if BEAST_MSVC
@@ -261,8 +265,6 @@ extern BEAST_API void BEAST_CALLTYPE logAssertion (char const* file, int line) n
# include "containers/detail/removecv.h" # include "containers/detail/removecv.h"
#include "containers/detail/copyconst.h" #include "containers/detail/copyconst.h"
#include "system/PlatformDefs.h"
#include "system/TargetPlatform.h"
#include "diagnostic/beast_Throw.h" #include "diagnostic/beast_Throw.h"
#include "system/Functional.h" #include "system/Functional.h"
#include "memory/beast_AtomicCounter.h" #include "memory/beast_AtomicCounter.h"
@@ -272,12 +274,12 @@ extern BEAST_API void BEAST_CALLTYPE logAssertion (char const* file, int line) n
#include "containers/List.h" #include "containers/List.h"
#include "containers/beast_LockFreeStack.h" #include "containers/beast_LockFreeStack.h"
#include "threads/beast_SpinDelay.h" #include "threads/beast_SpinDelay.h"
#include "memory/beast_StaticObject.h" #include "memory/StaticObject.h"
#include "text/StringCharPointerType.h" #include "text/StringCharPointerType.h"
#include "text/StringFromNumber.h" #include "text/StringFromNumber.h"
#include "text/beast_String.h" #include "text/beast_String.h"
#include "time/beast_PerformedAtExit.h" #include "time/AtExitHook.h"
#include "diagnostic/beast_LeakChecked.h" #include "diagnostic/beast_LeakChecked.h"
#include "time/beast_RelativeTime.h" #include "time/beast_RelativeTime.h"
#include "time/beast_Time.h" #include "time/beast_Time.h"
@@ -304,7 +306,7 @@ extern BEAST_API void BEAST_CALLTYPE logAssertion (char const* file, int line) n
#include "threads/beast_ThreadLocalValue.h" #include "threads/beast_ThreadLocalValue.h"
#include "thread/MutexTraits.h" #include "thread/MutexTraits.h"
#include "thread/TrackedMutex.h" #include "thread/TrackedMutex.h"
#include "diagnostic/beast_FatalError.h" #include "diagnostic/FatalError.h"
#include "diagnostic/beast_Error.h" #include "diagnostic/beast_Error.h"
#include "diagnostic/beast_Debug.h" #include "diagnostic/beast_Debug.h"
#include "text/beast_LexicalCast.h" #include "text/beast_LexicalCast.h"
@@ -317,7 +319,7 @@ extern BEAST_API void BEAST_CALLTYPE logAssertion (char const* file, int line) n
#include "memory/SharedObject.h" #include "memory/SharedObject.h"
#include "memory/SharedPtr.h" #include "memory/SharedPtr.h"
#include "functional/SharedFunction.h" #include "functional/SharedFunction.h"
#include "diagnostic/beast_ProtectedCall.h" #include "diagnostic/ProtectedCall.h"
#include "containers/beast_AbstractFifo.h" #include "containers/beast_AbstractFifo.h"
#include "text/beast_Identifier.h" #include "text/beast_Identifier.h"
#include "containers/beast_Variant.h" #include "containers/beast_Variant.h"
@@ -366,7 +368,7 @@ extern BEAST_API void BEAST_CALLTYPE logAssertion (char const* file, int line) n
#include "memory/SharedSingleton.h" #include "memory/SharedSingleton.h"
#include "memory/beast_WeakReference.h" #include "memory/beast_WeakReference.h"
#include "memory/beast_RecycledObjectPool.h" #include "memory/beast_RecycledObjectPool.h"
#include "misc/beast_Main.h" #include "misc/Main.h"
#include "misc/beast_Uuid.h" #include "misc/beast_Uuid.h"
#include "misc/beast_WindowsRegistry.h" #include "misc/beast_WindowsRegistry.h"
#include "network/beast_IPAddress.h" #include "network/beast_IPAddress.h"

15
src/beast/modules/beast_core/diagnostic/beast_FatalError.cpp → src/beast/modules/beast_core/diagnostic/FatalError.cpp
View File

@@ -66,16 +66,19 @@ String FatalError::Reporter::formatFilePath (char const* filePath)
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
Static::Storage <Atomic <FatalError::Reporter*>, FatalError> FatalError::s_reporter; FatalError::Reporter *FatalError::s_reporter;
void FatalError::setReporter (Reporter& reporter) /** Returns the current fatal error reporter. */
FatalError::Reporter* FatalError::getReporter ()
{ {
s_reporter->compareAndSetBool (&reporter, nullptr); return s_reporter;
} }
void FatalError::resetReporter (Reporter& reporter) FatalError::Reporter* FatalError::setReporter (Reporter* reporter)
{ {
s_reporter->compareAndSetBool (nullptr, &reporter); Reporter* const previous (s_reporter);
s_reporter = reporter;
return previous;
} }
FatalError::FatalError (char const* message, char const* fileName, int lineNumber) FatalError::FatalError (char const* message, char const* fileName, int lineNumber)
@@ -94,7 +97,7 @@ FatalError::FatalError (char const* message, char const* fileName, int lineNumbe
char const* const szFileName = fileNameString.toRawUTF8 (); char const* const szFileName = fileNameString.toRawUTF8 ();
Reporter* const reporter = s_reporter->get (); Reporter* const reporter (s_reporter);
if (reporter != nullptr) if (reporter != nullptr)
{ {

20
src/beast/modules/beast_core/diagnostic/beast_FatalError.h → src/beast/modules/beast_core/diagnostic/FatalError.h
View File

@@ -17,8 +17,8 @@
*/ */
//============================================================================== //==============================================================================
#ifndef BEAST_FATALERROR_H_INCLUDED #ifndef BEAST_CORE_FATALERROR_H_INCLUDED
#define BEAST_FATALERROR_H_INCLUDED #define BEAST_CORE_FATALERROR_H_INCLUDED
/** Signal a fatal error. /** Signal a fatal error.
@@ -109,6 +109,9 @@ public:
virtual String formatFilePath (char const* filePath); virtual String formatFilePath (char const* filePath);
}; };
/** Returns the current fatal error reporter. */
static Reporter* getReporter ();
/** Set the fatal error reporter. /** Set the fatal error reporter.
Note that if a fatal error is raised during the construction of Note that if a fatal error is raised during the construction of
@@ -122,16 +125,11 @@ public:
If a reporter was previously set, this routine will do nothing. If a reporter was previously set, this routine will do nothing.
@return The previous Reporter (Which may be null).
@see SharedSingleton, Reporter @see SharedSingleton, Reporter
*/ */
static void setReporter (Reporter& reporter); static Reporter* setReporter (Reporter* reporter);
/** Clear the fatal error reporter.
If the current reporter is the same as the one passed in, this
will remove the reporter.
*/
static void resetReporter (Reporter& reporter);
/** Raise a fatal error. /** Raise a fatal error.
@@ -145,7 +143,7 @@ public:
FatalError (char const* message, char const* filePath, int lineNumber); FatalError (char const* message, char const* filePath, int lineNumber);
private: private:
static Static::Storage <Atomic <Reporter*>, FatalError> s_reporter; static Reporter* s_reporter;
}; };
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------

7
src/beast/modules/beast_core/diagnostic/beast_ProtectedCall.cpp → src/beast/modules/beast_core/diagnostic/ProtectedCall.cpp
View File

@@ -297,19 +297,18 @@ ProtectedCall::DefaultHandler::LockType ProtectedCall::DefaultHandler::s_mutex;
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
Static::Storage <Atomic <ProtectedCall::Handler const*>, ProtectedCall> ProtectedCall::Handler const* ProtectedCall::s_handler;
ProtectedCall::s_handler;
void ProtectedCall::setHandler (Handler const& handler) void ProtectedCall::setHandler (Handler const& handler)
{ {
s_handler->set (&handler); s_handler = &handler;
} }
void ProtectedCall::call (Call& c) void ProtectedCall::call (Call& c)
{ {
static DefaultHandler defaultHandler; static DefaultHandler defaultHandler;
Handler const* handler = s_handler->get (); Handler const* handler = s_handler;
if (handler == nullptr) if (handler == nullptr)
handler = &defaultHandler; handler = &defaultHandler;

6
src/beast/modules/beast_core/diagnostic/beast_ProtectedCall.h → src/beast/modules/beast_core/diagnostic/ProtectedCall.h
View File

@@ -17,8 +17,8 @@
*/ */
//============================================================================== //==============================================================================
#ifndef BEAST_PROTECTEDCALL_H_INCLUDED #ifndef BEAST_CORE_PROTECTEDCALL_H_INCLUDED
#define BEAST_PROTECTEDCALL_H_INCLUDED #define BEAST_CORE_PROTECTEDCALL_H_INCLUDED
/** Call a function in a protected exception context. /** Call a function in a protected exception context.
@@ -141,7 +141,7 @@ private:
void call (Call& call); void call (Call& call);
private: private:
static Static::Storage <Atomic <Handler const*>, ProtectedCall> s_handler; static Handler const* s_handler;
}; };
#endif #endif

50
src/beast/modules/beast_core/diagnostic/beast_Debug.cpp
View File

@@ -296,19 +296,65 @@ String commandLineToString (const String& commandLine)
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// A simple unit test to determine the diagnostic settings in a build.
//
class DebugTests : public UnitTest class DebugTests : public UnitTest
{ {
public: public:
DebugTests () : UnitTest ("Debug", "beast", runManual) static int envDebug ()
{ {
#ifdef _DEBUG
return 1;
#else
return 0;
#endif
}
static int beastDebug ()
{
#ifdef BEAST_DEBUG
return BEAST_DEBUG;
#else
return 0;
#endif
}
static int beastForceDebug ()
{
#ifdef BEAST_FORCE_DEBUG
return BEAST_FORCE_DEBUG;
#else
return 0;
#endif
}
static int beastCatchExceptions ()
{
#ifdef BEAST_CATCH_UNHANDLED_EXCEPTIONS
return BEAST_CATCH_UNHANDLED_EXCEPTIONS;
#else
return 0;
#endif
} }
void runTest () void runTest ()
{ {
beginTestCase ("bassert"); beginTestCase ("diagnostics");
logMessage ("operatingSystemName = '" + SystemStats::getOperatingSystemName () + "'");
logMessage ("_DEBUG = " + String::fromNumber (envDebug ()));
logMessage ("BEAST_DEBUG = " + String::fromNumber (beastDebug ()));
logMessage ("BEAST_FORCE_DEBUG = " + String::fromNumber (beastForceDebug ()));
logMessage ("BEAST_CATCH_UNHANDLED_EXCEPTIONS = " + String::fromNumber (beastCatchExceptions ()));
bassertfalse; bassertfalse;
fail (); fail ();
} }
DebugTests () : UnitTest ("Debug", "beast", runManual)
{
}
}; };
static DebugTests debugTests; static DebugTests debugTests;

2
src/beast/modules/beast_core/diagnostic/beast_LeakChecked.cpp
View File

@@ -17,7 +17,7 @@
*/ */
//============================================================================== //==============================================================================
namespace Implemented namespace detail
{ {
class LeakCheckedBase::CounterBase::Singleton class LeakCheckedBase::CounterBase::Singleton

62
src/beast/modules/beast_core/diagnostic/beast_LeakChecked.h
View File

@@ -20,18 +20,23 @@
#ifndef BEAST_LEAKCHECKED_H_INCLUDED #ifndef BEAST_LEAKCHECKED_H_INCLUDED
#define BEAST_LEAKCHECKED_H_INCLUDED #define BEAST_LEAKCHECKED_H_INCLUDED
namespace Implemented namespace detail
{ {
class BEAST_API LeakCheckedBase class LeakCheckedBase
{ {
public:
static void checkForLeaks ();
protected: protected:
class CounterBase : public LockFreeStack <CounterBase>::Node class CounterBase : public LockFreeStack <CounterBase>::Node
{ {
public: public:
CounterBase (); CounterBase ();
virtual ~CounterBase () { } virtual ~CounterBase ()
{
}
inline int increment () inline int increment ()
{ {
@@ -47,24 +52,15 @@ protected:
private: private:
void checkForLeaks (); void checkForLeaks ();
virtual void checkPureVirtual () const = 0; virtual void checkPureVirtual () const = 0;
private:
friend class LeakCheckedBase;
class Singleton; class Singleton;
friend class LeakCheckedBase;
Atomic <int> m_count; Atomic <int> m_count;
}; };
protected:
static void reportDanglingPointer (char const* objectName); static void reportDanglingPointer (char const* objectName);
private:
friend class PerformedAtExit::ExitHook;
static void checkForLeaks ();
}; };
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
@@ -129,18 +125,7 @@ private:
// //
static Counter& getCounter () noexcept static Counter& getCounter () noexcept
{ {
static Counter* volatile s_instance; return StaticObject <Counter>::get();
static Static::Initializer s_initializer;
if (s_initializer.beginConstruction ())
{
static char s_storage [sizeof (Counter)];
s_instance = new (s_storage) Counter;
s_initializer.endConstruction ();
}
return *s_instance;
} }
}; };
@@ -148,35 +133,40 @@ private:
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
namespace Dummy namespace detail
{ {
class BEAST_API LeakCheckedBase namespace disabled
{ {
private:
friend class PerformedAtExit;
class LeakCheckedBase
{
public: public:
static void checkForLeaks () { } static void checkForLeaks ()
{
}
}; };
template <class Object> template <class Object>
struct LeakChecked : LeakCheckedBase class LeakChecked : public LeakCheckedBase
{ {
public:
}; };
} }
}
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// Lift the corresponding implementation // Lift the appropriate implementation into our namespace
// //
#if BEAST_CHECK_MEMORY_LEAKS #if BEAST_CHECK_MEMORY_LEAKS
using Implemented::LeakChecked; using detail::LeakChecked;
using Implemented::LeakCheckedBase; using detail::LeakCheckedBase;
#else #else
using Dummy::LeakChecked; using detail::disabled::LeakChecked;
using Dummy::LeakCheckedBase; using detail::disabled::LeakCheckedBase;
#endif #endif
#endif #endif

28
src/beast/modules/beast_core/memory/SharedSingleton.h
View File

@@ -86,6 +86,7 @@ public:
instance = staticData.instance; instance = staticData.instance;
if (instance == nullptr) if (instance == nullptr)
{ {
bassert (lifetime == SingletonLifetime::createOnDemand || ! staticData.destructorCalled);
staticData.instance = &staticData.object; staticData.instance = &staticData.object;
::new (staticData.instance) SharedSingleton (lifetime); ::new (staticData.instance) SharedSingleton (lifetime);
instance = staticData.instance; instance = staticData.instance;
@@ -107,7 +108,7 @@ private:
{ {
} }
void performAtExit () void onExit ()
{ {
if (m_lifetime == SingletonLifetime::persistAfterCreation) if (m_lifetime == SingletonLifetime::persistAfterCreation)
this->decReferenceCount (); this->decReferenceCount ();
@@ -132,6 +133,7 @@ private:
{ {
callDestructor = true; callDestructor = true;
staticData.instance = nullptr; staticData.instance = nullptr;
staticData.destructorCalled = true;
} }
} }
@@ -145,31 +147,16 @@ private:
typedef SpinLock LockType; typedef SpinLock LockType;
class ExitHook : public PerformedAtExit
{
public:
explicit ExitHook (SharedSingleton* owner)
: m_owner (owner)
{
}
void performAtExit ()
{
m_owner->performAtExit();
}
private:
SharedSingleton* m_owner;
};
// This structure gets zero-filled at static initialization time. // This structure gets zero-filled at static initialization time.
// No constructors are called. // No constructors are called.
// //
struct StaticData class StaticData : public Uncopyable
{ {
public:
LockType mutex; LockType mutex;
SharedSingleton* instance; SharedSingleton* instance;
SharedSingleton object; SharedSingleton object;
bool destructorCalled;
private: private:
StaticData(); StaticData();
@@ -183,9 +170,10 @@ private:
} }
friend class SharedPtr <SharedSingleton>; friend class SharedPtr <SharedSingleton>;
friend class AtExitMemberHook <SharedSingleton>;
SingletonLifetime::Lifetime m_lifetime; SingletonLifetime::Lifetime m_lifetime;
ExitHook m_exitHook; AtExitMemberHook <SharedSingleton> m_exitHook;
}; };
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------

42
src/beast/modules/beast_core/time/beast_PerformedAtExit.h → src/beast/modules/beast_core/memory/StaticObject.cpp
View File

@@ -17,36 +17,18 @@
*/ */
//============================================================================== //==============================================================================
#ifndef BEAST_PERFORMEDATEXIT_H_INCLUDED namespace detail
#define BEAST_PERFORMEDATEXIT_H_INCLUDED
/*============================================================================*/
/**
Perform an action at program exit
To use, derive your class from PerformedAtExit, and override `performAtExit()`.
The call will be made during the destruction of objects with static storage
duration, before LeakChecked performs its diagnostics.
@ingroup beast_core
*/
// VFALCO TODO Make the linked list element a private type and use composition
// instead of inheritance, so that PerformedAtExit doesn't expose
// lock free stack node interfaces.
//
class BEAST_API PerformedAtExit : public LockFreeStack <PerformedAtExit>::Node
{ {
public:
class ExitHook;
protected: // This is here so we don't need the Thread class declaration
PerformedAtExit (); void staticObjectWait (std::size_t n)
virtual ~PerformedAtExit () { } {
// Wait for initialization
Thread::yield ();
if (n > 10)
Thread::sleep (1);
else if (n > 100)
Thread::sleep (10);
}
protected: }
/** Called at program exit.
*/
virtual void performAtExit () = 0;
};
#endif

89
src/beast/modules/beast_core/memory/beast_StaticObject.h → src/beast/modules/beast_core/memory/StaticObject.h
View File

@@ -112,61 +112,86 @@ private:
template <class ObjectType, class Tag> template <class ObjectType, class Tag>
char Storage <ObjectType, Tag>::s_storage [sizeof (ObjectType)]; char Storage <ObjectType, Tag>::s_storage [sizeof (ObjectType)];
}
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// Provides a thread safe flag for indicating if and when namespace detail
// initialization is required for an object with static storage duration. {
//
class Initializer extern void staticObjectWait (std::size_t n);
}
/** Wrapper to produce an object with static storage duration.
The object is constructed in a thread-safe fashion when the get function
is first called. Note that the destructor for Object is never called. To
invoke the destructor, use the AtExitHook facility (with caution).
The Tag parameter allows multiple instances of the same Object type, by
using different tags.
Object must meet these requirements:
DefaultConstructible
@see AtExitHook
*/
template <class Object, typename Tag = void>
class StaticObject
{ {
public: public:
// If the condition is not initialized, the first caller will static Object& get ()
// receive true, while concurrent callers get blocked until
// initialization completes.
//
bool beginConstruction ()
{ {
bool needsInitialization = false; StaticData& staticData (StaticData::get());
if (m_state.get () != stateInitialized) if (staticData.state.get() != initialized)
{ {
if (m_state.compareAndSetBool (stateInitializing, stateUninitialized)) if (staticData.state.compareAndSetBool (initializing, uninitialized))
{ {
needsInitialization = true; // Initialize the object.
::new (&staticData.object) Object;
staticData.state = initialized;
} }
else else
{ {
SpinDelay delay; for (std::size_t n = 0; staticData.state.get() != initialized; ++n)
do
{ {
delay.pause (); detail::staticObjectWait (n);
} }
while (m_state.get () != stateInitialized);
} }
} }
return needsInitialization; return staticData.object;
}
// Called to signal that the initialization is complete
//
void endConstruction ()
{
m_state.set (stateInitialized);
} }
private: private:
enum enum
{ {
stateUninitialized = 0, // must be zero uninitialized = 0, // must be zero to function properly
stateInitializing, initializing,
stateInitialized initialized
}; };
Atomic <int> m_state; // This structure gets zero-filled at static initialization time.
// No constructors are called.
//
class StaticData : public Uncopyable
{
public:
Atomic <int> state;
Object object;
static StaticData& get ()
{
static uint8 storage [sizeof (StaticData)];
return *(reinterpret_cast <StaticData*> (&storage [0]));
}
private:
StaticData();
~StaticData();
};
}; };
}
#endif #endif

33
src/beast/modules/beast_core/misc/beast_Main.cpp → src/beast/modules/beast_core/misc/Main.cpp
View File

@@ -17,31 +17,33 @@
*/ */
//============================================================================== //==============================================================================
Static::Storage <Atomic <Main*>, Main> Main::s_instance; Main* Main::s_instance;
Main::Main () Main::Main ()
{ {
bool const replaced = s_instance->compareAndSetBool (this, nullptr);
// If this happens it means there are two instances of Main! // If this happens it means there are two instances of Main!
if (! replaced) check_precondition (s_instance == nullptr);
FatalError ("Multiple instances of Main", __FILE__, __LINE__);
s_instance = this;
} }
Main::~Main () Main::~Main ()
{ {
s_instance->set (nullptr); s_instance = nullptr;
} }
Main& Main::getInstance () Main& Main::getInstance ()
{ {
bassert (s_instance->get () != nullptr); bassert (s_instance != nullptr);
return *s_instance->get (); return *s_instance;
} }
void Main::runStartupUnitTests () int Main::runStartupUnitTests ()
{ {
int exitCode = EXIT_SUCCESS;
struct StartupUnitTests : UnitTests struct StartupUnitTests : UnitTests
{ {
void logMessage (String const&) void logMessage (String const&)
@@ -105,15 +107,20 @@ void Main::runStartupUnitTests ()
{ {
tests.reportResults (); tests.reportResults ();
tests.log ("Terminating due to failed startup tests"); tests.log ("Terminating with an error due to failed startup tests.");
Process::terminate (); exitCode = EXIT_FAILURE;
} }
return exitCode;
} }
int Main::runFromMain (int argc, char const* const* argv) int Main::runFromMain (int argc, char const* const* argv)
{ {
runStartupUnitTests (); int exitCode (runStartupUnitTests ());
return run (argc, argv); if (exitCode == EXIT_SUCCESS)
exitCode = run (argc, argv);
return exitCode;
} }

13
src/beast/modules/beast_core/misc/beast_Main.h → src/beast/modules/beast_core/misc/Main.h
View File

@@ -17,15 +17,14 @@
*/ */
//============================================================================== //==============================================================================
#ifndef BEAST_MAIN_H_INCLUDED #ifndef BEAST_CORE_MAIN_H_INCLUDED
#define BEAST_MAIN_H_INCLUDED #define BEAST_CORE_MAIN_H_INCLUDED
/** Represents a command line program's entry point.
/** Represents a command line program's entry point
To use this, derive your class from @ref Main and implement the To use this, derive your class from @ref Main and implement the
function run (); function run ();
*/ */
class BEAST_API Main : public Uncopyable class Main : public Uncopyable
{ {
public: public:
Main (); Main ();
@@ -70,10 +69,10 @@ protected:
virtual int run (int argc, char const* const* argv) = 0; virtual int run (int argc, char const* const* argv) = 0;
private: private:
void runStartupUnitTests (); int runStartupUnitTests ();
private: private:
static Static::Storage <Atomic <Main*>, Main> s_instance; static Main* s_instance;
}; };
#endif #endif

4
src/beast/modules/beast_core/system/BeastConfigCheck.h
View File

@@ -17,8 +17,8 @@
*/ */
//============================================================================== //==============================================================================
#ifndef BEAST_CORE_SYSTEM_BEASTCONFIGCHECK_H_INCLUDED #ifndef BEAST_CORE_BEASTCONFIGCHECK_H_INCLUDED
#define BEAST_CORE_SYSTEM_BEASTCONFIGCHECK_H_INCLUDED #define BEAST_CORE_BEASTCONFIGCHECK_H_INCLUDED
// This file makes sure that BeastConfig.h was included. // This file makes sure that BeastConfig.h was included.
// It also sets defaults for all config options. // It also sets defaults for all config options.

8
src/beast/modules/beast_core/system/BeforeBoost.h
View File

@@ -20,14 +20,14 @@
#ifndef BEAST_CORE_SYSTEM_BEFOREBOOST_H_INCLUDED #ifndef BEAST_CORE_SYSTEM_BEFOREBOOST_H_INCLUDED
#define BEAST_CORE_SYSTEM_BEFOREBOOST_H_INCLUDED #define BEAST_CORE_SYSTEM_BEFOREBOOST_H_INCLUDED
// TargetPlatform.h should not use anything from BeastConfig.h
#include "TargetPlatform.h"
#include "BeastConfigCheck.h"
// This file should be included before including any boost headers. // This file should be included before including any boost headers.
// If you don't include this file, and you include boost headers, // If you don't include this file, and you include boost headers,
// Beast will generate a compile error with an explanation of why. // Beast will generate a compile error with an explanation of why.
#include "TargetPlatform.h"
#include "BeastConfigCheck.h"
#if BEAST_USE_BOOST_FEATURES #if BEAST_USE_BOOST_FEATURES
// Prevent <boost/bind/placeholders.hpp> from being included // Prevent <boost/bind/placeholders.hpp> from being included

4
src/beast/modules/beast_core/system/BoostIncludes.h
View File

@@ -17,8 +17,8 @@
*/ */
//============================================================================== //==============================================================================
#ifndef BEAST_CORE_SYSTEM_BOOSTINCLUDES_H_INCLUDED #ifndef BEAST_CORE_BOOSTINCLUDES_H_INCLUDED
#define BEAST_CORE_SYSTEM_BOOSTINCLUDES_H_INCLUDED #define BEAST_CORE_BOOSTINCLUDES_H_INCLUDED
#if BEAST_USE_BOOST_FEATURES #if BEAST_USE_BOOST_FEATURES

10
src/beast/modules/beast_core/system/PlatformDefs.h
View File

@@ -21,16 +21,14 @@
*/ */
//============================================================================== //==============================================================================
#ifndef BEAST_PLATFORMDEFS_H_INCLUDED #ifndef BEAST_CORE_PLATFORMDEFS_H_INCLUDED
#define BEAST_PLATFORMDEFS_H_INCLUDED #define BEAST_CORE_PLATFORMDEFS_H_INCLUDED
// This file defines miscellaneous macros for debugging, assertions, etc. // This file defines miscellaneous macros for debugging, assertions, etc.
#ifdef BEAST_FORCE_DEBUG #if BEAST_FORCE_DEBUG
# undef BEAST_DEBUG # undef BEAST_DEBUG
# if BEAST_FORCE_DEBUG # define BEAST_DEBUG 1
# define BEAST_DEBUG 1
# endif
#endif #endif
/** This macro defines the C calling convention used as the standard for Beast calls. /** This macro defines the C calling convention used as the standard for Beast calls.

4
src/beast/modules/beast_core/system/StandardHeader.h
View File

@@ -47,7 +47,9 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
#include "PlatformDefs.h" #ifndef BEAST_CORE_PLATFORMDEFS_H_INCLUDED
#error "PlatformDefs.h must be included first"
#endif
// Now we'll include some common OS headers.. // Now we'll include some common OS headers..
#if BEAST_MSVC #if BEAST_MSVC

7
src/beast/modules/beast_core/system/TargetPlatform.h
View File

@@ -21,8 +21,8 @@
*/ */
//============================================================================== //==============================================================================
#ifndef BEAST_TARGETPLATFORM_H_INCLUDED #ifndef BEAST_CORE_TARGETPLATFORM_H_INCLUDED
#define BEAST_TARGETPLATFORM_H_INCLUDED #define BEAST_CORE_TARGETPLATFORM_H_INCLUDED
//============================================================================== //==============================================================================
/* This file figures out which platform is being built, and defines some macros /* This file figures out which platform is being built, and defines some macros
@@ -213,4 +213,5 @@
#define BEAST_PP_STR1_(x) BEAST_PP_STR2_(x) #define BEAST_PP_STR1_(x) BEAST_PP_STR2_(x)
#define BEAST_FILEANDLINE_ __FILE__ "(" BEAST_PP_STR1_(__LINE__) "): warning:" #define BEAST_FILEANDLINE_ __FILE__ "(" BEAST_PP_STR1_(__LINE__) "): warning:"
#endif // BEAST_TARGETPLATFORM_H_INCLUDED #endif

2
src/beast/modules/beast_core/thread/beast_ConcurrentObject.cpp
View File

@@ -30,7 +30,7 @@ private:
m_thread.stop (true); m_thread.stop (true);
} }
void performAtExit () void onExit ()
{ {
//delete this; //delete this;
} }

135
src/beast/modules/beast_core/time/AtExitHook.cpp Normal file
View File

@@ -0,0 +1,135 @@
//------------------------------------------------------------------------------
/*
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.
*/
//==============================================================================
// Manages the list of hooks, and calls
// whoever is in the list at exit time.
//
class AtExitHook::Manager
{
public:
Manager ()
: m_didStaticDestruction (false)
{
}
static inline Manager& get ()
{
return StaticObject <Manager>::get();
}
void insert (Item& item)
{
ScopedLockType lock (m_mutex);
// Adding a new AtExitHook during or after the destruction
// of objects with static storage duration has taken place?
// Surely something has gone wrong.
//
bassert (! m_didStaticDestruction);
m_list.push_front (item);
}
void erase (Item& item)
{
ScopedLockType lock (m_mutex);
m_list.erase (m_list.iterator_to (item));
}
private:
// Called at program exit when destructors for objects
// with static storage duration are invoked.
//
void doStaticDetruction ()
{
// In theory this shouldn't be needed (?)
ScopedLockType lock (m_mutex);
bassert (! m_didStaticDestruction);
for (List <Item>::iterator iter (m_list.begin()); iter != m_list.end();)
{
Item& item (*iter++);
AtExitHook* const hook (item.hook ());
hook->onExit ();
}
// Now do the leak checking
//
LeakCheckedBase::checkForLeaks ();
}
struct StaticDestructor
{
~StaticDestructor ()
{
Manager::get().doStaticDetruction();
}
};
typedef CriticalSection MutexType;
typedef MutexType::ScopedLockType ScopedLockType;
static StaticDestructor s_staticDestructor;
MutexType m_mutex;
List <Item> m_list;
bool m_didStaticDestruction;
};
// This is an object with static storage duration.
// When it gets destroyed, we will call into the Manager to
// call all of the AtExitHook items in the list.
//
AtExitHook::Manager::StaticDestructor AtExitHook::Manager::s_staticDestructor;
//------------------------------------------------------------------------------
AtExitHook::Item::Item (AtExitHook* hook)
: m_hook (hook)
{
}
AtExitHook* AtExitHook::Item::hook ()
{
return m_hook;
}
//------------------------------------------------------------------------------
AtExitHook::AtExitHook ()
: m_item (this)
{
#if BEAST_IOS
// Patrick Dehne:
// AtExitHook::Manager::insert crashes on iOS
// if the storage is not accessed before it is used.
//
// VFALCO TODO Figure out why and fix it cleanly if needed.
//
char* hack = AtExitHook::Manager::s_list.s_storage;
#endif
Manager::get().insert (m_item);
}
AtExitHook::~AtExitHook ()
{
Manager::get().erase (m_item);
}

88
src/beast/modules/beast_core/time/AtExitHook.h Normal file
View File

@@ -0,0 +1,88 @@
//------------------------------------------------------------------------------
/*
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_CORE_ATEXITHOOK_H_INCLUDED
#define BEAST_CORE_ATEXITHOOK_H_INCLUDED
/** Hook for performing activity on program exit.
These hooks execute when objects with static storage duration are
destroyed. The hooks are called in the reverse order that they were
created.
To use, derive your class from AtExitHook and implement onExit.
Alternatively, add AtExitMemberHook as a data member of your class and
then provide your own onExit function with this signature:
@code
void onExit ()
@endcode
@see AtExitMemberHook
*/
/** @{ */
class AtExitHook
{
protected:
AtExitHook ();
virtual ~AtExitHook ();
protected:
/** Called at program exit. */
virtual void onExit () = 0;
private:
class Manager;
class Item : public List <Item>::Node
{
public:
explicit Item (AtExitHook* hook);
AtExitHook* hook ();
private:
AtExitHook* m_hook;
};
Item m_item;
};
/** Helper for utilizing the AtExitHook as a data member.
*/
template <class Object>
class AtExitMemberHook : public AtExitHook
{
public:
explicit AtExitMemberHook (Object* owner) : m_owner (owner)
{
}
private:
void onExit ()
{
m_owner->onExit ();
}
Object* m_owner;
};
/** @} */
#endif

74
src/beast/modules/beast_core/time/beast_PerformedAtExit.cpp
View File

@@ -1,74 +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.
*/
//==============================================================================
class PerformedAtExit::ExitHook
{
public:
typedef Static::Storage <LockFreeStack <PerformedAtExit>, PerformedAtExit> StackType;
private:
~ExitHook ()
{
// Call all PerformedAtExit objects
//
PerformedAtExit* object = s_list->pop_front ();
while (object != nullptr)
{
object->performAtExit ();
object = s_list->pop_front ();
}
// Now do the leak checking
//
LeakCheckedBase::checkForLeaks ();
}
public:
static void push_front (PerformedAtExit* object)
{
s_list->push_front (object);
}
private:
friend class PerformedAtExit;
static StackType s_list;
static ExitHook s_performer;
};
PerformedAtExit::ExitHook PerformedAtExit::ExitHook::s_performer;
PerformedAtExit::ExitHook::StackType PerformedAtExit::ExitHook::s_list;
PerformedAtExit::PerformedAtExit ()
{
#if BEAST_IOS
// Patrick Dehne:
// PerformedAtExit::ExitHook::push_front crashes on iOS
// if s_storage is not accessed before used
//
// VFALCO TODO Figure out why and fix it cleanly if needed.
//
char* hack = PerformedAtExit::ExitHook::s_list.s_storage;
#endif
ExitHook::push_front (this);
}

10
src/ripple_app/main/ripple_FatalErrorReporter.cpp → src/ripple_app/main/FatalErrorReporter.cpp
View File

@@ -4,20 +4,14 @@
*/ */
//============================================================================== //==============================================================================
#ifdef TWICE
#error die
#endif
#define TWICE
FatalErrorReporter::FatalErrorReporter () FatalErrorReporter::FatalErrorReporter ()
{ {
FatalError::setReporter (*this); m_savedReporter = FatalError::setReporter (this);
} }
FatalErrorReporter::~FatalErrorReporter () FatalErrorReporter::~FatalErrorReporter ()
{ {
FatalError::resetReporter (*this); FatalError::setReporter (m_savedReporter);
} }
void FatalErrorReporter::reportMessage (String& formattedMessage) void FatalErrorReporter::reportMessage (String& formattedMessage)

3
src/ripple_app/main/ripple_FatalErrorReporter.h → src/ripple_app/main/FatalErrorReporter.h
View File

@@ -25,6 +25,9 @@ public:
~FatalErrorReporter (); ~FatalErrorReporter ();
void reportMessage (String& formattedMessage); void reportMessage (String& formattedMessage);
private:
FatalError::Reporter* m_savedReporter;
}; };
#endif #endif

4
src/ripple_app/ripple_app.cpp
View File

@@ -29,8 +29,8 @@ namespace ripple
// Application // Application
// //
# include "main/ripple_FatalErrorReporter.h" # include "main/FatalErrorReporter.h"
#include "main/ripple_FatalErrorReporter.cpp" #include "main/FatalErrorReporter.cpp"
# include "peers/PeerDoor.h" # include "peers/PeerDoor.h"
#include "peers/PeerDoor.cpp" #include "peers/PeerDoor.cpp"

15
src/ripple_basics/utility/ripple_CountedObject.h
View File

@@ -120,20 +120,7 @@ private:
{ {
// VFALCO TODO Research the thread safety of static initializers // VFALCO TODO Research the thread safety of static initializers
// on all supported platforms // on all supported platforms
static Counter counter; return StaticObject <Counter>::get();
return counter;
/*
static Counter* volatile s_instance;
static beast::Static::Initializer s_initializer;
if (s_initializer.begin ())
{
static char s_storage [sizeof (Counter)];
s_instance = new (s_storage) Counter;
s_initializer.end ();
}
return *s_instance;
*/
} }
}; };