Use ScopedLock RAII for some Application members

Conflicts:
	src/cpp/ripple/Application.h
This commit is contained in:
Vinnie Falco
2013-06-02 09:28:14 -07:00
parent 17e066650e
commit 2cfcda1440
2 changed files with 18 additions and 2 deletions

View File

@@ -8,6 +8,12 @@
# define LEVELDB_PLATFORM_POSIX
#endif
#ifdef _MSC_VER
#pragma warning (push)
#pragma warning (disable: 4018) // signed/unsigned mismatch
#pragma warning (disable: 4244) // conversion, possible loss of data
#endif
#include "leveldb/db/builder.cc"
#include "leveldb/db/db_impl.cc"
#include "leveldb/db/db_iter.cc"
@@ -85,3 +91,8 @@
//#include "leveldb/table/filter_block_test.cc"
//#include "leveldb/table/table_test.cc"
#ifdef _MSC_VER
#pragma warning (pop)
#endif

View File

@@ -398,6 +398,10 @@ void Application::sweep()
theApp->stop();
}
// VFALCO: NOTE, Does the order of calls matter?
// VFALCO: TODO, fix the dependency inversion using an observer,
// have listeners register for "onSweep ()" notification.
//
mMasterTransaction.sweep();
mHashedObjectStore.sweep();
mLedgerMaster.sweep();
@@ -405,9 +409,10 @@ void Application::sweep()
mValidations->sweep();
getMasterLedgerAcquire().sweep();
mSLECache.sweep();
AcceptedLedger::sweep();
SHAMap::sweep();
AcceptedLedger::sweep(); // VFALCO: NOTE, AcceptedLedger is/has a singleton?
SHAMap::sweep(); // VFALCO: NOTE, SHAMap is/has a singleton?
mNetOps.sweepFetchPack();
// VFALCO: NOTE, does the call to sweep() happen on another thread?
mSweepTimer.expires_from_now(boost::posix_time::seconds(theConfig.getSize(siSweepInterval)));
mSweepTimer.async_wait(boost::bind(&Application::sweep, this));
}