Address Travis compiler out of memory and timeout errors

2025-12-06 17:27:55 +00:00 · 2017-07-25 18:33:19 -07:00
parent 3d977aeacb
commit 3c37539cee
35 changed files with 444 additions and 225 deletions
--- a/src/ripple/unity/app_ledger.cpp
+++ b/src/ripple/unity/app_ledger.cpp
@@ -28,14 +28,3 @@
 #include <ripple/app/ledger/LedgerHistory.cpp>
 #include <ripple/app/ledger/OrderBookDB.cpp>
 #include <ripple/app/ledger/TransactionStateSF.cpp>
-
-#include <ripple/app/ledger/impl/InboundLedger.cpp>
-#include <ripple/app/ledger/impl/InboundLedgers.cpp>
-#include <ripple/app/ledger/impl/InboundTransactions.cpp>
-#include <ripple/app/ledger/impl/LedgerCleaner.cpp>
-#include <ripple/app/ledger/impl/LedgerMaster.cpp>
-#include <ripple/app/ledger/impl/LocalTxs.cpp>
-#include <ripple/app/ledger/impl/OpenLedger.cpp>
-#include <ripple/app/ledger/impl/LedgerToJson.cpp>
-#include <ripple/app/ledger/impl/TransactionAcquire.cpp>
-#include <ripple/app/ledger/impl/TransactionMaster.cpp>
--- a/src/ripple/unity/app_ledger_impl.cpp
+++ b/src/ripple/unity/app_ledger_impl.cpp
@@ -0,0 +1,31 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of rippled: https://github.com/ripple/rippled
+    Copyright (c) 2012, 2013 Ripple Labs 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 <BeastConfig.h>
+
+#include <ripple/app/ledger/impl/InboundLedger.cpp>
+#include <ripple/app/ledger/impl/InboundLedgers.cpp>
+#include <ripple/app/ledger/impl/InboundTransactions.cpp>
+#include <ripple/app/ledger/impl/LedgerCleaner.cpp>
+#include <ripple/app/ledger/impl/LedgerMaster.cpp>
+#include <ripple/app/ledger/impl/LocalTxs.cpp>
+#include <ripple/app/ledger/impl/OpenLedger.cpp>
+#include <ripple/app/ledger/impl/LedgerToJson.cpp>
+#include <ripple/app/ledger/impl/TransactionAcquire.cpp>
+#include <ripple/app/ledger/impl/TransactionMaster.cpp>
--- a/src/ripple/unity/app_main1.cpp
+++ b/src/ripple/unity/app_main1.cpp
@@ -19,12 +19,8 @@

 #include <BeastConfig.h>

-#include <ripple/app/main/BasicApp.cpp>
 #include <ripple/app/main/Amendments.cpp>
 #include <ripple/app/main/Application.cpp>
+#include <ripple/app/main/BasicApp.cpp>
 #include <ripple/app/main/CollectorManager.cpp>
-#include <ripple/app/main/Main.cpp>
-#include <ripple/app/main/NodeIdentity.cpp>
-#include <ripple/app/main/NodeStoreScheduler.cpp>
 #include <ripple/app/main/DBInit.cpp>
-#include <ripple/app/main/LoadManager.cpp>
--- a/src/ripple/unity/app_main2.cpp
+++ b/src/ripple/unity/app_main2.cpp
@@ -0,0 +1,25 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of rippled: https://github.com/ripple/rippled
+    Copyright (c) 2012, 2013 Ripple Labs 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 <BeastConfig.h>
+
+#include <ripple/app/main/LoadManager.cpp>
+#include <ripple/app/main/Main.cpp>
+#include <ripple/app/main/NodeIdentity.cpp>
+#include <ripple/app/main/NodeStoreScheduler.cpp>
--- a/src/ripple/unity/app_misc.cpp
+++ b/src/ripple/unity/app_misc.cpp
@@ -24,13 +24,3 @@
 #include <ripple/app/misc/HashRouter.cpp>
 #include <ripple/app/misc/NetworkOPs.cpp>
 #include <ripple/app/misc/SHAMapStoreImp.cpp>
