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

Add ripple_main module

Browse Source
This commit is contained in:
Vinnie Falco
2013-05-22 16:17:13 -07:00
parent cee678f849
commit a5360379ac
12 changed files with 262 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/ripple_client/ripple_client.cpp
View File

@@ -31,8 +31,10 @@
#pragma warning (disable: 4244) // conversion, possible loss of data #pragma warning (disable: 4244) // conversion, possible loss of data
#endif #endif
#include "src/cpp/ripple/CallRPC.cpp" #include "src/cpp/ripple/HTTPRequest.cpp"
#include "src/cpp/ripple/HttpsClient.cpp" #include "src/cpp/ripple/HttpsClient.cpp"
#include "src/cpp/ripple/CallRPC.cpp"
#include "src/cpp/ripple/rpc.cpp" #include "src/cpp/ripple/rpc.cpp"
#include "src/cpp/ripple/RPCDoor.cpp" #include "src/cpp/ripple/RPCDoor.cpp"
#include "src/cpp/ripple/RPCErr.cpp" #include "src/cpp/ripple/RPCErr.cpp"

46
modules/ripple_main/ripple_main.cpp Normal file
View File

@@ -0,0 +1,46 @@
//------------------------------------------------------------------------------
/*
Copyright (c) 2011-2013, OpenCoin, Inc.
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.
*/
//==============================================================================
/** Add this to get the @ref ripple_main module.
@file ripple_main.cpp
@ingroup ripple_main
*/
#include "ripple_main.h"
// VFALCO: TODO, fix these warnings!
#ifdef _MSC_VER
//#pragma warning (push) // Causes spurious C4503 "decorated name exceeds maximum length"
//#pragma warning (disable: 4018) // signed/unsigned mismatch
//#pragma warning (disable: 4244) // conversion, possible loss of data
#endif
#include "src/cpp/ripple/Application.cpp"
#include "src/cpp/ripple/Config.cpp" // no log
#include "src/cpp/ripple/InstanceCounter.cpp" // no log
#include "src/cpp/ripple/JobQueue.cpp"
#include "src/cpp/ripple/LoadManager.cpp"
#include "src/cpp/ripple/LoadMonitor.cpp"
#include "src/cpp/ripple/main.cpp"
#include "src/cpp/ripple/ValidationCollection.cpp"
#ifdef _MSC_VER
//#pragma warning (pop)
#endif

37
modules/ripple_main/ripple_main.h Normal file
View File

@@ -0,0 +1,37 @@
//------------------------------------------------------------------------------
/*
Copyright (c) 2011-2013, OpenCoin, Inc.
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.
*/
//==============================================================================
/** Include this to get the @ref ripple_main module.
@file ripple_main.h
@ingroup ripple_main
*/
/** Core classes.
This module contains the Ripple core instance object and related objects.
@defgroup ripple_main
*/
#ifndef RIPPLE_MAIN_H
#define RIPPLE_MAIN_H
#endif

63
newcoin.vcxproj
View File

@@ -171,6 +171,7 @@
<ClCompile Include="modules\ripple_client\ripple_client.cpp" /> <ClCompile Include="modules\ripple_client\ripple_client.cpp" />
<ClCompile Include="modules\ripple_db\ripple_db.cpp" /> <ClCompile Include="modules\ripple_db\ripple_db.cpp" />
<ClCompile Include="modules\ripple_ledger\ripple_ledger.cpp" /> <ClCompile Include="modules\ripple_ledger\ripple_ledger.cpp" />
<ClCompile Include="modules\ripple_main\ripple_main.cpp" />
<ClCompile Include="src\cpp\database\database.cpp"> <ClCompile Include="src\cpp\database\database.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>
@@ -558,7 +559,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="src\cpp\ripple\Application.cpp" /> <ClCompile Include="src\cpp\ripple\Application.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="src\cpp\ripple\BitcoinUtil.cpp"> <ClCompile Include="src\cpp\ripple\BitcoinUtil.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>
@@ -583,7 +589,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="src\cpp\ripple\Config.cpp" /> <ClCompile Include="src\cpp\ripple\Config.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="src\cpp\ripple\ConnectionPool.cpp" /> <ClCompile Include="src\cpp\ripple\ConnectionPool.cpp" />
<ClCompile Include="src\cpp\ripple\Contract.cpp"> <ClCompile Include="src\cpp\ripple\Contract.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
@@ -627,16 +638,29 @@
<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\cpp\ripple\HTTPRequest.cpp" /> <ClCompile Include="src\cpp\ripple\HTTPRequest.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="src\cpp\ripple\HttpsClient.cpp"> <ClCompile Include="src\cpp\ripple\HttpsClient.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>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="src\cpp\ripple\InstanceCounter.cpp" /> <ClCompile Include="src\cpp\ripple\InstanceCounter.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="src\cpp\ripple\Interpreter.cpp" /> <ClCompile Include="src\cpp\ripple\Interpreter.cpp" />
<ClCompile Include="src\cpp\ripple\JobQueue.cpp" /> <ClCompile Include="src\cpp\ripple\JobQueue.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="src\cpp\ripple\Ledger.cpp"> <ClCompile Include="src\cpp\ripple\Ledger.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>
@@ -691,15 +715,30 @@
<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\cpp\ripple\LoadManager.cpp" /> <ClCompile Include="src\cpp\ripple\LoadManager.cpp">
<ClCompile Include="src\cpp\ripple\LoadMonitor.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="src\cpp\ripple\LoadMonitor.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="src\cpp\ripple\Log.cpp"> <ClCompile Include="src\cpp\ripple\Log.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>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="src\cpp\ripple\main.cpp" /> <ClCompile Include="src\cpp\ripple\main.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="src\cpp\ripple\NetworkOPs.cpp" /> <ClCompile Include="src\cpp\ripple\NetworkOPs.cpp" />
<ClCompile Include="src\cpp\ripple\NicknameState.cpp" /> <ClCompile Include="src\cpp\ripple\NicknameState.cpp" />
<ClCompile Include="src\cpp\ripple\Offer.cpp"> <ClCompile Include="src\cpp\ripple\Offer.cpp">
@@ -984,7 +1023,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="src\cpp\ripple\ValidationCollection.cpp" /> <ClCompile Include="src\cpp\ripple\ValidationCollection.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="src\cpp\ripple\Wallet.cpp" /> <ClCompile Include="src\cpp\ripple\Wallet.cpp" />
<ClCompile Include="src\cpp\ripple\WalletAddTransactor.cpp" /> <ClCompile Include="src\cpp\ripple\WalletAddTransactor.cpp" />
<ClCompile Include="src\cpp\ripple\WSDoor.cpp" /> <ClCompile Include="src\cpp\ripple\WSDoor.cpp" />
@@ -1033,6 +1077,7 @@
<ClInclude Include="modules\ripple_client\ripple_client.h" /> <ClInclude Include="modules\ripple_client\ripple_client.h" />
<ClInclude Include="modules\ripple_db\ripple_db.h" /> <ClInclude Include="modules\ripple_db\ripple_db.h" />
<ClInclude Include="modules\ripple_ledger\ripple_ledger.h" /> <ClInclude Include="modules\ripple_ledger\ripple_ledger.h" />
<ClInclude Include="modules\ripple_main\ripple_main.h" />
<ClInclude Include="src\cpp\database\database.h" /> <ClInclude Include="src\cpp\database\database.h" />
<ClInclude Include="src\cpp\database\SqliteDatabase.h" /> <ClInclude Include="src\cpp\database\SqliteDatabase.h" />
<ClInclude Include="src\cpp\json\autolink.h"> <ClInclude Include="src\cpp\json\autolink.h">

