ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:jedmccaleb/NewCoin

Browse Source
This commit is contained in:
Arthur Britto
2012-10-05 14:59:59 -07:00
parent 3225dfd228 3f323588c3
commit 2e0ecaa683
2 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/FieldNames.cpp
View File

@@ -11,7 +11,7 @@
// These must stay at the top of this file
std::map<int, SField::ptr> SField::codeToField;
boost::mutex SField::mapMutex;
boost::recursive_mutex SField::mapMutex;
SField sfInvalid(-1), sfGeneric(0);
SField sfLedgerEntry(STI_LEDGERENTRY, 1, "LedgerEntry");
@@ -33,16 +33,15 @@ SField::ref SField::getField(int code)
if ((type <= 0) || (field <= 0))
return sfInvalid;
{ //JED: Did this to fix a deadlock. david you should check. Line after this block also has a scoped lock
// why doe sthis thing even need a mutex?
boost::mutex::scoped_lock sl(mapMutex);
std::map<int, SField::ptr>::iterator it = codeToField.find(code);
if (it != codeToField.end())
return *(it->second);
boost::recursive_mutex::scoped_lock sl(mapMutex);
switch (type)
{ // types we are willing to dynamically extend
std::map<int, SField::ptr>::iterator it = codeToField.find(code);
if (it != codeToField.end())
return *(it->second);
switch (type)
{ // types we are willing to dynamically extend
#define FIELD(name, type, index)
#define TYPE(name, type, index) case STI_##type:
@@ -51,12 +50,10 @@ SField::ref SField::getField(int code)
#undef TYPE
break;
default:
return sfInvalid;
}
default:
return sfInvalid;
}
}// end scope lock
std::string dynName = lexical_cast_i(type) + "/" + lexical_cast_i(field);
return *(new SField(code, static_cast<SerializedTypeID>(type), field, dynName.c_str()));
}
@@ -87,7 +84,7 @@ std::string SField::getName() const
SField::ref SField::getField(const std::string& fieldName)
{ // OPTIMIZEME me with a map. CHECKME this is case sensitive
boost::mutex::scoped_lock sl(mapMutex);
boost::recursive_mutex::scoped_lock sl(mapMutex);
typedef std::pair<const int, SField::ptr> int_sfref_pair;
BOOST_FOREACH(const int_sfref_pair& fieldPair, codeToField)
{
@@ -99,7 +96,7 @@ SField::ref SField::getField(const std::string& fieldName)
SField::~SField()
{
boost::mutex::scoped_lock sl(mapMutex);
boost::recursive_mutex::scoped_lock sl(mapMutex);
std::map<int, ptr>::iterator it = codeToField.find(fieldCode);
if ((it != codeToField.end()) && (it->second == this))
codeToField.erase(it);

10
src/FieldNames.h
View File

@@ -3,7 +3,7 @@
#include <string>
#include <boost/thread/mutex.hpp>
#include <boost/thread/recursive_mutex.hpp>
#define FIELD_CODE(type, index) ((static_cast<int>(type) << 16) | index)
@@ -40,8 +40,8 @@ public:
typedef SField const * ptr;
protected:
static std::map<int, ptr> codeToField;
static boost::mutex mapMutex;
static std::map<int, ptr> codeToField;
static boost::recursive_mutex mapMutex;
public:
@@ -53,14 +53,14 @@ public:
SField(int fc, SerializedTypeID tid, int fv, const char* fn) :
fieldCode(fc), fieldType(tid), fieldValue(fv), fieldName(fn)
{
boost::mutex::scoped_lock sl(mapMutex);
boost::recursive_mutex::scoped_lock sl(mapMutex);
codeToField[fieldCode] = this;
}
SField(SerializedTypeID tid, int fv, const char *fn) :
fieldCode(FIELD_CODE(tid, fv)), fieldType(tid), fieldValue(fv), fieldName(fn)
{
boost::mutex::scoped_lock sl(mapMutex);
boost::recursive_mutex::scoped_lock sl(mapMutex);
codeToField[fieldCode] = this;
}