Permalink
Browse files

Have errorcodes.py track fassert and fassertFailed.

Fix up duped error codes.
  • Loading branch information...
amschwerin committed Apr 23, 2012
1 parent 84614c3 commit ef446f655bdb63d57babaefb928b4e81fd43610c
Showing with 8 additions and 7 deletions.
  1. +3 −2 buildscripts/errorcodes.py
  2. +1 −1 src/mongo/scripting/bench.cpp
  3. +4 −4 src/mongo/util/mmap_win.cpp
@@ -6,7 +6,7 @@
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 *\(" ) ]
@@ -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();
@@ -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(

0 comments on commit ef446f6

Please sign in to comment.