From 3435636a4375678ac31d13cff01046192819ce0d Mon Sep 17 00:00:00 2001 From: Vinnie Falco Date: Wed, 24 Jul 2013 03:15:07 -0700 Subject: [PATCH] Use beast_sqlite and beast_sqdb --- Builds/QtCreator/rippled.pro | 3 +- Builds/VisualStudio2012/RippleD.vcxproj | 9 ++- .../VisualStudio2012/RippleD.vcxproj.filters | 6 ++ SConstruct | 3 +- .../beast/modules/beast_sqlite/beast_sqlite.c | 5 -- modules/ripple_app/ripple_app.cpp | 4 +- .../ripple_basics/utility/ripple_IniFile.cpp | 2 - modules/ripple_sqlite/ripple_sqlite.c | 62 ------------------- modules/ripple_sqlite/ripple_sqlite.h | 30 --------- 9 files changed, 20 insertions(+), 104 deletions(-) delete mode 100644 modules/ripple_sqlite/ripple_sqlite.c delete mode 100644 modules/ripple_sqlite/ripple_sqlite.h diff --git a/Builds/QtCreator/rippled.pro b/Builds/QtCreator/rippled.pro index 088d7a84a4..4bf43ff5f3 100644 --- a/Builds/QtCreator/rippled.pro +++ b/Builds/QtCreator/rippled.pro @@ -63,6 +63,8 @@ SOURCES += \ ../../Subtrees/beast/modules/beast_core/beast_core.cpp \ ../../Subtrees/beast/modules/beast_crypto/beast_crypto.cpp \ ../../Subtrees/beast/modules/beast_db/beast_db.cpp \ + ../../Subtrees/beast/modules/beast_sqdb/beast_sqdb.cpp \ + ../../Subtrees/beast/modules/beast_sqlite/beast_sqlite.cpp \ ../../modules/ripple_app/ripple_app_pt1.cpp \ ../../modules/ripple_app/ripple_app_pt2.cpp \ ../../modules/ripple_app/ripple_app_pt3.cpp \ @@ -81,7 +83,6 @@ SOURCES += \ ../../modules/ripple_leveldb/ripple_leveldb.cpp \ ../../modules/ripple_mdb/ripple_mdb.c \ ../../modules/ripple_net/ripple_net.cpp \ - ../../modules/ripple_sqlite/ripple_sqlite.c \ ../../modules/ripple_websocket/ripple_websocket.cpp LIBS += \ diff --git a/Builds/VisualStudio2012/RippleD.vcxproj b/Builds/VisualStudio2012/RippleD.vcxproj index 411a969235..c8ac031c25 100644 --- a/Builds/VisualStudio2012/RippleD.vcxproj +++ b/Builds/VisualStudio2012/RippleD.vcxproj @@ -1019,7 +1019,12 @@ true - + + true + true + true + true + true true @@ -1038,6 +1043,8 @@ + + true true diff --git a/Builds/VisualStudio2012/RippleD.vcxproj.filters b/Builds/VisualStudio2012/RippleD.vcxproj.filters index f2e96d06ef..ee89a094bd 100644 --- a/Builds/VisualStudio2012/RippleD.vcxproj.filters +++ b/Builds/VisualStudio2012/RippleD.vcxproj.filters @@ -906,6 +906,12 @@ [1] Ripple\ripple_app\tx + + [0] Subtrees\beast + + + [0] Subtrees\beast + diff --git a/SConstruct b/SConstruct index ae2888e804..043423c56d 100644 --- a/SConstruct +++ b/SConstruct @@ -141,8 +141,7 @@ COMPILED_FILES = [ 'modules/ripple_leveldb/ripple_leveldb.cpp', 'modules/ripple_mdb/ripple_mdb.c', 'modules/ripple_net/ripple_net.cpp', - 'modules/ripple_websocket/ripple_websocket.cpp', - 'modules/ripple_sqlite/ripple_sqlite.c' + 'modules/ripple_websocket/ripple_websocket.cpp' ] #------------------------------------------------------------------------------- diff --git a/Subtrees/beast/modules/beast_sqlite/beast_sqlite.c b/Subtrees/beast/modules/beast_sqlite/beast_sqlite.c index 176be5a421..99ef158676 100644 --- a/Subtrees/beast/modules/beast_sqlite/beast_sqlite.c +++ b/Subtrees/beast/modules/beast_sqlite/beast_sqlite.c @@ -57,11 +57,6 @@ */ //#define SQLITE_THREADSAFE 2 -/* When compiled with SQLITE_THREADSAFE=2, SQLite can be used in a - multithreaded program so long as no two threads attempt to use the - same database connection at the same time. -*/ - #include "sqlite/sqlite3.c" #if BEAST_MSVC diff --git a/modules/ripple_app/ripple_app.cpp b/modules/ripple_app/ripple_app.cpp index 62ae426979..8b497f363c 100644 --- a/modules/ripple_app/ripple_app.cpp +++ b/modules/ripple_app/ripple_app.cpp @@ -61,11 +61,13 @@ #include #include -#include "../ripple_sqlite/ripple_sqlite.h" // for SqliteDatabase.cpp +//#include "../ripple_sqlite/ripple_sqlite.h" // for SqliteDatabase.cpp #include "../ripple_core/ripple_core.h" #include "beast/modules/beast_db/beast_db.h" +#include "beast/modules/beast_sqdb/beast_sqdb.h" +#include "beast/modules/beast_sqlite/beast_sqlite.h" // VFALCO TODO fix these warnings! #ifdef _MSC_VER diff --git a/modules/ripple_basics/utility/ripple_IniFile.cpp b/modules/ripple_basics/utility/ripple_IniFile.cpp index 7c230cb03f..25ec1dab84 100644 --- a/modules/ripple_basics/utility/ripple_IniFile.cpp +++ b/modules/ripple_basics/utility/ripple_IniFile.cpp @@ -135,8 +135,6 @@ StringPairArray parseKeyValueSection (Section& secSource, String const& strSecti // yuck. std::string const stdStrSection (strSection.toStdString ()); - int const count = SectionCount (secSource, stdStrSection); - typedef Section::mapped_type Entries; Entries* const entries = SectionEntries (secSource, stdStrSection); diff --git a/modules/ripple_sqlite/ripple_sqlite.c b/modules/ripple_sqlite/ripple_sqlite.c deleted file mode 100644 index ae8c03ab18..0000000000 --- a/modules/ripple_sqlite/ripple_sqlite.c +++ /dev/null @@ -1,62 +0,0 @@ -//------------------------------------------------------------------------------ -/* - Copyright (c) 2011-2013, OpenCoin, Inc. -*/ -//============================================================================== - -/** Add this to get the @ref ripple_sqlite module. - - @file ripple_sqlite.cpp - @ingroup ripple_sqlite -*/ - -#include "BeastConfig.h" - -// This prevents sqlite.h from being included -// -#define RIPPLE_SQLITE_MODULE_INCLUDED 1 - -#include "ripple_sqlite.h" - -#if BEAST_MSVC -#pragma warning (push) -#pragma warning (disable: 4100) /* unreferenced formal parameter */ -#pragma warning (disable: 4127) /* conditional expression is constant */ -#pragma warning (disable: 4232) /* nonstandard extension used: dllimport address */ -#pragma warning (disable: 4244) /* conversion from 'int': possible loss of data */ -#pragma warning (disable: 4701) /* potentially uninitialized variable */ -#pragma warning (disable: 4706) /* assignment within conditional expression */ -#endif - -/* When compiled with SQLITE_THREADSAFE=1, SQLite operates in serialized mode. - In this mode, SQLite can be safely used by multiple threads with no restriction. - - VFALCO NOTE This implies a global mutex! - - NOTE Windows builds never had the threading model set. However, SQLite - defaults to Serialized (SQLITE_THREADSAFE == 1). Does Ripple need - Serialized mode? Because Ripple already uses a mutex with every - instance of the sqlite database session object. -*/ -#define SQLITE_THREADSAFE 1 - -/* When compiled with SQLITE_THREADSAFE=2, SQLite can be used in a - multithreaded program so long as no two threads attempt to use the - same database connection at the same time. - - VFALCO NOTE This is the preferred threading model. - - TODO Determine if Ripple can support this model. -*/ -//#define SQLITE_THREADSAFE 2 - -// VFALCO TODO We should try running with SQLITE_THREADSAFE==2 and see what happens. -#if SQLITE_THREADSAFE != 2 -//#pragma message(BEAST_FILEANDLINE_ "Possible performance issue, SQLITE_THREADSAFE != 2") -#endif - -#include "sqlite/sqlite3.c" - -#if BEAST_MSVC -#pragma warning (pop) -#endif diff --git a/modules/ripple_sqlite/ripple_sqlite.h b/modules/ripple_sqlite/ripple_sqlite.h deleted file mode 100644 index b750af4e7f..0000000000 --- a/modules/ripple_sqlite/ripple_sqlite.h +++ /dev/null @@ -1,30 +0,0 @@ -//------------------------------------------------------------------------------ -/* - Copyright (c) 2011-2013, OpenCoin, Inc. -*/ -//============================================================================== - -/** Include this to get the @ref ripple_sqlite module. - - @file ripple_sqlite.h - @ingroup ripple_sqlite -*/ - -/** Sqlite3 support. - - This module brings in the Sqlite embedded database engine. - - @defgroup ripple_sqlite -*/ - -#ifndef RIPPLE_SQLITE_RIPPLEHEADER -#define RIPPLE_SQLITE_RIPPLEHEADER - -// Include this directly because we compile under both C and C++ -#include "beast/modules/beast_core/system/beast_TargetPlatform.h" - -#if ! RIPPLE_SQLITE_MODULE_INCLUDED -#include "sqlite/sqlite3.h" -#endif - -#endif