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

Use beast::ScopedPointer to hold IFeeVote in Application

Browse Source 
Conflicts:
	RippleD.props
	newcoin.vcxproj.filters
	src/cpp/ripple/Application.cpp
	src/cpp/ripple/Application.h
This commit is contained in:
Vinnie Falco
2013-05-31 17:40:20 -07:00
parent b96e3111b2
commit 739cde3f2a
9 changed files with 36 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
RippleD.props
View File

@@ -15,7 +15,7 @@
<PreprocessorDefinitions>USE_LEVELDB;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>USE_LEVELDB;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<AdditionalIncludeDirectories>$(RepoDir);$(RepoDir)\src\cpp\leveldb;$(RepoDir)\src\cpp\leveldb\include;$(RepoDir)\src\cpp\protobuf\src;$(RepoDir)\src\cpp\protobuf\vsprojects;$(RepoDir)\build\proto;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(RepoDir);$(RepoDir)\src\cpp\leveldb;$(RepoDir)\src\cpp\leveldb\include;$(RepoDir)\src\cpp\protobuf\src;$(RepoDir)\src\cpp\protobuf\vsprojects;$(RepoDir)\build\proto;$(RepoDir)\Subtrees\beast;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
</ClCompile> </ClCompile>
<Link> <Link>

14
SConstruct
View File

@@ -110,6 +110,7 @@ env.Append(CXXFLAGS = ['-DUSE_LEVELDB'])
env.Append(CPPPATH = [ 'src/cpp/leveldb', 'src/cpp/leveldb/port', 'src/cpp/leveldb/include']) env.Append(CPPPATH = [ 'src/cpp/leveldb', 'src/cpp/leveldb/port', 'src/cpp/leveldb/include'])
env.Append(CPPPATH = [ 'build/proto']) env.Append(CPPPATH = [ 'build/proto'])
env.Append(CPPPATH = [ '.', 'src/cpp/ripple']) env.Append(CPPPATH = [ '.', 'src/cpp/ripple'])
env.Append(CPPPATH = [ 'Subtrees/beast' ])
if (int(GCC_VERSION[0]) > 4 or (int(GCC_VERSION[0]) == 4 and int(GCC_VERSION[1]) >= 7)): if (int(GCC_VERSION[0]) > 4 or (int(GCC_VERSION[0]) == 4 and int(GCC_VERSION[1]) >= 7)):
env.Append(CXXFLAGS = ['-std=c++11']) env.Append(CXXFLAGS = ['-std=c++11'])
@@ -123,16 +124,18 @@ RIPPLE_SRCS = [
'src/cpp/leveldb_core.cpp', 'src/cpp/leveldb_core.cpp',
'src/cpp/websocket_core.cpp', 'src/cpp/websocket_core.cpp',
'modules/ripple_basics/ripple_basics.cpp', 'modules/ripple_basics/ripple_basics.cpp',
'modules/ripple_client/ripple_client.cpp', 'modules/ripple_client/ripple_client.cpp',
'modules/ripple_data/ripple_data.cpp', 'modules/ripple_data/ripple_data.cpp',
'modules/ripple_db/ripple_db.cpp', 'modules/ripple_db/ripple_db.cpp',
'modules/ripple_json/ripple_json.cpp', 'modules/ripple_json/ripple_json.cpp',
'modules/ripple_ledger/ripple_ledger.cpp', 'modules/ripple_ledger/ripple_ledger.cpp',
'modules/ripple_main/ripple_main.cpp', 'modules/ripple_main/ripple_main.cpp',
'modules/ripple_mess/ripple_mess.cpp', 'modules/ripple_mess/ripple_mess.cpp',
'modules/ripple_net/ripple_net.cpp' 'modules/ripple_net/ripple_net.cpp',
'Subtrees/beast/modules/beast_core/beast_core.cpp'
] ]
# VFALCO: TODO, Remove these ugly loops and just extract the data from RIPPLE_SRCS for the call to VariantDir()
# Put objects files in their own directory. # Put objects files in their own directory.
for dir in ['.', 'ripple', 'database', 'json', 'leveldb/db', 'leveldb/port', 'leveldb/include', 'leveldb/table', 'leveldb/util', 'websocketpp']: for dir in ['.', 'ripple', 'database', 'json', 'leveldb/db', 'leveldb/port', 'leveldb/include', 'leveldb/table', 'leveldb/util', 'websocketpp']:
VariantDir('build/obj/'+dir, 'src/cpp/'+dir, duplicate=0) VariantDir('build/obj/'+dir, 'src/cpp/'+dir, duplicate=0)
@@ -150,6 +153,11 @@ for dir in [
]: ]:
VariantDir('build/obj/'+dir, 'modules/'+dir, duplicate=0) VariantDir('build/obj/'+dir, 'modules/'+dir, duplicate=0)
for dir in [
'beast_core'
]:
VariantDir('build/obj/'+dir, 'Subtrees/beast/modules/'+dir, duplicate=0)
PROTO_SRCS = env.Protoc([], 'src/cpp/ripple/ripple.proto', PROTOCOUTDIR='build/proto', PROTOCPYTHONOUTDIR=None) PROTO_SRCS = env.Protoc([], 'src/cpp/ripple/ripple.proto', PROTOCOUTDIR='build/proto', PROTOCPYTHONOUTDIR=None)
env.Clean(PROTO_SRCS, 'site_scons/site_tools/protoc.pyc') env.Clean(PROTO_SRCS, 'site_scons/site_tools/protoc.pyc')
# PROTO_SRCS = [ 'src/cpp/protobuf_core.cpp' ] # PROTO_SRCS = [ 'src/cpp/protobuf_core.cpp' ]

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