-
-#include <ripple/app/misc/impl/AccountTxPaging.cpp>
-#include <ripple/app/misc/impl/AmendmentTable.cpp>
-#include <ripple/app/misc/impl/LoadFeeTrack.cpp>
-#include <ripple/app/misc/impl/Manifest.cpp>
-#include <ripple/app/misc/impl/Transaction.cpp>
-#include <ripple/app/misc/impl/TxQ.cpp>
-#include <ripple/app/misc/impl/ValidatorList.cpp>
-#include <ripple/app/misc/impl/ValidatorSite.cpp>
-#include <ripple/app/misc/impl/ValidatorKeys.cpp>
--- a/src/ripple/unity/app_misc_impl.cpp
+++ b/src/ripple/unity/app_misc_impl.cpp
@@ -0,0 +1,30 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of rippled: https://github.com/ripple/rippled
+    Copyright (c) 2012, 2013 Ripple Labs 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 <BeastConfig.h>
+
+#include <ripple/app/misc/impl/AccountTxPaging.cpp>
+#include <ripple/app/misc/impl/AmendmentTable.cpp>
+#include <ripple/app/misc/impl/LoadFeeTrack.cpp>
+#include <ripple/app/misc/impl/Manifest.cpp>
+#include <ripple/app/misc/impl/Transaction.cpp>
+#include <ripple/app/misc/impl/TxQ.cpp>
+#include <ripple/app/misc/impl/ValidatorList.cpp>
+#include <ripple/app/misc/impl/ValidatorSite.cpp>
+#include <ripple/app/misc/impl/ValidatorKeys.cpp>
--- a/src/ripple/unity/overlay1.cpp
+++ b/src/ripple/unity/overlay1.cpp
@@ -0,0 +1,25 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of rippled: https://github.com/ripple/rippled
+    Copyright (c) 2012, 2013 Ripple Labs 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 <BeastConfig.h>
+
+#include <ripple/overlay/impl/Cluster.cpp>
+#include <ripple/overlay/impl/ConnectAttempt.cpp>
+#include <ripple/overlay/impl/Message.cpp>
+#include <ripple/overlay/impl/OverlayImpl.cpp>
--- a/src/ripple/unity/overlay2.cpp
+++ b/src/ripple/unity/overlay2.cpp
@@ -19,10 +19,6 @@

 #include <BeastConfig.h>

-#include <ripple/overlay/impl/ConnectAttempt.cpp>
-#include <ripple/overlay/impl/Cluster.cpp>
-#include <ripple/overlay/impl/Message.cpp>
-#include <ripple/overlay/impl/OverlayImpl.cpp>
 #include <ripple/overlay/impl/PeerImp.cpp>
 #include <ripple/overlay/impl/PeerSet.cpp>
 #include <ripple/overlay/impl/TMHello.cpp>
--- a/src/ripple/unity/rpcx1.cpp
+++ b/src/ripple/unity/rpcx1.cpp
@@ -23,13 +23,9 @@
 #include <boost/asio/deadline_timer.hpp>

 #include <ripple/protocol/JsonFields.h>
-
 #include <ripple/rpc/RPCHandler.h>
-
-#include <ripple/rpc/impl/RPCHandler.cpp>
-#include <ripple/rpc/impl/Status.cpp>
-
 #include <ripple/rpc/handlers/Handlers.h>
+
 #include <ripple/rpc/handlers/AccountCurrenciesHandler.cpp>
 #include <ripple/rpc/handlers/AccountInfo.cpp>
 #include <ripple/rpc/handlers/AccountLines.cpp>
@@ -62,34 +58,3 @@
 #include <ripple/rpc/handlers/LogRotate.cpp>
 #include <ripple/rpc/handlers/NoRippleCheck.cpp>
 #include <ripple/rpc/handlers/OwnerInfo.cpp>
