diff --git a/src/cpp/ripple/HashedObject.cpp b/src/cpp/ripple/HashedObject.cpp index 5ff173307..03bb62415 100644 --- a/src/cpp/ripple/HashedObject.cpp +++ b/src/cpp/ripple/HashedObject.cpp @@ -86,14 +86,14 @@ bool HashedObjectStore::storeLevelDB(HashedObjectType type, uint32 index, { mWritePending = true; theApp->getJobQueue().addJob(jtWRITE, "HashedObject::store", - BIND_TYPE(&HashedObjectStore::bulkWriteLevelDB, this)); + BIND_TYPE(&HashedObjectStore::bulkWriteLevelDB, this, P_1)); } } mNegativeCache.del(hash); return true; } -void HashedObjectStore::bulkWriteLevelDB() +void HashedObjectStore::bulkWriteLevelDB(Job &) { assert(mLevelDB); int setSize = 0; @@ -205,7 +205,7 @@ bool HashedObjectStore::storeSQLite(HashedObjectType type, uint32 index, { mWritePending = true; theApp->getJobQueue().addJob(jtWRITE, "HashedObject::store", - BIND_TYPE(&HashedObjectStore::bulkWriteSQLite, this)); + BIND_TYPE(&HashedObjectStore::bulkWriteSQLite, this, P_1)); } } // else @@ -214,7 +214,7 @@ bool HashedObjectStore::storeSQLite(HashedObjectType type, uint32 index, return true; } -void HashedObjectStore::bulkWriteSQLite() +void HashedObjectStore::bulkWriteSQLite(Job&) { assert(!mLevelDB); while (1) diff --git a/src/cpp/ripple/HashedObject.h b/src/cpp/ripple/HashedObject.h index 7c2ac27f1..c1df75b2c 100644 --- a/src/cpp/ripple/HashedObject.h +++ b/src/cpp/ripple/HashedObject.h @@ -15,6 +15,8 @@ DEFINE_INSTANCE(HashedObject); +class Job; + enum HashedObjectType { hotUNKNOWN = 0, @@ -91,13 +93,13 @@ public: bool storeSQLite(HashedObjectType type, uint32 index, const std::vector& data, const uint256& hash); HashedObject::pointer retrieveSQLite(const uint256& hash); - void bulkWriteSQLite(); + void bulkWriteSQLite(Job&); #ifdef USE_LEVELDB bool storeLevelDB(HashedObjectType type, uint32 index, const std::vector& data, const uint256& hash); HashedObject::pointer retrieveLevelDB(const uint256& hash); - void bulkWriteLevelDB(); + void bulkWriteLevelDB(Job&); #endif