@@ -12,15 +12,15 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="..\..\CodingStyle.md" /> <None Include="..\..\CodingStyle.md" />
<None Include="..\..\modules\beast_core.mm" /> <None Include="..\..\modules\beast_core\beast_core.mm" />
<None Include="..\..\README.md" /> <None Include="..\..\README.md" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\modules\beast_core.h" /> <ClInclude Include="..\..\modules\beast_core\beast_core.h" />
<ClInclude Include="..\..\modules\memory\beast_ScopedPointer.h" /> <ClInclude Include="..\..\modules\beast_core\memory\beast_ScopedPointer.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\modules\beast_core.cpp" /> <ClCompile Include="..\..\modules\beast_core\beast_core.cpp" />
</ItemGroup> </ItemGroup>
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<ProjectGuid>{73C5A0F0-7629-4DE7-9194-BE7AC6C19535}</ProjectGuid> <ProjectGuid>{73C5A0F0-7629-4DE7-9194-BE7AC6C19535}</ProjectGuid>

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

@@ -3,7 +3,7 @@
<ItemGroup> <ItemGroup>
<None Include="..\..\README.md" /> <None Include="..\..\README.md" />
<None Include="..\..\CodingStyle.md" /> <None Include="..\..\CodingStyle.md" />
<None Include="..\..\modules\beast_core.mm"> <None Include="..\..\modules\beast_core\beast_core.mm">
<Filter>beast_core</Filter> <Filter>beast_core</Filter>
</None> </None>
</ItemGroup> </ItemGroup>
@@ -16,15 +16,15 @@
</Filter> </Filter>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\modules\memory\beast_ScopedPointer.h"> <ClInclude Include="..\..\modules\beast_core\memory\beast_ScopedPointer.h">
<Filter>beast_core\memory</Filter> <Filter>beast_core\memory</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\modules\beast_core.h"> <ClInclude Include="..\..\modules\beast_core\beast_core.h">
<Filter>beast_core</Filter> <Filter>beast_core</Filter>
</ClInclude> </ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\modules\beast_core.cpp"> <ClCompile Include="..\..\modules\beast_core\beast_core.cpp">
<Filter>beast_core</Filter> <Filter>beast_core</Filter>
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>

1
modules/ripple_basics/ripple_basics.h
View File