126
newcoin.vcxproj.filters
View File

@@ -101,6 +101,12 @@
<Filter Include="1. Modules\ripple_db\storage"> <Filter Include="1. Modules\ripple_db\storage">
<UniqueIdentifier>{6097a179-ddad-4c69-9a34-2e3fc2c9fa1d}</UniqueIdentifier> <UniqueIdentifier>{6097a179-ddad-4c69-9a34-2e3fc2c9fa1d}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="1. Modules\ripple_main\core">
<UniqueIdentifier>{ed7b05c1-13c1-417c-a0c7-fb93a8edc5c9}</UniqueIdentifier>
</Filter>
<Filter Include="1. Modules\ripple_client\http">
<UniqueIdentifier>{29cd2103-d553-4d82-9e6a-224e3b1cb667}</UniqueIdentifier>
</Filter>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="src\cpp\database\sqlite3.c"> <ClCompile Include="src\cpp\database\sqlite3.c">
@@ -430,21 +436,9 @@
<ClCompile Include="src\cpp\ripple\ripple.pb.cc"> <ClCompile Include="src\cpp\ripple\ripple.pb.cc">
<Filter>protoc_generated</Filter> <Filter>protoc_generated</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\cpp\ripple\Application.cpp">
<Filter>1. Modules\ripple_main</Filter>
</ClCompile>
<ClCompile Include="src\cpp\ripple\Config.cpp">
<Filter>1. Modules\ripple_main</Filter>
</ClCompile>
<ClCompile Include="src\cpp\ripple\ConnectionPool.cpp"> <ClCompile Include="src\cpp\ripple\ConnectionPool.cpp">
<Filter>1. Modules\ripple_net</Filter> <Filter>1. Modules\ripple_net</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\cpp\ripple\InstanceCounter.cpp">
<Filter>1. Modules\ripple_main</Filter>
</ClCompile>
<ClCompile Include="src\cpp\ripple\JobQueue.cpp">
<Filter>1. Modules\ripple_main</Filter>
</ClCompile>
<ClCompile Include="src\cpp\ripple\Peer.cpp"> <ClCompile Include="src\cpp\ripple\Peer.cpp">
<Filter>1. Modules\ripple_net</Filter> <Filter>1. Modules\ripple_net</Filter>
</ClCompile> </ClCompile>
@@ -499,18 +493,6 @@
<ClCompile Include="src\cpp\ripple\AccountSetTransactor.cpp"> <ClCompile Include="src\cpp\ripple\AccountSetTransactor.cpp">
<Filter>1. Modules\ripple_ledger\transactions</Filter> <Filter>1. Modules\ripple_ledger\transactions</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\cpp\ripple\LoadManager.cpp">
<Filter>1. Modules\ripple_main</Filter>
</ClCompile>
<ClCompile Include="src\cpp\ripple\LoadMonitor.cpp">
<Filter>1. Modules\ripple_main</Filter>
</ClCompile>
<ClCompile Include="src\cpp\ripple\main.cpp">
<Filter>1. Modules\ripple_main</Filter>
</ClCompile>
<ClCompile Include="src\cpp\ripple\HTTPRequest.cpp">
<Filter>1. Modules\ripple_main</Filter>
</ClCompile>
<ClCompile Include="src\cpp\ripple\Operation.cpp"> <ClCompile Include="src\cpp\ripple\Operation.cpp">
<Filter>1. Modules\ripple_ledger\contracts</Filter> <Filter>1. Modules\ripple_ledger\contracts</Filter>
</ClCompile> </ClCompile>
@@ -664,9 +646,6 @@
<ClCompile Include="src\cpp\ripple\CallRPC.cpp"> <ClCompile Include="src\cpp\ripple\CallRPC.cpp">
<Filter>1. Modules\ripple_client\rpc</Filter> <Filter>1. Modules\ripple_client\rpc</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\cpp\ripple\HttpsClient.cpp">
<Filter>1. Modules\ripple_client\rpc</Filter>
</ClCompile>
<ClCompile Include="src\cpp\ripple\rpc.cpp"> <ClCompile Include="src\cpp\ripple\rpc.cpp">
<Filter>1. Modules\ripple_client\rpc</Filter> <Filter>1. Modules\ripple_client\rpc</Filter>
</ClCompile> </ClCompile>
@@ -694,9 +673,6 @@
<ClCompile Include="src\cpp\ripple\RPCServer.cpp"> <ClCompile Include="src\cpp\ripple\RPCServer.cpp">
<Filter>1. Modules\ripple_client\rpc</Filter> <Filter>1. Modules\ripple_client\rpc</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\cpp\ripple\ValidationCollection.cpp">
<Filter>1. Modules\ripple_main</Filter>
</ClCompile>
<ClCompile Include="modules\ripple_db\ripple_db.cpp"> <ClCompile Include="modules\ripple_db\ripple_db.cpp">
<Filter>1. Modules\ripple_db</Filter> <Filter>1. Modules\ripple_db</Filter>
</ClCompile> </ClCompile>
@@ -709,6 +685,39 @@
<ClCompile Include="src\cpp\database\SqliteDatabase.cpp"> <ClCompile Include="src\cpp\database\SqliteDatabase.cpp">
<Filter>1. Modules\ripple_db\storage</Filter> <Filter>1. Modules\ripple_db\storage</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\cpp\ripple\Application.cpp">
<Filter>1. Modules\ripple_main\core</Filter>
</ClCompile>
<ClCompile Include="src\cpp\ripple\Config.cpp">
<Filter>1. Modules\ripple_main\core</Filter>
</ClCompile>
<ClCompile Include="src\cpp\ripple\InstanceCounter.cpp">
<Filter>1. Modules\ripple_main\core</Filter>
</ClCompile>
<ClCompile Include="src\cpp\ripple\JobQueue.cpp">
<Filter>1. Modules\ripple_main\core</Filter>
</ClCompile>
<ClCompile Include="src\cpp\ripple\LoadManager.cpp">
<Filter>1. Modules\ripple_main\core</Filter>
</ClCompile>
<ClCompile Include="src\cpp\ripple\LoadMonitor.cpp">
<Filter>1. Modules\ripple_main\core</Filter>
</ClCompile>
<ClCompile Include="src\cpp\ripple\main.cpp">
<Filter>1. Modules\ripple_main\core</Filter>
</ClCompile>
<ClCompile Include="src\cpp\ripple\ValidationCollection.cpp">
<Filter>1. Modules\ripple_main\core</Filter>
</ClCompile>
<ClCompile Include="modules\ripple_main\ripple_main.cpp">
<Filter>1. Modules\ripple_main</Filter>
</ClCompile>
<ClCompile Include="src\cpp\ripple\HttpsClient.cpp">
<Filter>1. Modules\ripple_client\http</Filter>
</ClCompile>
<ClCompile Include="src\cpp\ripple\HTTPRequest.cpp">
<Filter>1. Modules\ripple_client\http</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="database\sqlite3ext.h"> <ClInclude Include="database\sqlite3ext.h">
@@ -1065,24 +1074,12 @@
<ClInclude Include="src\cpp\ripple\ripple.pb.h"> <ClInclude Include="src\cpp\ripple\ripple.pb.h">
<Filter>protoc_generated</Filter> <Filter>protoc_generated</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="src\cpp\ripple\Application.h">
<Filter>1. Modules\ripple_main</Filter>
</ClInclude>
<ClInclude Include="src\cpp\ripple\AutoSocket.h"> <ClInclude Include="src\cpp\ripple\AutoSocket.h">
<Filter>1. Modules\ripple_net</Filter> <Filter>1. Modules\ripple_net</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="src\cpp\ripple\Config.h">
<Filter>1. Modules\ripple_main</Filter>
</ClInclude>
<ClInclude Include="src\cpp\ripple\ConnectionPool.h"> <ClInclude Include="src\cpp\ripple\ConnectionPool.h">
<Filter>1. Modules\ripple_net</Filter> <Filter>1. Modules\ripple_net</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="src\cpp\ripple\InstanceCounter.h">
<Filter>1. Modules\ripple_main</Filter>
</ClInclude>
<ClInclude Include="src\cpp\ripple\JobQueue.h">
<Filter>1. Modules\ripple_main</Filter>
</ClInclude>
<ClInclude Include="src\cpp\ripple\PeerDoor.h"> <ClInclude Include="src\cpp\ripple\PeerDoor.h">
<Filter>1. Modules\ripple_net</Filter> <Filter>1. Modules\ripple_net</Filter>
</ClInclude> </ClInclude>
@@ -1131,15 +1128,6 @@
<ClInclude Include="src\cpp\ripple\AccountSetTransactor.h"> <ClInclude Include="src\cpp\ripple\AccountSetTransactor.h">
<Filter>1. Modules\ripple_ledger\transactions</Filter> <Filter>1. Modules\ripple_ledger\transactions</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="src\cpp\ripple\LoadManager.h">
<Filter>1. Modules\ripple_main</Filter>
</ClInclude>
<ClInclude Include="src\cpp\ripple\LoadMonitor.h">
<Filter>1. Modules\ripple_main</Filter>
</ClInclude>
<ClInclude Include="src\cpp\ripple\HTTPRequest.h">
<Filter>1. Modules\ripple_main</Filter>
</ClInclude>
<ClInclude Include="src\cpp\ripple\Operation.h"> <ClInclude Include="src\cpp\ripple\Operation.h">
<Filter>1. Modules\ripple_ledger\contracts</Filter> <Filter>1. Modules\ripple_ledger\contracts</Filter>
</ClInclude> </ClInclude>
@@ -1302,9 +1290,6 @@
<ClInclude Include="src\cpp\ripple\CallRPC.h"> <ClInclude Include="src\cpp\ripple\CallRPC.h">
<Filter>1. Modules\ripple_client\rpc</Filter> <Filter>1. Modules\ripple_client\rpc</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="src\cpp\ripple\HttpsClient.h">
<Filter>1. Modules\ripple_client\rpc</Filter>
</ClInclude>
<ClInclude Include="src\cpp\ripple\RPC.h"> <ClInclude Include="src\cpp\ripple\RPC.h">
<Filter>1. Modules\ripple_client\rpc</Filter> <Filter>1. Modules\ripple_client\rpc</Filter>
</ClInclude> </ClInclude>
@@ -1332,9 +1317,6 @@
<ClInclude Include="src\cpp\ripple\RPCServer.h"> <ClInclude Include="src\cpp\ripple\RPCServer.h">
<Filter>1. Modules\ripple_client\rpc</Filter> <Filter>1. Modules\ripple_client\rpc</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="src\cpp\ripple\ValidationCollection.h">
<Filter>1. Modules\ripple_main</Filter>
</ClInclude>
<ClInclude Include="modules\ripple_db\ripple_db.h"> <ClInclude Include="modules\ripple_db\ripple_db.h">
<Filter>1. Modules\ripple_db</Filter> <Filter>1. Modules\ripple_db</Filter>
</ClInclude> </ClInclude>
@@ -1344,6 +1326,36 @@
<ClInclude Include="src\cpp\database\SqliteDatabase.h"> <ClInclude Include="src\cpp\database\SqliteDatabase.h">
<Filter>1. Modules\ripple_db\storage</Filter> <Filter>1. Modules\ripple_db\storage</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="src\cpp\ripple\Application.h">
<Filter>1. Modules\ripple_main\core</Filter>
</ClInclude>
<ClInclude Include="src\cpp\ripple\Config.h">
<Filter>1. Modules\ripple_main\core</Filter>
</ClInclude>
<ClInclude Include="src\cpp\ripple\InstanceCounter.h">
<Filter>1. Modules\ripple_main\core</Filter>
</ClInclude>
<ClInclude Include="src\cpp\ripple\JobQueue.h">
<Filter>1. Modules\ripple_main\core</Filter>
</ClInclude>
<ClInclude Include="src\cpp\ripple\LoadManager.h">
<Filter>1. Modules\ripple_main\core</Filter>
</ClInclude>
<ClInclude Include="src\cpp\ripple\LoadMonitor.h">
<Filter>1. Modules\ripple_main\core</Filter>
</ClInclude>
<ClInclude Include="src\cpp\ripple\ValidationCollection.h">
<Filter>1. Modules\ripple_main\core</Filter>
</ClInclude>
<ClInclude Include="modules\ripple_main\ripple_main.h">
<Filter>1. Modules\ripple_main</Filter>
</ClInclude>
<ClInclude Include="src\cpp\ripple\HttpsClient.h">
<Filter>1. Modules\ripple_client\http</Filter>
</ClInclude>
<ClInclude Include="src\cpp\ripple\HTTPRequest.h">
<Filter>1. Modules\ripple_client\http</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="wallet.xml" /> <None Include="wallet.xml" />

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

