diff options
| author | Nathan Louie <nathan.louie@10gen.com> | 2018-06-19 11:29:24 -0400 |
|---|---|---|
| committer | Nathan Louie <nathan.louie@10gen.com> | 2018-06-25 17:21:30 -0400 |
| commit | ace1aec25c5324fb51083e266757e48ef664be55 (patch) | |
| tree | 4c1f0e6c8f12c6c38c82f8eb4bcdfb33335ed3ac /src/mongo/db/server_transactions_metrics.h | |
| parent | d28c9472878a9e50196c568848c84d6225036406 (diff) | |
| download | mongo-ace1aec25c5324fb51083e266757e48ef664be55.tar.gz | |
initial review
Diffstat (limited to 'src/mongo/db/server_transactions_metrics.h')
| -rw-r--r-- | src/mongo/db/server_transactions_metrics.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/mongo/db/server_transactions_metrics.h b/src/mongo/db/server_transactions_metrics.h index 6ed3aad007c..f877a1f8b23 100644 --- a/src/mongo/db/server_transactions_metrics.h +++ b/src/mongo/db/server_transactions_metrics.h @@ -46,11 +46,6 @@ 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(); @@ -58,7 +53,10 @@ public: unsigned long long getCurrentInactive() const; void decrementCurrentInactive(); void incrementCurrentInactive(); ->>>>>>> 40c317ccbb... added to class + + unsigned long long getCurrentOpen() const; + void decrementCurrentOpen(); + void incrementCurrentOpen(); unsigned long long getTotalStarted() const; void incrementTotalStarted(); |