added to class

2 files changed, 40 insertions, 0 deletions

diff --git a/src/mongo/db/server_transactions_metrics.cpp b/src/mongo/db/server_transactions_metrics.cpp
index 64411409672..5546f184b4e 100644
--- a/src/mongo/db/server_transactions_metrics.cpp
+++ b/src/mongo/db/server_transactions_metrics.cpp
@@ -51,6 +51,30 @@ ServerTransactionsMetrics* ServerTransactionsMetrics::get(OperationContext* opCt
     return get(opCtx->getServiceContext());
 }
 
+unsigned long long ServerTransactionsMetrics::getCurrentActive() const {
+    return _currentActive.load();
+}
+
+void ServerTransactionsMetrics::decrementCurrentActive() {
+    _currentActive.fetchAndSubtract(1);
+}
+
+void ServerTransactionsMetrics::incrementCurrentActive() {
+    _currentActive.fetchAndAdd(1);
+}
+
+unsigned long long ServerTransactionsMetrics::getCurrentInactive() const {
+    return _currentInactive.load();
+}
+
+void ServerTransactionsMetrics::decrementCurrentInactive() {
+    _currentInactive.fetchAndSubtract(1);
+}
+
+void ServerTransactionsMetrics::incrementCurrentInactive() {
+    _currentInactive.fetchAndAdd(1);
+}
+
 unsigned long long ServerTransactionsMetrics::getCurrentOpen() const {
     return _currentOpen.load();
 }
diff --git a/src/mongo/db/server_transactions_metrics.h b/src/mongo/db/server_transactions_metrics.h
index 22892d37944..6ed3aad007c 100644
--- a/src/mongo/db/server_transactions_metrics.h
+++ b/src/mongo/db/server_transactions_metrics.h
@@ -46,9 +46,19 @@ public:
     static ServerTransactionsMetrics* get(ServiceContext* service);
     static ServerTransactionsMetrics* get(OperationContext* opCtx);
 
+<<<<<<< HEAD
     unsigned long long getCurrentOpen() const;
     void decrementCurrentOpen();
     void incrementCurrentOpen();
+=======
+    unsigned long long getCurrentActive() const;
+    void decrementCurrentActive();
+    void incrementCurrentActive();
+
+    unsigned long long getCurrentInactive() const;
+    void decrementCurrentInactive();
+    void incrementCurrentInactive();
+>>>>>>> 40c317ccbb... added to class
 
     unsigned long long getTotalStarted() const;
     void incrementTotalStarted();
@@ -65,6 +75,12 @@ public:
     void updateStats(TransactionsStats* stats);
 
 private:
+    // The number of multi-document transactions currently active.
+    AtomicUInt64 _currentActive{0};
+
+    // The number of multi-document transactions currently inactive.
+    AtomicUInt64 _currentInactive{0};
+
     // The total number of open transactions.
     AtomicUInt64 _currentOpen{0};