@@ -24,8 +24,6 @@
#include <boost/filesystem.hpp> #include <boost/filesystem.hpp>
#include <boost/thread.hpp> #include <boost/thread.hpp>
SETUP_LOG();
LogPartition TaggedCachePartition("TaggedCache"); LogPartition TaggedCachePartition("TaggedCache");
LogPartition AutoSocketPartition("AutoSocket"); LogPartition AutoSocketPartition("AutoSocket");
Application* theApp = NULL; Application* theApp = NULL;
@@ -80,7 +78,7 @@ bool Instance::running = true;
void Application::stop() void Application::stop()
{ {
cLog(lsINFO) << "Received shutdown request"; WriteLog (lsINFO, Application) << "Received shutdown request";
StopSustain(); StopSustain();
mShutdown = true; mShutdown = true;
mIOService.stop(); mIOService.stop();
@@ -94,7 +92,7 @@ void Application::stop()
mHashNodeLDB = NULL; mHashNodeLDB = NULL;
#endif #endif
cLog(lsINFO) << "Stopped: " << mIOService.stopped(); WriteLog (lsINFO, Application) << "Stopped: " << mIOService.stopped();
Instance::shutdown(); Instance::shutdown();
} }
@@ -172,7 +170,7 @@ void Application::setup()
#ifdef USE_LEVELDB #ifdef USE_LEVELDB
if (mHashedObjectStore.isLevelDB()) if (mHashedObjectStore.isLevelDB())
{ {
cLog(lsINFO) << "LevelDB used for nodes"; WriteLog (lsINFO, Application) << "LevelDB used for nodes";
leveldb::Options options; leveldb::Options options;
options.create_if_missing = true; options.create_if_missing = true;
options.block_cache = leveldb::NewLRUCache(theConfig.getSize(siHashNodeDBCache) * 1024 * 1024); options.block_cache = leveldb::NewLRUCache(theConfig.getSize(siHashNodeDBCache) * 1024 * 1024);
@@ -183,7 +181,7 @@ void Application::setup()
leveldb::Status status = leveldb::DB::Open(options, (theConfig.DATA_DIR / "hashnode").string(), &mHashNodeLDB); leveldb::Status status = leveldb::DB::Open(options, (theConfig.DATA_DIR / "hashnode").string(), &mHashNodeLDB);
if (!status.ok() || !mHashNodeLDB) if (!status.ok() || !mHashNodeLDB)
{ {
cLog(lsFATAL) << "Unable to open/create hash node db: " WriteLog (lsFATAL, Application) << "Unable to open/create hash node db: "
<< (theConfig.DATA_DIR / "hashnode").string() << (theConfig.DATA_DIR / "hashnode").string()
<< " " << status.ToString(); << " " << status.ToString();
StopSustain(); StopSustain();
@@ -193,7 +191,7 @@ void Application::setup()
else else
#endif #endif
{ {
cLog(lsINFO) << "SQLite used for nodes"; WriteLog (lsINFO, Application) << "SQLite used for nodes";
boost::thread t5(boost::bind(&InitDB, &mHashNodeDB, "hashnode.db", HashNodeDBInit, HashNodeDBCount)); boost::thread t5(boost::bind(&InitDB, &mHashNodeDB, "hashnode.db", HashNodeDBInit, HashNodeDBCount));
t5.join(); t5.join();
} }
@@ -206,13 +204,13 @@ void Application::setup()
if (theConfig.START_UP == Config::FRESH) if (theConfig.START_UP == Config::FRESH)
{ {
cLog(lsINFO) << "Starting new Ledger"; WriteLog (lsINFO, Application) << "Starting new Ledger";
startNewLedger(); startNewLedger();
} }
else if (theConfig.START_UP == Config::LOAD) else if (theConfig.START_UP == Config::LOAD)
{ {
cLog(lsINFO) << "Loading specified Ledger"; WriteLog (lsINFO, Application) << "Loading specified Ledger";
if (!loadOldLedger(theConfig.START_LEDGER)) if (!loadOldLedger(theConfig.START_LEDGER))
{ {
@@ -271,14 +269,14 @@ void Application::setup()
catch (const std::exception& e) catch (const std::exception& e)
{ {
// Must run as directed or exit. // Must run as directed or exit.
cLog(lsFATAL) << boost::str(boost::format("Can not open peer service: %s") % e.what()); WriteLog (lsFATAL, Application) << boost::str(boost::format("Can not open peer service: %s") % e.what());
exit(3); exit(3);
} }
} }
else else
{ {
cLog(lsINFO) << "Peer interface: disabled"; WriteLog (lsINFO, Application) << "Peer interface: disabled";
} }
// //
@@ -293,14 +291,14 @@ void Application::setup()
catch (const std::exception& e) catch (const std::exception& e)
{ {
// Must run as directed or exit. // Must run as directed or exit.
cLog(lsFATAL) << boost::str(boost::format("Can not open RPC service: %s") % e.what()); WriteLog (lsFATAL, Application) << boost::str(boost::format("Can not open RPC service: %s") % e.what());
exit(3); exit(3);
} }
} }
else else
{ {
cLog(lsINFO) << "RPC interface: disabled"; WriteLog (lsINFO, Application) << "RPC interface: disabled";
} }
// //
@@ -315,14 +313,14 @@ void Application::setup()
catch (const std::exception& e) catch (const std::exception& e)
{ {
// Must run as directed or exit. // Must run as directed or exit.
cLog(lsFATAL) << boost::str(boost::format("Can not open private websocket service: %s") % e.what()); WriteLog (lsFATAL, Application) << boost::str(boost::format("Can not open private websocket service: %s") % e.what());
exit(3); exit(3);
} }
} }
else else
{ {
cLog(lsINFO) << "WS private interface: disabled"; WriteLog (lsINFO, Application) << "WS private interface: disabled";
} }
// //
@@ -337,14 +335,14 @@ void Application::setup()
catch (const std::exception& e) catch (const std::exception& e)
{ {
// Must run as directed or exit. // Must run as directed or exit.
cLog(lsFATAL) << boost::str(boost::format("Can not open public websocket service: %s") % e.what()); WriteLog (lsFATAL, Application) << boost::str(boost::format("Can not open public websocket service: %s") % e.what());
exit(3); exit(3);
} }
} }
else else
{ {
cLog(lsINFO) << "WS public interface: disabled"; WriteLog (lsINFO, Application) << "WS public interface: disabled";
} }
// //
@@ -356,7 +354,7 @@ void Application::setup()
if (theConfig.RUN_STANDALONE) if (theConfig.RUN_STANDALONE)
{ {
cLog(lsWARNING) << "Running in standalone mode"; WriteLog (lsWARNING, Application) << "Running in standalone mode";
mNetOps.setStandAlone(); mNetOps.setStandAlone();
} }
@@ -380,7 +378,7 @@ void Application::run()
if (mWSPrivateDoor) if (mWSPrivateDoor)
mWSPrivateDoor->stop(); mWSPrivateDoor->stop();
cLog(lsINFO) << "Done."; WriteLog (lsINFO, Application) << "Done.";
} }
void Application::sweep() void Application::sweep()
@@ -389,7 +387,7 @@ void Application::sweep()
boost::filesystem::space_info space = boost::filesystem::space(theConfig.DATA_DIR); boost::filesystem::space_info space = boost::filesystem::space(theConfig.DATA_DIR);
if (space.available < (512 * 1024 * 1024)) if (space.available < (512 * 1024 * 1024))
{ {
cLog(lsFATAL) << "Remaining free disk space is less than 512MB"; WriteLog (lsFATAL, Application) << "Remaining free disk space is less than 512MB";
theApp->stop(); theApp->stop();
} }
@@ -428,8 +426,8 @@ void Application::startNewLedger()
RippleAddress rootAddress = RippleAddress::createAccountPublic(rootGeneratorMaster, 0); RippleAddress rootAddress = RippleAddress::createAccountPublic(rootGeneratorMaster, 0);
// Print enough information to be able to claim root account. // Print enough information to be able to claim root account.
cLog(lsINFO) << "Root master seed: " << rootSeedMaster.humanSeed(); WriteLog (lsINFO, Application) << "Root master seed: " << rootSeedMaster.humanSeed();
cLog(lsINFO) << "Root account: " << rootAddress.humanAccountID(); WriteLog (lsINFO, Application) << "Root account: " << rootAddress.humanAccountID();
{ {
Ledger::pointer firstLedger = boost::make_shared<Ledger>(rootAddress, SYSTEM_CURRENCY_START); Ledger::pointer firstLedger = boost::make_shared<Ledger>(rootAddress, SYSTEM_CURRENCY_START);
@@ -466,29 +464,29 @@ bool Application::loadOldLedger(const std::string& l)
if (!loadLedger) if (!loadLedger)
{ {
cLog(lsFATAL) << "No Ledger found?" << std::endl; WriteLog (lsFATAL, Application) << "No Ledger found?" << std::endl;
return false; return false;
} }
loadLedger->setClosed(); loadLedger->setClosed();
cLog(lsINFO) << "Loading ledger " << loadLedger->getHash() << " seq:" << loadLedger->getLedgerSeq(); WriteLog (lsINFO, Application) << "Loading ledger " << loadLedger->getHash() << " seq:" << loadLedger->getLedgerSeq();
if (loadLedger->getAccountHash().isZero()) if (loadLedger->getAccountHash().isZero())
{ {
cLog(lsFATAL) << "Ledger is empty."; WriteLog (lsFATAL, Application) << "Ledger is empty.";
assert(false); assert(false);
return false; return false;
} }
if (!loadLedger->walkLedger()) if (!loadLedger->walkLedger())
{ {
cLog(lsFATAL) << "Ledger is missing nodes."; WriteLog (lsFATAL, Application) << "Ledger is missing nodes.";
return false; return false;
} }
if (!loadLedger->assertSane()) if (!loadLedger->assertSane())
{ {
cLog(lsFATAL) << "Ledger is not sane."; WriteLog (lsFATAL, Application) << "Ledger is not sane.";
return false; return false;
} }
mLedgerMaster.setLedgerRangePresent(loadLedger->getLedgerSeq(), loadLedger->getLedgerSeq()); mLedgerMaster.setLedgerRangePresent(loadLedger->getLedgerSeq(), loadLedger->getLedgerSeq());
@@ -499,12 +497,12 @@ bool Application::loadOldLedger(const std::string& l)
} }
catch (SHAMapMissingNode&) catch (SHAMapMissingNode&)
{ {
cLog(lsFATAL) << "Data is missing for selected ledger"; WriteLog (lsFATAL, Application) << "Data is missing for selected ledger";
return false; return false;
} }
catch (boost::bad_lexical_cast&) catch (boost::bad_lexical_cast&)
{ {
cLog(lsFATAL) << "Ledger specified '" << l << "' is not valid"; WriteLog (lsFATAL, Application) << "Ledger specified '" << l << "' is not valid";
return false; return false;
} }
return true; return true;

