xuemingqiang/mongo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "SERVER-695 don't destroy static global mutexes"

Browse Source 
This reverts commit 714ec2fdc8.
This commit is contained in:
Aaron
2010-03-10 00:39:26 -08:00
parent 26b6ffe30a
commit eb7cde3e75
50 changed files with 153 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
shell/utils.cpp
View File

@@ -195,11 +195,11 @@ namespace mongo {
map< pid_t, HANDLE > handles;
#endif
mongo::mutex mongoProgramOutputMutex;
boost::mutex &mongoProgramOutputMutex( *( new boost::mutex ) );
stringstream mongoProgramOutput_;
void writeMongoProgramOutputLine( int port, int pid, const char *line ) {
mongo::mutex::scoped_lock lk( mongoProgramOutputMutex );
boost::mutex::scoped_lock lk( mongoProgramOutputMutex );
stringstream buf;
if ( port > 0 )
buf << "m" << port << "| " << line;
@@ -211,7 +211,7 @@ namespace mongo {
// only returns last 100000 characters
BSONObj RawMongoProgramOutput( const BSONObj &args ) {
mongo::mutex::scoped_lock lk( mongoProgramOutputMutex );
boost::mutex::scoped_lock lk( mongoProgramOutputMutex );
string out = mongoProgramOutput_.str();
size_t len = out.length();
if ( len > 100000 )
@@ -220,7 +220,7 @@ namespace mongo {
}
BSONObj ClearRawMongoProgramOutput( const BSONObj &args ) {
mongo::mutex::scoped_lock lk( mongoProgramOutputMutex );
boost::mutex::scoped_lock lk( mongoProgramOutputMutex );
mongoProgramOutput_.str( "" );
return undefined_;
}