summaryrefslogtreecommitdiff
path: root/src/mongo/db/curop.h
diff options
context:
space:
mode:
authorLouis Williams <louis.williams@mongodb.com>2018-12-05 13:10:36 -0500
committerLouis Williams <louis.williams@mongodb.com>2019-01-02 17:47:25 -0500
commit0f05363c0431e4b5e6e8b4dcc14ad124de387413 (patch)
treee60bd30355f14b560c671177108781d42c29f0e0 /src/mongo/db/curop.h
parent433cd9954456c66f94cbdff3a81c0cdaf71b0c2e (diff)
downloadmongo-0f05363c0431e4b5e6e8b4dcc14ad124de387413.tar.gz
SERVER-37265 Change curOp and ProgressMeter for hybrid builds
Diffstat (limited to 'src/mongo/db/curop.h')
-rw-r--r--src/mongo/db/curop.h13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/mongo/db/curop.h b/src/mongo/db/curop.h
index 3c63a58656d..124e3347529 100644
--- a/src/mongo/db/curop.h
+++ b/src/mongo/db/curop.h
@@ -522,17 +522,20 @@ public:
void reportState(BSONObjBuilder* builder, bool truncateOps = false);
/**
+ * Sets the message for this CurOp.
+ */
+ void setMessage_inlock(StringData message);
+
+ /**
* Sets the message and the progress meter for this CurOp.
*
* While it is necessary to hold the lock while this method executes, the
* "hit" and "finished" methods of ProgressMeter may be called safely from
* the thread executing the operation without locking the Client.
*/
- ProgressMeter& setMessage_inlock(const char* msg,
- std::string name = "Progress",
- unsigned long long progressMeterTotal = 0,
- int secondsBetween = 3);
-
+ ProgressMeter& setProgress_inlock(StringData name,
+ unsigned long long progressMeterTotal = 0,
+ int secondsBetween = 3);
/**
* Gets the message for this CurOp.
*/