3
src/cpp/ripple/HTTPRequest.cpp
View File

@@ -5,7 +5,6 @@
#include <boost/lexical_cast.hpp> #include <boost/lexical_cast.hpp>
#include "Log.h" #include "Log.h"
SETUP_LOG();
// Logic to handle incoming HTTP reqests // Logic to handle incoming HTTP reqests
@@ -42,7 +41,7 @@ HTTPRequestAction HTTPRequest::consume(boost::asio::streambuf& buf)
std::getline(is, line); std::getline(is, line);
boost::trim(line); boost::trim(line);
// cLog(lsTRACE) << "HTTPRequest line: " << line; // WriteLog (lsTRACE, HTTPRequest) << "HTTPRequest line: " << line;
if (eState == await_request) if (eState == await_request)
{ // VERB URL PROTO { // VERB URL PROTO

10
src/cpp/ripple/JobQueue.cpp
View File

@@ -8,8 +8,6 @@
#include "Config.h" #include "Config.h"
#include "Application.h" #include "Application.h"
SETUP_LOG();
JobQueue::JobQueue(boost::asio::io_service& svc) JobQueue::JobQueue(boost::asio::io_service& svc)
: mLastJob(0), mThreadCount(0), mShuttingDown(false), mIOThreadCount(0), mMaxIOThreadCount(1), mIOService(svc) : mLastJob(0), mThreadCount(0), mShuttingDown(false), mIOThreadCount(0), mMaxIOThreadCount(1), mIOService(svc)
{ {
@@ -222,7 +220,7 @@ int JobQueue::isOverloaded()
void JobQueue::shutdown() void JobQueue::shutdown()
{ // shut down the job queue without completing pending jobs { // shut down the job queue without completing pending jobs
cLog(lsINFO) << "Job queue shutting down"; WriteLog (lsINFO, JobQueue) << "Job queue shutting down";
boost::mutex::scoped_lock sl(mJobLock); boost::mutex::scoped_lock sl(mJobLock);
mShuttingDown = true; mShuttingDown = true;
mJobCond.notify_all(); mJobCond.notify_all();
@@ -242,7 +240,7 @@ void JobQueue::setThreadCount(int c)
if (c > 4) // I/O will bottleneck if (c > 4) // I/O will bottleneck
c = 4; c = 4;
c += 2; c += 2;
cLog(lsINFO) << "Auto-tuning to " << c << " validation/transaction/proposal threads"; WriteLog (lsINFO, JobQueue) << "Auto-tuning to " << c << " validation/transaction/proposal threads";
} }
boost::mutex::scoped_lock sl(mJobLock); boost::mutex::scoped_lock sl(mJobLock);
@@ -281,7 +279,7 @@ void JobQueue::IOThread(boost::mutex::scoped_lock& sl)
} }
catch (...) catch (...)
{ {
cLog(lsWARNING) << "Exception in IOThread"; WriteLog (lsWARNING, JobQueue) << "Exception in IOThread";
} }
NameThread("waiting"); NameThread("waiting");
sl.lock(); sl.lock();
@@ -327,7 +325,7 @@ void JobQueue::threadEntry()
++(mJobCounts[type].second); ++(mJobCounts[type].second);
sl.unlock(); sl.unlock();
NameThread(Job::toString(type)); NameThread(Job::toString(type));
cLog(lsTRACE) << "Doing " << Job::toString(type) << " job"; WriteLog (lsTRACE, JobQueue) << "Doing " << Job::toString(type) << " job";
job.doJob(); job.doJob();
} // must destroy job without holding lock } // must destroy job without holding lock
sl.lock(); sl.lock();

