1 files changed, 221 insertions, 222 deletions

diff --git a/src/mongo/util/assert_util.cpp b/src/mongo/util/assert_util.cpp
index 23c53c74bca..9985eacbb6a 100644
--- a/src/mongo/util/assert_util.cpp
+++ b/src/mongo/util/assert_util.cpp
@@ -56,275 +56,274 @@ using namespace std;
 
 namespace mongo {
 
-    AssertionCount assertionCount;
+AssertionCount assertionCount;
 
-    AssertionCount::AssertionCount()
-        : regular(0),warning(0),msg(0),user(0),rollovers(0) {
-    }
+AssertionCount::AssertionCount() : regular(0), warning(0), msg(0), user(0), rollovers(0) {}
 
-    void AssertionCount::rollover() {
-        rollovers++;
-        regular = 0;
-        warning = 0;
-        msg = 0;
-        user = 0;
-    }
+void AssertionCount::rollover() {
+    rollovers++;
+    regular = 0;
+    warning = 0;
+    msg = 0;
+    user = 0;
+}
 
-    void AssertionCount::condrollover( int newvalue ) {
-        static const int rolloverPoint = ( 1 << 30 );
-        if ( newvalue >= rolloverPoint )
-            rollover();
-    }
+void AssertionCount::condrollover(int newvalue) {
+    static const int rolloverPoint = (1 << 30);
+    if (newvalue >= rolloverPoint)
+        rollover();
+}
 
-    bool DBException::traceExceptions = false;
+bool DBException::traceExceptions = false;
 
-    string DBException::toString() const {
-        stringstream ss;
-        ss << getCode() << " " << what();
-        return ss.str();
-    }
+string DBException::toString() const {
+    stringstream ss;
+    ss << getCode() << " " << what();
+    return ss.str();
+}
 
-    void DBException::traceIfNeeded( const DBException& e ) {
-        if( traceExceptions && ! inShutdown() ){
-            warning() << "DBException thrown" << causedBy( e ) << endl;
-            printStackTrace();
-        }
+void DBException::traceIfNeeded(const DBException& e) {
+    if (traceExceptions && !inShutdown()) {
+        warning() << "DBException thrown" << causedBy(e) << endl;
+        printStackTrace();
     }
+}
 
-    ErrorCodes::Error DBException::convertExceptionCode(int exCode) {
-        if (exCode == 0) return ErrorCodes::UnknownError;
-        return static_cast<ErrorCodes::Error>(exCode);
-    }
+ErrorCodes::Error DBException::convertExceptionCode(int exCode) {
+    if (exCode == 0)
+        return ErrorCodes::UnknownError;
+    return static_cast<ErrorCodes::Error>(exCode);
+}
 
-    void ExceptionInfo::append( BSONObjBuilder& b , const char * m , const char * c ) const {
-        if ( msg.empty() )
-            b.append( m , "unknown assertion" );
-        else
-            b.append( m , msg );
+void ExceptionInfo::append(BSONObjBuilder& b, const char* m, const char* c) const {
+    if (msg.empty())
+        b.append(m, "unknown assertion");
+    else
+        b.append(m, msg);
 
-        if ( code )
-            b.append( c , code );
-    }
+    if (code)
+        b.append(c, code);
+}
 
-    /* "warning" assert -- safe to continue, so we don't throw exception. */
-    NOINLINE_DECL void wasserted(const char* expr, const char* file, unsigned line) {
-        static bool rateLimited;
-        static time_t lastWhen;
-        static unsigned lastLine;
-        if( lastLine == line && time(0)-lastWhen < 5 ) { 
-            if( !rateLimited ) { 
-                rateLimited = true;
-                log() << "rate limiting wassert" << endl;
-            }
-            return;
+/* "warning" assert -- safe to continue, so we don't throw exception. */
+NOINLINE_DECL void wasserted(const char* expr, const char* file, unsigned line) {
+    static bool rateLimited;
+    static time_t lastWhen;
+    static unsigned lastLine;
+    if (lastLine == line && time(0) - lastWhen < 5) {
+        if (!rateLimited) {
+            rateLimited = true;
+            log() << "rate limiting wassert" << endl;
         }
-        lastWhen = time(0);
-        lastLine = line;
+        return;
+    }
+    lastWhen = time(0);
+    lastLine = line;
 
-        log() << "warning assertion failure " << expr << ' ' << file << ' ' << dec << line << endl;
-        logContext();
-        assertionCount.condrollover( ++assertionCount.warning );
+    log() << "warning assertion failure " << expr << ' ' << file << ' ' << dec << line << endl;
+    logContext();
+    assertionCount.condrollover(++assertionCount.warning);
 #if defined(MONGO_CONFIG_DEBUG_BUILD)
-        // this is so we notice in buildbot
-        log() << "\n\n***aborting after wassert() failure in a debug/test build\n\n" << endl;
-        quickExit(EXIT_ABRUPT);
+    // this is so we notice in buildbot
+    log() << "\n\n***aborting after wassert() failure in a debug/test build\n\n" << endl;
+    quickExit(EXIT_ABRUPT);
 #endif
-    }
+}
 
-    NOINLINE_DECL void verifyFailed(const char* expr, const char* file, unsigned line) {
-        assertionCount.condrollover( ++assertionCount.regular );
-        log() << "Assertion failure " << expr << ' ' << file << ' ' << dec << line << endl;
-        logContext();
-        stringstream temp;
-        temp << "assertion " << file << ":" << line;
-        AssertionException e(temp.str(),0);
-        breakpoint();
+NOINLINE_DECL void verifyFailed(const char* expr, const char* file, unsigned line) {
+    assertionCount.condrollover(++assertionCount.regular);
+    log() << "Assertion failure " << expr << ' ' << file << ' ' << dec << line << endl;
+    logContext();
+    stringstream temp;
+    temp << "assertion " << file << ":" << line;
+    AssertionException e(temp.str(), 0);
+    breakpoint();
 #if defined(MONGO_CONFIG_DEBUG_BUILD)
-        // this is so we notice in buildbot
-        log() << "\n\n***aborting after verify() failure as this is a debug/test build\n\n" << endl;
-        quickExit(EXIT_ABRUPT);
+    // this is so we notice in buildbot
+    log() << "\n\n***aborting after verify() failure as this is a debug/test build\n\n" << endl;
+    quickExit(EXIT_ABRUPT);
 #endif
-        throw e;
-    }
+    throw e;
+}
 
-    NOINLINE_DECL void invariantFailed(const char* expr, const char* file, unsigned line) {
-        log() << "Invariant failure " << expr << ' ' << file << ' ' << dec << line << endl;
-        logContext();
-        breakpoint();
-        log() << "\n\n***aborting after invariant() failure\n\n" << endl;
-        quickExit(EXIT_ABRUPT);
-    }
+NOINLINE_DECL void invariantFailed(const char* expr, const char* file, unsigned line) {
+    log() << "Invariant failure " << expr << ' ' << file << ' ' << dec << line << endl;
+    logContext();
+    breakpoint();
+    log() << "\n\n***aborting after invariant() failure\n\n" << endl;
+    quickExit(EXIT_ABRUPT);
+}
 
-    NOINLINE_DECL void invariantOKFailed(const char* expr, const Status& status, const char *file,
-                                         unsigned line) {
-        log() << "Invariant failure: " << expr << " resulted in status " << status
-              << " at " << file << ' ' << dec << line;
-        logContext();
-        breakpoint();
-        log() << "\n\n***aborting after invariant() failure\n\n" << endl;
-        quickExit(EXIT_ABRUPT);
-    }
+NOINLINE_DECL void invariantOKFailed(const char* expr,
+                                     const Status& status,
+                                     const char* file,
+                                     unsigned line) {
+    log() << "Invariant failure: " << expr << " resulted in status " << status << " at " << file
+          << ' ' << dec << line;
+    logContext();
+    breakpoint();
+    log() << "\n\n***aborting after invariant() failure\n\n" << endl;
+    quickExit(EXIT_ABRUPT);
+}
 
-    NOINLINE_DECL void fassertFailed( int msgid ) {
-        log() << "Fatal Assertion " << msgid << endl;
-        logContext();
-        breakpoint();
-        log() << "\n\n***aborting after fassert() failure\n\n" << endl;
-        quickExit(EXIT_ABRUPT);
-    }
+NOINLINE_DECL void fassertFailed(int msgid) {
+    log() << "Fatal Assertion " << msgid << endl;
+    logContext();
+    breakpoint();
+    log() << "\n\n***aborting after fassert() failure\n\n" << endl;
+    quickExit(EXIT_ABRUPT);
+}
 
-    NOINLINE_DECL void fassertFailedNoTrace( int msgid ) {
-        log() << "Fatal Assertion " << msgid << endl;
-        breakpoint();
-        log() << "\n\n***aborting after fassert() failure\n\n" << endl;
-        quickExit(EXIT_ABRUPT);
-    }
+NOINLINE_DECL void fassertFailedNoTrace(int msgid) {
+    log() << "Fatal Assertion " << msgid << endl;
+    breakpoint();
+    log() << "\n\n***aborting after fassert() failure\n\n" << endl;
+    quickExit(EXIT_ABRUPT);
+}
 
-    MONGO_COMPILER_NORETURN void fassertFailedWithStatus(int msgid, const Status& status) {
-        log() << "Fatal assertion " <<  msgid << " " << status;
-        logContext();
-        breakpoint();
-        log() << "\n\n***aborting after fassert() failure\n\n" << endl;
-        quickExit(EXIT_ABRUPT);
-    }
+MONGO_COMPILER_NORETURN void fassertFailedWithStatus(int msgid, const Status& status) {
+    log() << "Fatal assertion " << msgid << " " << status;
+    logContext();
+    breakpoint();
+    log() << "\n\n***aborting after fassert() failure\n\n" << endl;
+    quickExit(EXIT_ABRUPT);
+}
 
-    MONGO_COMPILER_NORETURN void fassertFailedWithStatusNoTrace(int msgid, const Status& status) {
-        log() << "Fatal assertion " <<  msgid << " " << status;
-        breakpoint();
-        log() << "\n\n***aborting after fassert() failure\n\n" << endl;
-        quickExit(EXIT_ABRUPT);
-    }
+MONGO_COMPILER_NORETURN void fassertFailedWithStatusNoTrace(int msgid, const Status& status) {
+    log() << "Fatal assertion " << msgid << " " << status;
+    breakpoint();
+    log() << "\n\n***aborting after fassert() failure\n\n" << endl;
+    quickExit(EXIT_ABRUPT);
+}
 
-    void uasserted(int msgid , const string &msg) {
-        uasserted(msgid, msg.c_str());
-    }
+void uasserted(int msgid, const string& msg) {
+    uasserted(msgid, msg.c_str());
+}
 
-    void UserException::appendPrefix( stringstream& ss ) const { ss << "userassert:"; }
-    void MsgAssertionException::appendPrefix( stringstream& ss ) const { ss << "massert:"; }
+void UserException::appendPrefix(stringstream& ss) const {
+    ss << "userassert:";
+}
+void MsgAssertionException::appendPrefix(stringstream& ss) const {
+    ss << "massert:";
+}
 
-    NOINLINE_DECL void uasserted(int msgid, const char *msg) {
-        assertionCount.condrollover( ++assertionCount.user );
-        LOG(1) << "User Assertion: " << msgid << ":" << msg << endl;
-        throw UserException(msgid, msg);
-    }
+NOINLINE_DECL void uasserted(int msgid, const char* msg) {
+    assertionCount.condrollover(++assertionCount.user);
+    LOG(1) << "User Assertion: " << msgid << ":" << msg << endl;
+    throw UserException(msgid, msg);
+}
 
-    void msgasserted(int msgid, const string &msg) {
-        msgasserted(msgid, msg.c_str());
-    }
+void msgasserted(int msgid, const string& msg) {
+    msgasserted(msgid, msg.c_str());
+}
 
-    NOINLINE_DECL void msgasserted(int msgid, const char *msg) {
-        assertionCount.condrollover( ++assertionCount.warning );
-        log() << "Assertion: " << msgid << ":" << msg << endl;
-        //breakpoint();
-        logContext();
-        throw MsgAssertionException(msgid, msg);
-    }
+NOINLINE_DECL void msgasserted(int msgid, const char* msg) {
+    assertionCount.condrollover(++assertionCount.warning);
+    log() << "Assertion: " << msgid << ":" << msg << endl;
+    // breakpoint();
+    logContext();
+    throw MsgAssertionException(msgid, msg);
+}
 
-    NOINLINE_DECL void msgassertedNoTrace(int msgid, const char *msg) {
-        assertionCount.condrollover( ++assertionCount.warning );
-        log() << "Assertion: " << msgid << ":" << msg << endl;
-        throw MsgAssertionException(msgid, msg);
-    }
+NOINLINE_DECL void msgassertedNoTrace(int msgid, const char* msg) {
+    assertionCount.condrollover(++assertionCount.warning);
+    log() << "Assertion: " << msgid << ":" << msg << endl;
+    throw MsgAssertionException(msgid, msg);
+}
 
-    void msgassertedNoTrace(int msgid, const std::string& msg) {
-        msgassertedNoTrace(msgid, msg.c_str());
-    }
+void msgassertedNoTrace(int msgid, const std::string& msg) {
+    msgassertedNoTrace(msgid, msg.c_str());
+}
 
-    std::string causedBy( const char* e ) {
-        return std::string(" :: caused by :: ") + e;
-    }
+std::string causedBy(const char* e) {
+    return std::string(" :: caused by :: ") + e;
+}
 
-    std::string causedBy( const DBException& e ){
-        return causedBy( e.toString() );
-    }
+std::string causedBy(const DBException& e) {
+    return causedBy(e.toString());
+}
 
-    std::string causedBy( const std::exception& e ) {
-        return causedBy( e.what() );
-    }
+std::string causedBy(const std::exception& e) {
+    return causedBy(e.what());
+}
 
-    std::string causedBy( const std::string& e ){
-        return causedBy( e.c_str() );
-    }
+std::string causedBy(const std::string& e) {
+    return causedBy(e.c_str());
+}
 
-    std::string causedBy( const std::string* e ) {
-        return (e && *e != "") ? causedBy(*e) : "";
-    }
+std::string causedBy(const std::string* e) {
+    return (e && *e != "") ? causedBy(*e) : "";
+}
 
-    std::string causedBy( const Status& e ){
-        return causedBy( e.reason() );
-    }
+std::string causedBy(const Status& e) {
+    return causedBy(e.reason());
+}
 
-    string errnoWithPrefix( const char * prefix ) {
-        stringstream ss;
-        if ( prefix )
-            ss << prefix << ": ";
-        ss << errnoWithDescription();
-        return ss.str();
-    }
+string errnoWithPrefix(const char* prefix) {
+    stringstream ss;
+    if (prefix)
+        ss << prefix << ": ";
+    ss << errnoWithDescription();
+    return ss.str();
+}
 
-    string demangleName( const type_info& typeinfo ) {
+string demangleName(const type_info& typeinfo) {
 #ifdef _WIN32
-        return typeinfo.name();
+    return typeinfo.name();
 #else
-        int status;
+    int status;
 
-        char * niceName = abi::__cxa_demangle(typeinfo.name(), 0, 0, &status);
-        if ( ! niceName )
-            return typeinfo.name();
+    char* niceName = abi::__cxa_demangle(typeinfo.name(), 0, 0, &status);
+    if (!niceName)
+        return typeinfo.name();
 
-        string s = niceName;
-        free(niceName);
-        return s;
+    string s = niceName;
+    free(niceName);
+    return s;
 #endif
-    }
-
-    Status exceptionToStatus() {
-        try {
-            throw;
-        }
-        catch (const DBException& ex) {
-            return ex.toStatus();
-        }
-        catch (const std::exception& ex) {
-            return Status(ErrorCodes::UnknownError,
-                          str::stream() << "Caught std::exception of type "
-                                        << demangleName(typeid(ex))
-                                        << ": "
-                                        << ex.what());
-        }
-        catch (const boost::exception& ex) {
-            return Status(ErrorCodes::UnknownError,
-                          str::stream() << "Caught boost::exception of type "
-                                        << demangleName(typeid(ex))
-                                        << ": "
-                                        << boost::diagnostic_information(ex));
-
-        }
-        catch (...) {
-            severe() << "Caught unknown exception in exceptionToStatus()";
-            std::terminate();
-        }
-    }
+}
 
-    string ExceptionInfo::toString() const {
-        stringstream ss; ss << "exception: " << code << " " << msg; return ss.str(); 
+Status exceptionToStatus() {
+    try {
+        throw;
+    } catch (const DBException& ex) {
+        return ex.toStatus();
+    } catch (const std::exception& ex) {
+        return Status(ErrorCodes::UnknownError,
+                      str::stream() << "Caught std::exception of type " << demangleName(typeid(ex))
+                                    << ": " << ex.what());
+    } catch (const boost::exception& ex) {
+        return Status(ErrorCodes::UnknownError,
+                      str::stream() << "Caught boost::exception of type "
+                                    << demangleName(typeid(ex)) << ": "
+                                    << boost::diagnostic_information(ex));
+
+    } catch (...) {
+        severe() << "Caught unknown exception in exceptionToStatus()";
+        std::terminate();
     }
+}
 
-    NOINLINE_DECL ErrorMsg::ErrorMsg(const char *msg, char ch) {
-        int l = strlen(msg);
-        verify( l < 128);
-        memcpy(buf, msg, l);
-        char *p = buf + l;
-        p[0] = ch;
-        p[1] = 0;
-    }
+string ExceptionInfo::toString() const {
+    stringstream ss;
+    ss << "exception: " << code << " " << msg;
+    return ss.str();
+}
 
-    NOINLINE_DECL ErrorMsg::ErrorMsg(const char *msg, unsigned val) {
-        int l = strlen(msg);
-        verify( l < 128);
-        memcpy(buf, msg, l);
-        char *p = buf + l;
-        sprintf(p, "%u", val);
-    }
+NOINLINE_DECL ErrorMsg::ErrorMsg(const char* msg, char ch) {
+    int l = strlen(msg);
+    verify(l < 128);
+    memcpy(buf, msg, l);
+    char* p = buf + l;
+    p[0] = ch;
+    p[1] = 0;
+}
 
+NOINLINE_DECL ErrorMsg::ErrorMsg(const char* msg, unsigned val) {
+    int l = strlen(msg);
+    verify(l < 128);
+    memcpy(buf, msg, l);
+    char* p = buf + l;
+    sprintf(p, "%u", val);
+}
 }