Merge commit 'upstream/1.8.0

1 files changed, 16 insertions, 7 deletions

diff --git a/scripting/utils.cpp b/scripting/utils.cpp
index ee01bb2..97eea10 100644
--- a/scripting/utils.cpp
+++ b/scripting/utils.cpp
@@ -23,31 +23,40 @@
 
 namespace mongo {
 
-    BSONObj jsmd5( const BSONObj &a ){
+    void installBenchmarkSystem( Scope& scope );
+
+    BSONObj jsmd5( const BSONObj &a ) {
         uassert( 10261 ,  "js md5 needs a string" , a.firstElement().type() == String );
         const char * s = a.firstElement().valuestrsafe();
-        
+
         md5digest d;
         md5_state_t st;
         md5_init(&st);
         md5_append( &st , (const md5_byte_t*)s , strlen( s ) );
         md5_finish(&st, d);
-        
+
         return BSON( "" << digestToString( d ) );
     }
-    
-    BSONObj JSVersion( const BSONObj& args ){
+
+    BSONObj JSVersion( const BSONObj& args ) {
         cout << "version: " << versionString << endl;
         if ( strstr( versionString , "+" ) )
             printGitVersion();
         return BSONObj();
     }
 
-    void installGlobalUtils( Scope& scope ){
+
+    // ---------------------------------
+    // ---- installer           --------
+    // ---------------------------------
+
+    void installGlobalUtils( Scope& scope ) {
         scope.injectNative( "hex_md5" , jsmd5 );
         scope.injectNative( "version" , JSVersion );
+
+        installBenchmarkSystem( scope );
     }
 
 }
-        
+