22
src/cpp/ripple/LoadManager.cpp
View File

@@ -8,8 +8,6 @@
#include "Config.h" #include "Config.h"
#include "Application.h" #include "Application.h"
SETUP_LOG();
static volatile int* uptimePtr = NULL; static volatile int* uptimePtr = NULL;
int upTime() int upTime()
@@ -281,7 +279,7 @@ bool LoadFeeTrack::raiseLocalFee()
if (origFee == mLocalTxnLoadFee) if (origFee == mLocalTxnLoadFee)
return false; return false;
cLog(lsDEBUG) << "Local load fee raised from " << origFee << " to " << mLocalTxnLoadFee; WriteLog (lsDEBUG, LoadManager) << "Local load fee raised from " << origFee << " to " << mLocalTxnLoadFee;
return true; return true;
} }
@@ -304,7 +302,7 @@ bool LoadFeeTrack::lowerLocalFee()
if (origFee == mLocalTxnLoadFee) if (origFee == mLocalTxnLoadFee)
return false; return false;
cLog(lsDEBUG) << "Local load fee lowered from " << origFee << " to " << mLocalTxnLoadFee; WriteLog (lsDEBUG, LoadManager) << "Local load fee lowered from " << origFee << " to " << mLocalTxnLoadFee;
return true; return true;
} }
@@ -334,7 +332,7 @@ int LoadManager::getUptime()
static void LogDeadLock(int dlTime) static void LogDeadLock(int dlTime)
{ {
cLog(lsWARNING) << "Server stalled for " << dlTime << " seconds."; WriteLog (lsWARNING, LoadManager) << "Server stalled for " << dlTime << " seconds.";
} }
void LoadManager::threadEntry() void LoadManager::threadEntry()
@@ -368,7 +366,7 @@ void LoadManager::threadEntry()
bool change; bool change;
if (theApp->getJobQueue().isOverloaded()) if (theApp->getJobQueue().isOverloaded())
{ {
cLog(lsINFO) << theApp->getJobQueue().getJson(0); WriteLog (lsINFO, LoadManager) << theApp->getJobQueue().getJson(0);
change = theApp->getFeeTrack().raiseLocalFee(); change = theApp->getFeeTrack().raiseLocalFee();
} }
else else
@@ -381,7 +379,7 @@ void LoadManager::threadEntry()
if ((when.is_negative()) || (when.total_seconds() > 1)) if ((when.is_negative()) || (when.total_seconds() > 1))
{ {
cLog(lsWARNING) << "time jump"; WriteLog (lsWARNING, LoadManager) << "time jump";
t = boost::posix_time::microsec_clock::universal_time(); t = boost::posix_time::microsec_clock::universal_time();
} }
else else
@@ -392,24 +390,24 @@ void LoadManager::threadEntry()
void LoadManager::logWarning(const std::string& source) const void LoadManager::logWarning(const std::string& source) const
{ {
if (source.empty()) if (source.empty())
cLog(lsDEBUG) << "Load warning from empty source"; WriteLog (lsDEBUG, LoadManager) << "Load warning from empty source";
else else
cLog(lsINFO) << "Load warning: " << source; WriteLog (lsINFO, LoadManager) << "Load warning: " << source;
} }
void LoadManager::logDisconnect(const std::string& source) const void LoadManager::logDisconnect(const std::string& source) const
{ {
if (source.empty()) if (source.empty())
cLog(lsINFO) << "Disconnect for empty source"; WriteLog (lsINFO, LoadManager) << "Disconnect for empty source";
else else
cLog(lsWARNING) << "Disconnect for: " << source; WriteLog (lsWARNING, LoadManager) << "Disconnect for: " << source;
} }
BOOST_AUTO_TEST_SUITE(LoadManager_test) BOOST_AUTO_TEST_SUITE(LoadManager_test)
BOOST_AUTO_TEST_CASE(LoadFeeTrack_test) BOOST_AUTO_TEST_CASE(LoadFeeTrack_test)
{ {
cLog(lsDEBUG) << "Running load fee track test"; WriteLog (lsDEBUG, LoadManager) << "Running load fee track test";
Config d; // get a default configuration object Config d; // get a default configuration object
LoadFeeTrack l; LoadFeeTrack l;

4
src/cpp/ripple/LoadMonitor.cpp
View File

@@ -1,8 +1,6 @@
#include "LoadMonitor.h" #include "LoadMonitor.h"
#include "Log.h" #include "Log.h"
SETUP_LOG();
void LoadMonitor::update() void LoadMonitor::update()
{ // call with the mutex { // call with the mutex
int now = upTime(); int now = upTime();
@@ -59,7 +57,7 @@ void LoadMonitor::addCountAndLatency(const std::string& name, int latency)
{ {
if (latency > 500) if (latency > 500)
{ {
cLog((latency > 1000) ? lsWARNING : lsINFO) << "Job: " << name << " ExecutionTime: " << latency; WriteLog ((latency > 1000) ? lsWARNING : lsINFO, LoadMonitor) << "Job: " << name << " ExecutionTime: " << latency;
} }
if (latency == 1) if (latency == 1)
latency = 0; latency = 0;

20
src/cpp/ripple/ValidationCollection.cpp
View File

@@ -7,8 +7,6 @@
#include "LedgerTiming.h" #include "LedgerTiming.h"
#include "Log.h" #include "Log.h"
SETUP_LOG();
typedef std::map<uint160, SerializedValidation::pointer>::value_type u160_val_pair; typedef std::map<uint160, SerializedValidation::pointer>::value_type u160_val_pair;
typedef boost::shared_ptr<ValidationSet> VSpointer; typedef boost::shared_ptr<ValidationSet> VSpointer;
@@ -47,12 +45,12 @@ bool ValidationCollection::addValidation(SerializedValidation::ref val, const st
isCurrent = true; isCurrent = true;
else else
{ {
cLog(lsWARNING) << "Received stale validation now=" << now << ", close=" << valClose; WriteLog (lsWARNING, ValidationCollection) << "Received stale validation now=" << now << ", close=" << valClose;
} }
} }
else else
{ {
cLog(lsDEBUG) << "Node " << signer.humanNodePublic() << " not in UNL st=" << val->getSignTime() << WriteLog (lsDEBUG, ValidationCollection) << "Node " << signer.humanNodePublic() << " not in UNL st=" << val->getSignTime() <<
", hash=" << val->getLedgerHash() << ", shash=" << val->getSigningHash() << " src=" << source; ", hash=" << val->getLedgerHash() << ", shash=" << val->getSigningHash() << " src=" << source;
} }
@@ -82,7 +80,7 @@ bool ValidationCollection::addValidation(SerializedValidation::ref val, const st
} }
} }
cLog(lsDEBUG) << "Val for " << hash << " from " << signer.humanNodePublic() WriteLog (lsDEBUG, ValidationCollection) << "Val for " << hash << " from " << signer.humanNodePublic()
<< " added " << (val->isTrusted() ? "trusted/" : "UNtrusted/") << (isCurrent ? "current" : "stale"); << " added " << (val->isTrusted() ? "trusted/" : "UNtrusted/") << (isCurrent ? "current" : "stale");
if (val->isTrusted()) if (val->isTrusted())
theApp->getLedgerMaster().checkAccept(hash); theApp->getLedgerMaster().checkAccept(hash);
@@ -120,7 +118,7 @@ void ValidationCollection::getValidationCount(const uint256& ledger, bool curren
isTrusted = false; isTrusted = false;
else else
{ {
cLog(lsTRACE) << "VC: Untrusted due to time " << ledger; WriteLog (lsTRACE, ValidationCollection) << "VC: Untrusted due to time " << ledger;
} }
} }
if (isTrusted) if (isTrusted)
@@ -129,7 +127,7 @@ void ValidationCollection::getValidationCount(const uint256& ledger, bool curren
++untrusted; ++untrusted;
} }
} }
cLog(lsTRACE) << "VC: " << ledger << "t:" << trusted << " u:" << untrusted; WriteLog (lsTRACE, ValidationCollection) << "VC: " << ledger << "t:" << trusted << " u:" << untrusted;
} }
void ValidationCollection::getValidationTypes(const uint256& ledger, int& full, int& partial) void ValidationCollection::getValidationTypes(const uint256& ledger, int& full, int& partial)
@@ -150,7 +148,7 @@ void ValidationCollection::getValidationTypes(const uint256& ledger, int& full,
} }
} }
} }
cLog(lsTRACE) << "VC: " << ledger << "f:" << full << " p:" << partial; WriteLog (lsTRACE, ValidationCollection) << "VC: " << ledger << "f:" << full << " p:" << partial;
} }
@@ -262,7 +260,7 @@ ValidationCollection::getCurrentValidations(uint256 currentLedger, uint256 prior
(valPriorLedger && (it->second->getLedgerHash() == priorLedger)))) (valPriorLedger && (it->second->getLedgerHash() == priorLedger))))
{ {
countPreferred = true; countPreferred = true;
cLog(lsDEBUG) << "Counting for " << currentLedger << " not " << it->second->getLedgerHash(); WriteLog (lsDEBUG, ValidationCollection) << "Counting for " << currentLedger << " not " << it->second->getLedgerHash();
} }
currentValidationCount& p = countPreferred ? ret[currentLedger] : ret[it->second->getLedgerHash()]; currentValidationCount& p = countPreferred ? ret[currentLedger] : ret[it->second->getLedgerHash()];
@@ -281,7 +279,7 @@ void ValidationCollection::flush()
{ {
bool anyNew = false; bool anyNew = false;
cLog(lsINFO) << "Flushing validations"; WriteLog (lsINFO, ValidationCollection) << "Flushing validations";
boost::mutex::scoped_lock sl(mValidationLock); boost::mutex::scoped_lock sl(mValidationLock);
BOOST_FOREACH(u160_val_pair& it, mCurrentValidations) BOOST_FOREACH(u160_val_pair& it, mCurrentValidations)
{ {
@@ -298,7 +296,7 @@ void ValidationCollection::flush()
boost::this_thread::sleep(boost::posix_time::milliseconds(100)); boost::this_thread::sleep(boost::posix_time::milliseconds(100));
sl.lock(); sl.lock();
} }
cLog(lsDEBUG) << "Validations flushed"; WriteLog (lsDEBUG, ValidationCollection) << "Validations flushed";
} }
void ValidationCollection::condWrite() void ValidationCollection::condWrite()

1
src/cpp/ripple/ValidationCollection.h
View File

@@ -16,6 +16,7 @@ typedef boost::unordered_map<uint160, SerializedValidation::pointer> ValidationS
typedef std::pair<int, uint160> currentValidationCount; // nodes validating and highest node ID validating typedef std::pair<int, uint160> currentValidationCount; // nodes validating and highest node ID validating
// VFALCO: TODO, Rename this to "Validations"
class ValidationCollection class ValidationCollection
{ {
protected: protected: