ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge ripple_db into ripple_main because of circular dependencies

Browse Source
This commit is contained in:
Vinnie Falco
2013-06-03 11:04:05 -07:00
parent 3f3c76ab7e
commit aa33fbed92
4 changed files with 28 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/ripple_db/ripple_db.cpp
View File

@@ -23,7 +23,3 @@
*/
#include "ripple_db.h"
#include "src/cpp/database/database.cpp"
#include "src/cpp/database/SqliteDatabase.cpp"
#include "src/cpp/ripple/DBInit.cpp"

5
modules/ripple_main/ripple_main.cpp
View File

@@ -169,6 +169,11 @@ static DH* handleTmpDh(SSL* ssl, int is_export, int iKeyLength)
#include "src/cpp/ripple/UpdateTables.cpp"
#include "src/cpp/ripple/main.cpp"
// storage
#include "src/cpp/database/database.cpp"
#include "src/cpp/database/SqliteDatabase.cpp"
#include "src/cpp/ripple/DBInit.cpp"
// contracts
#include "src/cpp/ripple/Contract.cpp" // no log
#include "src/cpp/ripple/Interpreter.cpp" // no log

26
newcoin.vcxproj.filters
View File

@@ -52,15 +52,9 @@
<Filter Include="1. Modules\ripple_basics">
<UniqueIdentifier>{84e43f43-816e-4ccd-80c2-38b322904894}</UniqueIdentifier>
</Filter>
<Filter Include="1. Modules\ripple_db">
<UniqueIdentifier>{a5190241-c5bc-4e23-8ef1-6adf757c75e3}</UniqueIdentifier>
</Filter>
<Filter Include="1. Modules\ripple_main">
<UniqueIdentifier>{1a379c07-ccf1-4636-8018-2cfc0685edf0}</UniqueIdentifier>
</Filter>
<Filter Include="1. Modules\ripple_db\storage">
<UniqueIdentifier>{6097a179-ddad-4c69-9a34-2e3fc2c9fa1d}</UniqueIdentifier>
</Filter>
<Filter Include="1. Modules\ripple_basics\containers">
<UniqueIdentifier>{96cbc9ff-0118-4844-bb4c-05aef58a60b5}</UniqueIdentifier>
</Filter>
@@ -139,6 +133,12 @@
<Filter Include="2. Empty\ripple_client">
<UniqueIdentifier>{97c96b68-70fd-4679-89fc-c1c8c87c265e}</UniqueIdentifier>
</Filter>
<Filter Include="1. Modules\ripple_main\storage">
<UniqueIdentifier>{6097a179-ddad-4c69-9a34-2e3fc2c9fa1d}</UniqueIdentifier>
</Filter>
<Filter Include="2. Empty\ripple_db">
<UniqueIdentifier>{a5190241-c5bc-4e23-8ef1-6adf757c75e3}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="src\cpp\database\sqlite3.c">
@@ -592,16 +592,16 @@
<Filter>1. Modules\ripple_main\rpc</Filter>
</ClCompile>
<ClCompile Include="modules\ripple_db\ripple_db.cpp">
<Filter>1. Modules\ripple_db</Filter>
<Filter>2. Empty\ripple_db</Filter>
</ClCompile>
<ClCompile Include="src\cpp\database\database.cpp">
<Filter>1. Modules\ripple_db\storage</Filter>
<Filter>1. Modules\ripple_main\storage</Filter>
</ClCompile>
<ClCompile Include="src\cpp\ripple\DBInit.cpp">
<Filter>1. Modules\ripple_db\storage</Filter>
<Filter>1. Modules\ripple_main\storage</Filter>
</ClCompile>
<ClCompile Include="src\cpp\database\SqliteDatabase.cpp">
<Filter>1. Modules\ripple_db\storage</Filter>
<Filter>1. Modules\ripple_main\storage</Filter>
</ClCompile>
<ClCompile Include="modules\ripple_main\ripple_main.cpp">
<Filter>1. Modules\ripple_main</Filter>
@@ -1248,13 +1248,13 @@
<Filter>1. Modules\ripple_main\rpc</Filter>
</ClInclude>
<ClInclude Include="modules\ripple_db\ripple_db.h">
<Filter>1. Modules\ripple_db</Filter>
<Filter>2. Empty\ripple_db</Filter>
</ClInclude>
<ClInclude Include="src\cpp\database\database.h">
<Filter>1. Modules\ripple_db\storage</Filter>
<Filter>1. Modules\ripple_main\storage</Filter>
</ClInclude>
<ClInclude Include="src\cpp\database\SqliteDatabase.h">
<Filter>1. Modules\ripple_db\storage</Filter>
<Filter>1. Modules\ripple_main\storage</Filter>
</ClInclude>
<ClInclude Include="modules\ripple_main\ripple_main.h">
<Filter>1. Modules\ripple_main</Filter>

16
src/cpp/ripple/JobQueue.h
View File

@@ -11,6 +11,9 @@
#include <boost/asio.hpp>
#include <boost/ref.hpp>
// VFALCO: Does this belong here?
#include "ripple_LoadEvent.h"
#include "LoadMonitor.h"
// Note that this queue should only be used for CPU-bound jobs
@@ -61,6 +64,7 @@ public:
Job(JobType type, const std::string& name, uint64 index, LoadMonitor& lm, const FUNCTION_TYPE<void(Job&)>& job)
: mType(type), mJobIndex(index), mJob(job), mName(name)
{
// VFALCO: NOTE, what the heck does this mean?
mLoadMonitor = boost::make_shared<LoadEvent>(boost::ref(lm), name, false);
}
@@ -86,8 +90,7 @@ protected:
class JobQueue
{
public:
JobQueue(boost::asio::io_service&);
explicit JobQueue (boost::asio::io_service&);
void addJob(JobType type, const std::string& name, const FUNCTION_TYPE<void(Job&)>& job);
@@ -112,7 +115,10 @@ public:
int isOverloaded();
Json::Value getJson(int c = 0);
protected:
private:
void threadEntry();
void IOThread(boost::mutex::scoped_lock&);
boost::mutex mJobLock;
boost::condition_variable mJobCond;
@@ -127,10 +133,6 @@ protected:
boost::asio::io_service& mIOService;
std::map<JobType, std::pair<int, int > > mJobCounts;
void threadEntry();
void IOThread(boost::mutex::scoped_lock&);
};
#endif