-#include <ripple/rpc/handlers/PathFind.cpp>
-#include <ripple/rpc/handlers/PayChanClaim.cpp>
-#include <ripple/rpc/handlers/Peers.cpp>
-#include <ripple/rpc/handlers/Ping.cpp>
-#include <ripple/rpc/handlers/Print.cpp>
-#include <ripple/rpc/handlers/Random.cpp>
-#include <ripple/rpc/handlers/RipplePathFind.cpp>
-#include <ripple/rpc/handlers/ServerInfo.cpp>
-#include <ripple/rpc/handlers/ServerState.cpp>
-#include <ripple/rpc/handlers/SignFor.cpp>
-#include <ripple/rpc/handlers/SignHandler.cpp>
-#include <ripple/rpc/handlers/Stop.cpp>
-#include <ripple/rpc/handlers/Submit.cpp>
-#include <ripple/rpc/handlers/SubmitMultiSigned.cpp>
-#include <ripple/rpc/handlers/Subscribe.cpp>
-#include <ripple/rpc/handlers/TransactionEntry.cpp>
-#include <ripple/rpc/handlers/Tx.cpp>
-#include <ripple/rpc/handlers/TxHistory.cpp>
-#include <ripple/rpc/handlers/UnlList.cpp>
-#include <ripple/rpc/handlers/Unsubscribe.cpp>
-#include <ripple/rpc/handlers/ValidationCreate.cpp>
-#include <ripple/rpc/handlers/ValidationSeed.cpp>
-#include <ripple/rpc/handlers/WalletPropose.cpp>
-#include <ripple/rpc/handlers/WalletSeed.cpp>
-
-#include <ripple/rpc/impl/Handler.cpp>
-#include <ripple/rpc/impl/LegacyPathFind.cpp>
-#include <ripple/rpc/impl/Role.cpp>
-#include <ripple/rpc/impl/RPCHelpers.cpp>
-#include <ripple/rpc/impl/ServerHandlerImp.cpp>
-#include <ripple/rpc/impl/TransactionSign.cpp>
--- a/src/ripple/unity/rpcx2.cpp
+++ b/src/ripple/unity/rpcx2.cpp
@@ -0,0 +1,61 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of rippled: https://github.com/ripple/rippled
+    Copyright (c) 2012, 2013 Ripple Labs 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 <BeastConfig.h>
+
+// This has to be included early to prevent an obscure MSVC compile error
+#include <boost/asio/deadline_timer.hpp>
+
+#include <ripple/protocol/JsonFields.h>
+#include <ripple/rpc/RPCHandler.h>
+#include <ripple/rpc/handlers/Handlers.h>
+
+#include <ripple/rpc/handlers/PathFind.cpp>
+#include <ripple/rpc/handlers/PayChanClaim.cpp>
+#include <ripple/rpc/handlers/Peers.cpp>
+#include <ripple/rpc/handlers/Ping.cpp>
+#include <ripple/rpc/handlers/Print.cpp>
+#include <ripple/rpc/handlers/Random.cpp>
+#include <ripple/rpc/handlers/RipplePathFind.cpp>
+#include <ripple/rpc/handlers/ServerInfo.cpp>
+#include <ripple/rpc/handlers/ServerState.cpp>
+#include <ripple/rpc/handlers/SignFor.cpp>
+#include <ripple/rpc/handlers/SignHandler.cpp>
+#include <ripple/rpc/handlers/Stop.cpp>
+#include <ripple/rpc/handlers/Submit.cpp>
+#include <ripple/rpc/handlers/SubmitMultiSigned.cpp>
+#include <ripple/rpc/handlers/Subscribe.cpp>
+#include <ripple/rpc/handlers/TransactionEntry.cpp>
+#include <ripple/rpc/handlers/Tx.cpp>
+#include <ripple/rpc/handlers/TxHistory.cpp>
+#include <ripple/rpc/handlers/UnlList.cpp>
+#include <ripple/rpc/handlers/Unsubscribe.cpp>
+#include <ripple/rpc/handlers/ValidationCreate.cpp>
+#include <ripple/rpc/handlers/ValidationSeed.cpp>
+#include <ripple/rpc/handlers/WalletPropose.cpp>
+#include <ripple/rpc/handlers/WalletSeed.cpp>
+
+#include <ripple/rpc/impl/Handler.cpp>
+#include <ripple/rpc/impl/LegacyPathFind.cpp>
+#include <ripple/rpc/impl/Role.cpp>
+#include <ripple/rpc/impl/RPCHandler.cpp>
+#include <ripple/rpc/impl/RPCHelpers.cpp>
+#include <ripple/rpc/impl/ServerHandlerImp.cpp>
+#include <ripple/rpc/impl/Status.cpp>
+#include <ripple/rpc/impl/TransactionSign.cpp>