diff options
| author | Andy Schwerin <schwerin@10gen.com> | 2012-04-23 15:42:24 -0400 |
|---|---|---|
| committer | Andy Schwerin <schwerin@10gen.com> | 2012-04-23 16:11:12 -0400 |
| commit | ef446f655bdb63d57babaefb928b4e81fd43610c (patch) | |
| tree | 2dc8c6a332d9c14d6f401ad0e6c8db4c47d8e289 | |
| parent | 84614c30a3cf272c6ca2a975421a445b026915c2 (diff) | |
| download | mongo-ef446f655bdb63d57babaefb928b4e81fd43610c.tar.gz | |
Have errorcodes.py track fassert and fassertFailed.
Fix up duped error codes.
| -rwxr-xr-x | buildscripts/errorcodes.py | 5 | ||||
| -rw-r--r-- | src/mongo/scripting/bench.cpp | 2 | ||||
| -rw-r--r-- | src/mongo/util/mmap_win.cpp | 8 |
3 files changed, 8 insertions, 7 deletions
diff --git a/buildscripts/errorcodes.py b/buildscripts/errorcodes.py index b0f92fb934c..ef5e1a88877 100755 --- a/buildscripts/errorcodes.py +++ b/buildscripts/errorcodes.py @@ -6,7 +6,7 @@ import re import utils -assertNames = [ "uassert" , "massert" ] +assertNames = [ "uassert" , "massert", "fassert", "fassertFailed" ] def assignErrorCodes(): cur = 10000 @@ -36,7 +36,8 @@ def readErrorCodes( callback, replaceZero = False ): quick = [ "assert" , "Exception"] ps = [ re.compile( "(([umsgf]asser(t|ted))) *\(( *)(\d+)" ) , - re.compile( "((User|Msg|MsgAssertion)Exceptio(n))\(( *)(\d+)" ) + re.compile( "((User|Msg|MsgAssertion)Exceptio(n))\(( *)(\d+)" ), + re.compile( "((fassertFailed)()) *\(( *)(\d+)" ) ] bad = [ re.compile( "\sassert *\(" ) ] diff --git a/src/mongo/scripting/bench.cpp b/src/mongo/scripting/bench.cpp index 255ce4ede44..cfab089268e 100644 --- a/src/mongo/scripting/bench.cpp +++ b/src/mongo/scripting/bench.cpp @@ -163,7 +163,7 @@ namespace mongo { if ( ! args["breakOnTrap"].eoo() ) this->breakOnTrap = args["breakOnTrap"].trueValue(); - uassert(16151, "loopCommands config not supported", args["loopCommands"].eoo()); + uassert(16164, "loopCommands config not supported", args["loopCommands"].eoo()); if ( ! args["trapPattern"].eoo() ){ const char* regex = args["trapPattern"].regex(); diff --git a/src/mongo/util/mmap_win.cpp b/src/mongo/util/mmap_win.cpp index c4144aa052b..38effeb5e83 100644 --- a/src/mongo/util/mmap_win.cpp +++ b/src/mongo/util/mmap_win.cpp @@ -93,7 +93,7 @@ namespace mongo { << " (file size is " << len << ")" << " in MemoryMappedFile::createReadOnlyMap" << endl; - fassertFailed( 16150 ); + fassertFailed( 16165 ); } memconcept::is( readOnlyMapAddress, memconcept::concept::other, filename() ); views.push_back( readOnlyMapAddress ); @@ -174,7 +174,7 @@ namespace mongo { << " in MemoryMappedFile::map" << endl; close(); - fassertFailed( 16151 ); + fassertFailed( 16166 ); } } views.push_back(view); @@ -242,7 +242,7 @@ namespace mongo { << " (file size is " << len << ")" << " in MemoryMappedFile::createPrivateMap" << endl; - fassertFailed( 16152 ); + fassertFailed( 16167 ); } clearWritableBits( privateMapAddress ); views.push_back( privateMapAddress ); @@ -262,7 +262,7 @@ namespace mongo { << " failed with error " << errnoWithDescription( dosError ) << " in MemoryMappedFile::remapPrivateView" << endl; - fassertFailed( 16147 ); + fassertFailed( 16168 ); } void* newPrivateView = MapViewOfFileEx( |