SERVER-16431 Simplify DB profile code

1 files changed, 34 insertions, 49 deletions

diff --git a/src/mongo/db/introspect.h b/src/mongo/db/introspect.h
index 07af4ba6653..2a6ec2a477f 100644
--- a/src/mongo/db/introspect.h
+++ b/src/mongo/db/introspect.h
@@ -1,63 +1,48 @@
-// introspect.h
-// system management stuff.
-
 /**
-*    Copyright (C) 2008 10gen Inc.
-*
-*    This program is free software: you can redistribute it and/or  modify
-*    it under the terms of the GNU Affero General Public License, version 3,
-*    as published by the Free Software Foundation.
-*
-*    This program is distributed in the hope that it will be useful,
-*    but WITHOUT ANY WARRANTY; without even the implied warranty of
-*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*    GNU Affero General Public License for more details.
-*
-*    You should have received a copy of the GNU Affero General Public License
-*    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*
-*    As a special exception, the copyright holders give permission to link the
-*    code of portions of this program with the OpenSSL library under certain
-*    conditions as described in each individual source file and distribute
-*    linked combinations including the program with the OpenSSL library. You
-*    must comply with the GNU Affero General Public License in all respects for
-*    all of the code used other than as permitted herein. If you modify file(s)
-*    with this exception, you may extend this exception to your version of the
-*    file(s), but you are not obligated to do so. If you do not wish to do so,
-*    delete this exception statement from your version. If you delete this
-*    exception statement from all source files in the program, then also delete
-*    it in the license file.
-*/
+ *    Copyright (C) 2008 MongoDB Inc.
+ *
+ *    This program is free software: you can redistribute it and/or  modify
+ *    it under the terms of the GNU Affero General Public License, version 3,
+ *    as published by the Free Software Foundation.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU Affero General Public License for more details.
+ *
+ *    You should have received a copy of the GNU Affero General Public License
+ *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *    As a special exception, the copyright holders give permission to link the
+ *    code of portions of this program with the OpenSSL library under certain
+ *    conditions as described in each individual source file and distribute
+ *    linked combinations including the program with the OpenSSL library. You
+ *    must comply with the GNU Affero General Public License in all respects for
+ *    all of the code used other than as permitted herein. If you modify file(s)
+ *    with this exception, you may extend this exception to your version of the
+ *    file(s), but you are not obligated to do so. If you do not wish to do so,
+ *    delete this exception statement from your version. If you delete this
+ *    exception statement from all source files in the program, then also delete
+ *    it in the license file.
+ */
 
 #pragma once
 
-#include <string>
-
-#include "mongo/db/curop.h"
-#include "mongo/db/jsobj.h"
+#include "mongo/base/status.h"
 
 namespace mongo {
 
-    class Collection;
     class Database;
     class OperationContext;
 
-    /* --- profiling --------------------------------------------
-       do when database->profile is set
-    */
-
-    void profile(OperationContext* txn, const Client& c, int op, CurOp& currentOp);
+    /**
+     * Invoked when database profile is enabled.
+     */
+    void profile(OperationContext* txn, int op);
 
     /**
-     * Get (or create) the profile collection
-     *
-     * @param   db      Database in which to create the profile collection
-     * @param   force   Always create the collection if it does not exist
-     * @return  Collection for the newly created collection, or NULL on error
-    **/
-    Collection* getOrCreateProfileCollection(OperationContext* txn,
-                                             Database *db,
-                                             bool force = false,
-                                             std::string* errmsg = NULL);
+     * Pre-creates the profile collection for the specified database.
+     */
+    Status createProfileCollection(OperationContext* txn, Database *db);
 
 } // namespace mongo