diff options
| -rw-r--r-- | src/mongo/util/goodies.h | 2 | ||||
| -rw-r--r-- | src/mongo/util/util.cpp | 18 |
2 files changed, 12 insertions, 8 deletions
diff --git a/src/mongo/util/goodies.h b/src/mongo/util/goodies.h index f4745fecfa7..06a6a03879c 100644 --- a/src/mongo/util/goodies.h +++ b/src/mongo/util/goodies.h @@ -30,7 +30,7 @@ namespace mongo { * @return if this name has an increasing counter associated, return the value * otherwise 0 */ - unsigned setThreadName(const char * name); + long long setThreadName(const char * name); string getThreadName(); template<class T> diff --git a/src/mongo/util/util.cpp b/src/mongo/util/util.cpp index 356c640f449..bc4729be9b2 100644 --- a/src/mongo/util/util.cpp +++ b/src/mongo/util/util.cpp @@ -54,20 +54,24 @@ namespace mongo { boost::thread_specific_ptr<string> _threadName; - unsigned _setThreadName( const char * name ) { + long long _setThreadName( const char * name ) { if ( ! name ) name = "NONE"; - static unsigned N = 0; + static long long N = 0; if ( strcmp( name , "conn" ) == 0 ) { string* x = _threadName.get(); if ( x && mongoutils::str::startsWith( *x , "conn" ) ) { - int n = atoi( x->c_str() + 4 ); +#if defined(_WIN32) + long long n = _atoi64( x->c_str() + 4 ); +#else + long long n = atoll( x->c_str() + 4 ); +#endif if ( n > 0 ) return n; warning() << "unexpected thread name [" << *x << "] parsed to " << n << endl; } - unsigned n = ++N; + long long n = ++N; stringstream ss; ss << name << n; _threadName.reset( new string( ss.str() ) ); @@ -105,8 +109,8 @@ namespace mongo { } } - unsigned setThreadName(const char *name) { - unsigned n = _setThreadName( name ); + long long setThreadName(const char *name) { + long long n = _setThreadName( name ); #if !defined(_DEBUG) // naming might be expensive so don't do "conn*" over and over if( string("conn") == name ) @@ -118,7 +122,7 @@ namespace mongo { #else - unsigned setThreadName(const char * name ) { + long long setThreadName(const char * name ) { return _setThreadName( name ); } |