@@ -122,6 +122,7 @@ namespace boost {
#include <openssl/ripemd.h> // For HashUtilities #include <openssl/ripemd.h> // For HashUtilities
#include <openssl/sha.h> // For HashUtilities #include <openssl/sha.h> // For HashUtilities
#include "modules/beast_core/beast_core.h"
#include "../ripple_json/ripple_json.h" #include "../ripple_json/ripple_json.h"

8
newcoin.sln
View File

@@ -3,6 +3,8 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Express 2012 for Windows Desktop # Visual Studio Express 2012 for Windows Desktop
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "newcoin", "newcoin.vcxproj", "{19465545-42EE-42FA-9CC8-F8975F8F1CC7}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "newcoin", "newcoin.vcxproj", "{19465545-42EE-42FA-9CC8-F8975F8F1CC7}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "beast", "Subtrees\beast\Builds\VisualStudio2012\beast.vcxproj", "{73C5A0F0-7629-4DE7-9194-BE7AC6C19535}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32 Debug|Win32 = Debug|Win32
@@ -18,6 +20,12 @@ Global
{19465545-42EE-42FA-9CC8-F8975F8F1CC7}.Release|Win32.ActiveCfg = Release|Win32 {19465545-42EE-42FA-9CC8-F8975F8F1CC7}.Release|Win32.ActiveCfg = Release|Win32
{19465545-42EE-42FA-9CC8-F8975F8F1CC7}.Release|Win32.Build.0 = Release|Win32 {19465545-42EE-42FA-9CC8-F8975F8F1CC7}.Release|Win32.Build.0 = Release|Win32
{19465545-42EE-42FA-9CC8-F8975F8F1CC7}.Release|x64.ActiveCfg = Release|Win32 {19465545-42EE-42FA-9CC8-F8975F8F1CC7}.Release|x64.ActiveCfg = Release|Win32
{73C5A0F0-7629-4DE7-9194-BE7AC6C19535}.Debug|Win32.ActiveCfg = Debug|Win32
{73C5A0F0-7629-4DE7-9194-BE7AC6C19535}.Debug|Win32.Build.0 = Debug|Win32
{73C5A0F0-7629-4DE7-9194-BE7AC6C19535}.Debug|x64.ActiveCfg = Debug|Win32
{73C5A0F0-7629-4DE7-9194-BE7AC6C19535}.Release|Win32.ActiveCfg = Release|Win32
{73C5A0F0-7629-4DE7-9194-BE7AC6C19535}.Release|Win32.Build.0 = Release|Win32
{73C5A0F0-7629-4DE7-9194-BE7AC6C19535}.Release|x64.ActiveCfg = Release|Win32
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE

3
newcoin.vcxproj.filters
View File

@@ -4,6 +4,9 @@
<Filter Include="0. Third Party Code"> <Filter Include="0. Third Party Code">
<UniqueIdentifier>{475c5b33-c9b5-415f-89df-fb9961f3b57c}</UniqueIdentifier> <UniqueIdentifier>{475c5b33-c9b5-415f-89df-fb9961f3b57c}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="0. Third Party Code\beast">
<UniqueIdentifier>{290b7b39-a4e6-4b8b-b464-d1e458562fdd}</UniqueIdentifier>
</Filter>
<Filter Include="0. Third Party Code\SQLite"> <Filter Include="0. Third Party Code\SQLite">
<UniqueIdentifier>{60c3631e-8855-4a61-bdd3-9892d96242d5}</UniqueIdentifier> <UniqueIdentifier>{60c3631e-8855-4a61-bdd3-9892d96242d5}</UniqueIdentifier>
</Filter> </Filter>

6
src/cpp/ripple/Application.cpp
View File

@@ -23,7 +23,7 @@ SETUP_LOG (Application)
LogPartition AutoSocketPartition("AutoSocket"); LogPartition AutoSocketPartition("AutoSocket");
Application* theApp = NULL; Application* theApp = NULL;
Application::Application() Application::Application ()
: mIOService ((theConfig.NODE_SIZE >= 2) ? 2 : 1) : mIOService ((theConfig.NODE_SIZE >= 2) ? 2 : 1)
, mIOWork (mIOService) , mIOWork (mIOService)
, mAuxWork (mAuxService) , mAuxWork (mAuxService)
@@ -414,10 +414,6 @@ void Application::sweep()
Application::~Application() Application::~Application()
{ {
delete mValidations;
delete mFeeTrack;
delete mFeeVote;
delete mTxnDB; delete mTxnDB;
delete mLedgerDB; delete mLedgerDB;
delete mWalletDB; delete mWalletDB;

6
src/cpp/ripple/Application.h
View File

@@ -64,9 +64,9 @@ class Application
OrderBookDB mOrderBookDB; OrderBookDB mOrderBookDB;
// VFALCO: Clean stuff // VFALCO: Clean stuff
IFeeVote* mFeeVote; beast::ScopedPointer <IFeeVote> mFeeVote;
ILoadFeeTrack* mFeeTrack; beast::ScopedPointer <ILoadFeeTrack> mFeeTrack;
IValidations* mValidations; beast::ScopedPointer <IValidations> mValidations;
// VFALCO: End Clean stuff // VFALCO: End Clean stuff
FeatureTable mFeatureTable; FeatureTable mFeatureTable;