mirror of
https://github.com/XRPLF/rippled.git
synced 2025-11-20 11:05:54 +00:00
New implementation to replace logging macros
This commit is contained in:
Vinnie Falco
@@ -15,7 +15,7 @@
|
||||
<PreprocessorDefinitions>USE_LEVELDB;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
||||
<WarningLevel>Level3</WarningLevel>
|
||||
<AdditionalIncludeDirectories>$(RepoDir)\src\cpp\leveldb;$(RepoDir)\src\cpp\leveldb\include;$(RepoDir)\src\cpp\protobuf\src;$(RepoDir)\src\cpp\protobuf\vsprojects;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>$(RepoDir)\src\cpp\leveldb;$(RepoDir)\src\cpp\leveldb\include;$(RepoDir)\src\cpp\protobuf\src;$(RepoDir)\src\cpp\protobuf\vsprojects;$(RepoDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<AdditionalDependencies>Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
|
||||
@@ -23,3 +23,5 @@
|
||||
*/
|
||||
|
||||
#include "ripple_basics.h"
|
||||
|
||||
//#include "src/cpp/ripple/Amount.cpp"
|
||||
|
||||
51
modules/ripple_ledger/ripple_ledger.cpp
Normal file
51
modules/ripple_ledger/ripple_ledger.cpp
Normal file
@@ -0,0 +1,51 @@
|
||||
//------------------------------------------------------------------------------
|
||||
/*
|
||||
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_ledger module.
|
||||
|
||||
@file ripple_ledger.cpp
|
||||
@ingroup ripple_ledger
|
||||
*/
|
||||
|
||||
#include "ripple_ledger.h"
|
||||
|
||||
#if 0
|
||||
#include "src/cpp/ripple/Contract.cpp"
|
||||
#include "src/cpp/ripple/Operation.cpp"
|
||||
|
||||
#include "src/cpp/ripple/AcceptedLedger.cpp"
|
||||
#include "src/cpp/ripple/AccountItems.cpp"
|
||||
#include "src/cpp/ripple/AccountState.cpp"
|
||||
#endif
|
||||
#include "src/cpp/ripple/FeatureTable.cpp"
|
||||
#include "src/cpp/ripple/Ledger.cpp"
|
||||
#if 0
|
||||
#include "src/cpp/ripple/LedgerAcquire.cpp"
|
||||
#include "src/cpp/ripple/LedgerConsensus.cpp"
|
||||
#include "src/cpp/ripple/LedgerEntrySet.cpp"
|
||||
#include "src/cpp/ripple/LedgerFormats.cpp"
|
||||
#include "src/cpp/ripple/LedgerHistory.cpp"
|
||||
#include "src/cpp/ripple/LedgerMaster.cpp"
|
||||
#include "src/cpp/ripple/LedgerProposal.cpp"
|
||||
#include "src/cpp/ripple/LedgerTiming.cpp"
|
||||
#include "src/cpp/ripple/Offer.cpp"
|
||||
#include "src/cpp/ripple/OrderBook.cpp"
|
||||
#include "src/cpp/ripple/OrderBookDB.cpp"
|
||||
#include "src/cpp/ripple/RippleCalc.cpp"
|
||||
#include "src/cpp/ripple/RippleState.cpp"
|
||||
#endif
|
||||
37
modules/ripple_ledger/ripple_ledger.h
Normal file
37
modules/ripple_ledger/ripple_ledger.h
Normal 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_ledger module.
|
||||
|
||||
@file ripple_ledger.h
|
||||
@ingroup ripple_ledger
|
||||
*/
|
||||
|
||||
/** Ledger classes.
|
||||
|
||||
This module exposes functionality for accessing and processing the ledger.
|
||||
|
||||
@defgroup ripple_ledger
|
||||
*/
|
||||
|
||||
#ifndef RIPPLE_LEDGER_H
|
||||
#define RIPPLE_LEDGER_H
|
||||
|
||||
|
||||
|
||||
#endif
|
||||
@@ -168,6 +168,7 @@
|
||||
</ItemDefinitionGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="modules\ripple_basics\ripple_basics.cpp" />
|
||||
<ClCompile Include="modules\ripple_ledger\ripple_ledger.cpp" />
|
||||
<ClCompile Include="src\cpp\database\database.cpp" />
|
||||
<ClCompile Include="src\cpp\database\sqlite3.c" />
|
||||
<ClCompile Include="src\cpp\database\SqliteDatabase.cpp" />
|
||||
@@ -646,6 +647,7 @@
|
||||
<ClInclude Include="database\sqlite3.h" />
|
||||
<ClInclude Include="database\sqlite3ext.h" />
|
||||
<ClInclude Include="modules\ripple_basics\ripple_basics.h" />
|
||||
<ClInclude Include="modules\ripple_ledger\ripple_ledger.h" />
|
||||
<ClInclude Include="src\cpp\database\database.h" />
|
||||
<ClInclude Include="src\cpp\database\SqliteDatabase.h" />
|
||||
<ClInclude Include="src\cpp\json\autolink.h">
|
||||
|
||||
@@ -89,6 +89,12 @@
|
||||
<Filter Include="1. Modules\ripple_net">
|
||||
<UniqueIdentifier>{7f76ce57-c428-487e-97a0-979c0990a81d}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="1. Modules\ripple_basics\diagnostic">
|
||||
<UniqueIdentifier>{505d1e20-ff6a-446b-8ce0-962e11b78820}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="1. Modules\ripple_ledger\processing">
|
||||
<UniqueIdentifier>{c441b367-d096-401f-a3f0-5ac24290d7b7}</UniqueIdentifier>
|
||||
</Filter>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="src\cpp\database\sqlite3.c">
|
||||
@@ -424,15 +430,6 @@
|
||||
<ClCompile Include="src\cpp\ripple\ripple.pb.cc">
|
||||
<Filter>protoc_generated</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\cpp\ripple\AcceptedLedger.cpp">
|
||||
<Filter>1. Modules\ripple_ledger</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\cpp\ripple\AccountItems.cpp">
|
||||
<Filter>1. Modules\ripple_ledger</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\cpp\ripple\AccountState.cpp">
|
||||
<Filter>1. Modules\ripple_ledger</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\cpp\ripple\Application.cpp">
|
||||
<Filter>1. Modules\ripple_main</Filter>
|
||||
</ClCompile>
|
||||
@@ -457,54 +454,12 @@
|
||||
<ClCompile Include="src\cpp\ripple\JobQueue.cpp">
|
||||
<Filter>1. Modules\ripple_main</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\cpp\ripple\LedgerAcquire.cpp">
|
||||
<Filter>1. Modules\ripple_ledger</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\cpp\ripple\LedgerConsensus.cpp">
|
||||
<Filter>1. Modules\ripple_ledger</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\cpp\ripple\LedgerEntrySet.cpp">
|
||||
<Filter>1. Modules\ripple_ledger</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\cpp\ripple\LedgerFormats.cpp">
|
||||
<Filter>1. Modules\ripple_ledger</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\cpp\ripple\LedgerHistory.cpp">
|
||||
<Filter>1. Modules\ripple_ledger</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\cpp\ripple\LedgerMaster.cpp">
|
||||
<Filter>1. Modules\ripple_ledger</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\cpp\ripple\LedgerProposal.cpp">
|
||||
<Filter>1. Modules\ripple_ledger</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\cpp\ripple\LedgerTiming.cpp">
|
||||
<Filter>1. Modules\ripple_ledger</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\cpp\ripple\Ledger.cpp">
|
||||
<Filter>1. Modules\ripple_ledger</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\cpp\ripple\OrderBook.cpp">
|
||||
<Filter>1. Modules\ripple_ledger</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\cpp\ripple\OrderBookDB.cpp">
|
||||
<Filter>1. Modules\ripple_ledger</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\cpp\ripple\Offer.cpp">
|
||||
<Filter>1. Modules\ripple_ledger</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\cpp\ripple\Peer.cpp">
|
||||
<Filter>1. Modules\ripple_net</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\cpp\ripple\PeerDoor.cpp">
|
||||
<Filter>1. Modules\ripple_net</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\cpp\ripple\RippleCalc.cpp">
|
||||
<Filter>1. Modules\ripple_ledger</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\cpp\ripple\RippleState.cpp">
|
||||
<Filter>1. Modules\ripple_ledger</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\cpp\ripple\Transaction.cpp">
|
||||
<Filter>1. Modules\ripple_ledger\transactions</Filter>
|
||||
</ClCompile>
|
||||
@@ -568,9 +523,6 @@
|
||||
<ClCompile Include="src\cpp\ripple\HTTPRequest.cpp">
|
||||
<Filter>1. Modules\ripple_main</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\cpp\ripple\Log.cpp">
|
||||
<Filter>1. Modules\ripple_main</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\cpp\ripple\Operation.cpp">
|
||||
<Filter>1. Modules\ripple_ledger\contracts</Filter>
|
||||
</ClCompile>
|
||||
@@ -616,9 +568,6 @@
|
||||
<ClCompile Include="src\cpp\ripple\Serializer.cpp">
|
||||
<Filter>1. Modules\ripple_ledger\serialization</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\cpp\ripple\FeatureTable.cpp">
|
||||
<Filter>1. Modules\ripple_ledger</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\cpp\ripple\ValidationCollection.cpp">
|
||||
<Filter>1. Modules\ripple_net</Filter>
|
||||
</ClCompile>
|
||||
@@ -688,6 +637,66 @@
|
||||
<ClCompile Include="modules\ripple_basics\ripple_basics.cpp">
|
||||
<Filter>1. Modules\ripple_basics</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\cpp\ripple\Log.cpp">
|
||||
<Filter>1. Modules\ripple_basics\diagnostic</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="modules\ripple_ledger\ripple_ledger.cpp">
|
||||
<Filter>1. Modules\ripple_ledger</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\cpp\ripple\AcceptedLedger.cpp">
|
||||
<Filter>1. Modules\ripple_ledger\processing</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\cpp\ripple\AccountItems.cpp">
|
||||
<Filter>1. Modules\ripple_ledger\processing</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\cpp\ripple\AccountState.cpp">
|
||||
<Filter>1. Modules\ripple_ledger\processing</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\cpp\ripple\FeatureTable.cpp">
|
||||
<Filter>1. Modules\ripple_ledger\processing</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\cpp\ripple\Ledger.cpp">
|
||||
<Filter>1. Modules\ripple_ledger\processing</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\cpp\ripple\LedgerAcquire.cpp">
|
||||
<Filter>1. Modules\ripple_ledger\processing</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\cpp\ripple\LedgerConsensus.cpp">
|
||||
<Filter>1. Modules\ripple_ledger\processing</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\cpp\ripple\LedgerEntrySet.cpp">
|
||||
<Filter>1. Modules\ripple_ledger\processing</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\cpp\ripple\LedgerFormats.cpp">
|
||||
<Filter>1. Modules\ripple_ledger\processing</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\cpp\ripple\LedgerHistory.cpp">
|
||||
<Filter>1. Modules\ripple_ledger\processing</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\cpp\ripple\LedgerMaster.cpp">
|
||||
<Filter>1. Modules\ripple_ledger\processing</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\cpp\ripple\LedgerProposal.cpp">
|
||||
<Filter>1. Modules\ripple_ledger\processing</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\cpp\ripple\LedgerTiming.cpp">
|
||||
<Filter>1. Modules\ripple_ledger\processing</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\cpp\ripple\Offer.cpp">
|
||||
<Filter>1. Modules\ripple_ledger\processing</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\cpp\ripple\OrderBook.cpp">
|
||||
<Filter>1. Modules\ripple_ledger\processing</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\cpp\ripple\OrderBookDB.cpp">
|
||||
<Filter>1. Modules\ripple_ledger\processing</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\cpp\ripple\RippleCalc.cpp">
|
||||
<Filter>1. Modules\ripple_ledger\processing</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\cpp\ripple\RippleState.cpp">
|
||||
<Filter>1. Modules\ripple_ledger\processing</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="database\sqlite3ext.h">
|
||||
@@ -1050,15 +1059,6 @@
|
||||
<ClInclude Include="src\cpp\ripple\ripple.pb.h">
|
||||
<Filter>protoc_generated</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="src\cpp\ripple\AcceptedLedger.h">
|
||||
<Filter>1. Modules\ripple_ledger</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="src\cpp\ripple\AccountItems.h">
|
||||
<Filter>1. Modules\ripple_ledger</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="src\cpp\ripple\AccountState.h">
|
||||
<Filter>1. Modules\ripple_ledger</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="src\cpp\ripple\Application.h">
|
||||
<Filter>1. Modules\ripple_main</Filter>
|
||||
</ClInclude>
|
||||
@@ -1086,54 +1086,12 @@
|
||||
<ClInclude Include="src\cpp\ripple\JobQueue.h">
|
||||
<Filter>1. Modules\ripple_main</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="src\cpp\ripple\LedgerTiming.h">
|
||||
<Filter>1. Modules\ripple_ledger</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="src\cpp\ripple\LedgerAcquire.h">
|
||||
<Filter>1. Modules\ripple_ledger</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="src\cpp\ripple\LedgerConsensus.h">
|
||||
<Filter>1. Modules\ripple_ledger</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="src\cpp\ripple\LedgerEntrySet.h">
|
||||
<Filter>1. Modules\ripple_ledger</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="src\cpp\ripple\LedgerFormats.h">
|
||||
<Filter>1. Modules\ripple_ledger</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="src\cpp\ripple\LedgerHistory.h">
|
||||
<Filter>1. Modules\ripple_ledger</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="src\cpp\ripple\LedgerMaster.h">
|
||||
<Filter>1. Modules\ripple_ledger</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="src\cpp\ripple\LedgerProposal.h">
|
||||
<Filter>1. Modules\ripple_ledger</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="src\cpp\ripple\Ledger.h">
|
||||
<Filter>1. Modules\ripple_ledger</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="src\cpp\ripple\OrderBook.h">
|
||||
<Filter>1. Modules\ripple_ledger</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="src\cpp\ripple\OrderBookDB.h">
|
||||
<Filter>1. Modules\ripple_ledger</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="src\cpp\ripple\Offer.h">
|
||||
<Filter>1. Modules\ripple_ledger</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="src\cpp\ripple\PeerDoor.h">
|
||||
<Filter>1. Modules\ripple_net</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="src\cpp\ripple\Peer.h">
|
||||
<Filter>1. Modules\ripple_net</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="src\cpp\ripple\RippleCalc.h">
|
||||
<Filter>1. Modules\ripple_ledger</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="src\cpp\ripple\RippleState.h">
|
||||
<Filter>1. Modules\ripple_ledger</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="src\cpp\ripple\Transaction.h">
|
||||
<Filter>1. Modules\ripple_ledger\transactions</Filter>
|
||||
</ClInclude>
|
||||
@@ -1188,9 +1146,6 @@
|
||||
<ClInclude Include="src\cpp\ripple\HTTPRequest.h">
|
||||
<Filter>1. Modules\ripple_main</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="src\cpp\ripple\Log.h">
|
||||
<Filter>1. Modules\ripple_main</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="src\cpp\ripple\Operation.h">
|
||||
<Filter>1. Modules\ripple_ledger\contracts</Filter>
|
||||
</ClInclude>
|
||||
@@ -1236,9 +1191,6 @@
|
||||
<ClInclude Include="src\cpp\ripple\Serializer.h">
|
||||
<Filter>1. Modules\ripple_ledger\serialization</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="src\cpp\ripple\FeatureTable.h">
|
||||
<Filter>1. Modules\ripple_ledger</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="src\cpp\ripple\ValidationCollection.h">
|
||||
<Filter>1. Modules\ripple_net</Filter>
|
||||
</ClInclude>
|
||||
@@ -1314,6 +1266,66 @@
|
||||
<ClInclude Include="modules\ripple_basics\ripple_basics.h">
|
||||
<Filter>1. Modules\ripple_basics</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="src\cpp\ripple\Log.h">
|
||||
<Filter>1. Modules\ripple_basics\diagnostic</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="modules\ripple_ledger\ripple_ledger.h">
|
||||
<Filter>1. Modules\ripple_ledger</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="src\cpp\ripple\AcceptedLedger.h">
|
||||
<Filter>1. Modules\ripple_ledger\processing</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="src\cpp\ripple\AccountItems.h">
|
||||
<Filter>1. Modules\ripple_ledger\processing</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="src\cpp\ripple\AccountState.h">
|
||||
<Filter>1. Modules\ripple_ledger\processing</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="src\cpp\ripple\FeatureTable.h">
|
||||
<Filter>1. Modules\ripple_ledger\processing</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="src\cpp\ripple\Ledger.h">
|
||||
<Filter>1. Modules\ripple_ledger\processing</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="src\cpp\ripple\LedgerAcquire.h">
|
||||
<Filter>1. Modules\ripple_ledger\processing</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="src\cpp\ripple\LedgerConsensus.h">
|
||||
<Filter>1. Modules\ripple_ledger\processing</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="src\cpp\ripple\LedgerEntrySet.h">
|
||||
<Filter>1. Modules\ripple_ledger\processing</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="src\cpp\ripple\LedgerFormats.h">
|
||||
<Filter>1. Modules\ripple_ledger\processing</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="src\cpp\ripple\LedgerHistory.h">
|
||||
<Filter>1. Modules\ripple_ledger\processing</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="src\cpp\ripple\LedgerMaster.h">
|
||||
<Filter>1. Modules\ripple_ledger\processing</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="src\cpp\ripple\LedgerProposal.h">
|
||||
<Filter>1. Modules\ripple_ledger\processing</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="src\cpp\ripple\LedgerTiming.h">
|
||||
<Filter>1. Modules\ripple_ledger\processing</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="src\cpp\ripple\Offer.h">
|
||||
<Filter>1. Modules\ripple_ledger\processing</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="src\cpp\ripple\OrderBook.h">
|
||||
<Filter>1. Modules\ripple_ledger\processing</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="src\cpp\ripple\OrderBookDB.h">
|
||||
<Filter>1. Modules\ripple_ledger\processing</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="src\cpp\ripple\RippleCalc.h">
|
||||
<Filter>1. Modules\ripple_ledger\processing</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="src\cpp\ripple\RippleState.h">
|
||||
<Filter>1. Modules\ripple_ledger\processing</Filter>
|
||||
</ClInclude>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="wallet.xml" />
|
||||
|
||||
@@ -7,8 +7,6 @@
|
||||
#include "ValidationCollection.h"
|
||||
#include "HashPrefixes.h"
|
||||
|
||||
SETUP_LOG();
|
||||
|
||||
void FeatureTable::addInitialFeatures()
|
||||
{
|
||||
// For each feature this version supports, call enableFeature.
|
||||
@@ -175,13 +173,13 @@ void FeatureTable::reportValidations(const FeatureSet& set)
|
||||
BOOST_FOREACH(const u256_int_pair& it, set.mVotes)
|
||||
{
|
||||
FeatureState& state = mFeatureMap[it.first];
|
||||
cLog(lsDEBUG) << "Feature " << it.first.GetHex() << " has " << it.second << " votes, needs " << threshold;
|
||||
WriteLog (lsDEBUG, FeatureTable) << "Feature " << it.first.GetHex() << " has " << it.second << " votes, needs " << threshold;
|
||||
if (it.second >= threshold)
|
||||
{ // we have a majority
|
||||
state.mLastMajority = set.mCloseTime;
|
||||
if (state.mFirstMajority == 0)
|
||||
{
|
||||
cLog(lsWARNING) << "Feature " << it.first << " attains a majority vote";
|
||||
WriteLog (lsWARNING, FeatureTable) << "Feature " << it.first << " attains a majority vote";
|
||||
state.mFirstMajority = set.mCloseTime;
|
||||
changedFeatures.push_back(it.first);
|
||||
}
|
||||
@@ -190,7 +188,7 @@ void FeatureTable::reportValidations(const FeatureSet& set)
|
||||
{
|
||||
if (state.mFirstMajority != 0)
|
||||
{
|
||||
cLog(lsWARNING) << "Feature " << it.first << " loses majority vote";
|
||||
WriteLog (lsWARNING, FeatureTable) << "Feature " << it.first << " loses majority vote";
|
||||
state.mFirstMajority = 0;
|
||||
state.mLastMajority = 0;
|
||||
changedFeatures.push_back(it.first);
|
||||
@@ -254,12 +252,12 @@ void FeatureTable::doVoting(Ledger::ref lastClosedLedger, SHAMap::ref initialPos
|
||||
|
||||
BOOST_FOREACH(const uint256& uFeature, lFeatures)
|
||||
{
|
||||
cLog(lsWARNING) << "We are voting for feature " << uFeature;
|
||||
WriteLog (lsWARNING, FeatureTable) << "We are voting for feature " << uFeature;
|
||||
SerializedTransaction trans(ttFEATURE);
|
||||
trans.setFieldAccount(sfAccount, uint160());
|
||||
trans.setFieldH256(sfFeature, uFeature);
|
||||
uint256 txID = trans.getTransactionID();
|
||||
cLog(lsWARNING) << "Vote: " << txID;
|
||||
WriteLog (lsWARNING, FeatureTable) << "Vote: " << txID;
|
||||
|
||||
Serializer s;
|
||||
trans.add(s, true);
|
||||
@@ -267,7 +265,7 @@ void FeatureTable::doVoting(Ledger::ref lastClosedLedger, SHAMap::ref initialPos
|
||||
SHAMapItem::pointer tItem = boost::make_shared<SHAMapItem>(txID, s.peekData());
|
||||
if (!initialPosition->addGiveItem(tItem, true, false))
|
||||
{
|
||||
cLog(lsWARNING) << "Ledger already had feature transaction";
|
||||
WriteLog (lsWARNING, FeatureTable) << "Ledger already had feature transaction";
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -375,19 +373,19 @@ void FeeVote::doValidation(Ledger::ref lastClosedLedger, STObject& validation)
|
||||
{
|
||||
if (lastClosedLedger->getBaseFee() != mTargetBaseFee)
|
||||
{
|
||||
cLog(lsINFO) << "Voting for base fee of " << mTargetBaseFee;
|
||||
WriteLog (lsINFO, FeatureTable) << "Voting for base fee of " << mTargetBaseFee;
|
||||
validation.setFieldU64(sfBaseFee, mTargetBaseFee);
|
||||
}
|
||||
|
||||
if (lastClosedLedger->getReserve(0) != mTargetReserveBase)
|
||||
{
|
||||
cLog(lsINFO) << "Voting for base resrve of " << mTargetReserveBase;
|
||||
WriteLog (lsINFO, FeatureTable) << "Voting for base resrve of " << mTargetReserveBase;
|
||||
validation.setFieldU32(sfReserveBase, mTargetReserveBase);
|
||||
}
|
||||
|
||||
if (lastClosedLedger->getReserveInc() != mTargetReserveIncrement)
|
||||
{
|
||||
cLog(lsINFO) << "Voting for reserve increment of " << mTargetReserveIncrement;
|
||||
WriteLog (lsINFO, FeatureTable) << "Voting for reserve increment of " << mTargetReserveIncrement;
|
||||
validation.setFieldU32(sfReserveIncrement, mTargetReserveIncrement);
|
||||
}
|
||||
}
|
||||
@@ -433,7 +431,7 @@ void FeeVote::doVoting(Ledger::ref lastClosedLedger, SHAMap::ref initialPosition
|
||||
(baseReserve != lastClosedLedger->getReserve(0)) ||
|
||||
(incReserve != lastClosedLedger->getReserveInc()))
|
||||
{
|
||||
cLog(lsWARNING) << "We are voting for a fee change: " << baseFee << "/" << baseReserve << "/" << incReserve;
|
||||
WriteLog (lsWARNING, FeatureTable) << "We are voting for a fee change: " << baseFee << "/" << baseReserve << "/" << incReserve;
|
||||
SerializedTransaction trans(ttFEE);
|
||||
trans.setFieldAccount(sfAccount, uint160());
|
||||
trans.setFieldU64(sfBaseFee, baseFee);
|
||||
@@ -441,7 +439,7 @@ void FeeVote::doVoting(Ledger::ref lastClosedLedger, SHAMap::ref initialPosition
|
||||
trans.setFieldU32(sfReserveBase, baseReserve);
|
||||
trans.setFieldU32(sfReserveIncrement, incReserve);
|
||||
uint256 txID = trans.getTransactionID();
|
||||
cLog(lsWARNING) << "Vote: " << txID;
|
||||
WriteLog (lsWARNING, FeatureTable) << "Vote: " << txID;
|
||||
|
||||
Serializer s;
|
||||
trans.add(s, true);
|
||||
@@ -449,7 +447,7 @@ void FeeVote::doVoting(Ledger::ref lastClosedLedger, SHAMap::ref initialPosition
|
||||
SHAMapItem::pointer tItem = boost::make_shared<SHAMapItem>(txID, s.peekData());
|
||||
if (!initialPosition->addGiveItem(tItem, true, false))
|
||||
{
|
||||
cLog(lsWARNING) << "Ledger already had fee change";
|
||||
WriteLog (lsWARNING, FeatureTable) << "Ledger already had fee change";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -56,7 +56,7 @@ protected:
|
||||
public:
|
||||
LogPartition(const char *name);
|
||||
|
||||
bool doLog(LogSeverity s) { return s >= mMinSeverity; }
|
||||
bool doLog(LogSeverity s) const { return s >= mMinSeverity; }
|
||||
const std::string& getName() const { return mName; }
|
||||
|
||||
static bool setSeverity(const std::string& partition, LogSeverity severity);
|
||||
@@ -110,6 +110,23 @@ public:
|
||||
static std::string rotateLog(void);
|
||||
};
|
||||
|
||||
//-----
|
||||
|
||||
template <class Key>
|
||||
inline LogPartition const& getLogPartition ()
|
||||
{
|
||||
static LogPartition logPartition (__FILE__);
|
||||
return logPartition;
|
||||
}
|
||||
|
||||
template <class Key>
|
||||
inline Log getLog (LogSeverity level)
|
||||
{
|
||||
return Log (level, getLogPartition <Key> ());
|
||||
}
|
||||
|
||||
#define WriteLog(s, k) if (!getLogPartition <k> ().doLog (s)) do {} while (0); else Log (s, getLogPartition <k> ())
|
||||
|
||||
#endif
|
||||
|
||||
// vim:ts=4
|
||||
|
||||
Reference in New Issue
Block a user