diff options
author | Kaloian Manassiev <kaloian.manassiev@mongodb.com> | 2022-08-27 08:50:34 +0200 |
---|---|---|
committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-08-29 09:46:28 +0000 |
commit | d5978f3d85b3764a3876553a893f458485dc6d3d (patch) | |
tree | 83dc996e6c2f66353c5e1220911053407c5b87d5 /src/mongo/db/stats | |
parent | 6acc65f52de00bd9caa45e582e65a8669424b4dc (diff) | |
download | mongo-d5978f3d85b3764a3876553a893f458485dc6d3d.tar.gz |
SERVER-68826 Move logical_time into server_base
Diffstat (limited to 'src/mongo/db/stats')
-rw-r--r-- | src/mongo/db/stats/SConscript | 35 | ||||
-rw-r--r-- | src/mongo/db/stats/counters.cpp | 16 | ||||
-rw-r--r-- | src/mongo/db/stats/counters.h | 1 |
3 files changed, 24 insertions, 28 deletions
diff --git a/src/mongo/db/stats/SConscript b/src/mongo/db/stats/SConscript index 7d07cadb4b4..668c60eed5b 100644 --- a/src/mongo/db/stats/SConscript +++ b/src/mongo/db/stats/SConscript @@ -9,9 +9,8 @@ env.Library( source=[ 'timer_stats.cpp', ], - LIBDEPS=[ + LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/base', - '$BUILD_DIR/mongo/util/concurrency/spin_lock', ], ) @@ -32,10 +31,8 @@ env.Library( source=[ 'api_version_metrics.cpp', ], - LIBDEPS=[ - '$BUILD_DIR/mongo/base', - ], LIBDEPS_PRIVATE=[ + '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/db/shared_request_handling', '$BUILD_DIR/mongo/rpc/client_metadata', ], @@ -47,8 +44,10 @@ env.Library( 'counters.cpp', ], LIBDEPS=[ - '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/db/commands/server_status_core', + ], + LIBDEPS_PRIVATE=[ + '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/util/concurrency/spin_lock', ], ) @@ -62,14 +61,12 @@ env.Library( 'server_write_concern_metrics.idl', ], LIBDEPS=[ - '$BUILD_DIR/mongo/base', - '$BUILD_DIR/mongo/db/commands/server_status', '$BUILD_DIR/mongo/db/repl/read_concern_args', '$BUILD_DIR/mongo/db/write_concern_options', - '$BUILD_DIR/mongo/idl/idl_parser', ], LIBDEPS_PRIVATE=[ - '$BUILD_DIR/mongo/idl/server_parameter', + '$BUILD_DIR/mongo/db/commands/server_status_core', + '$BUILD_DIR/mongo/db/server_base', ], ) @@ -79,26 +76,22 @@ env.Library( 'resource_consumption_metrics.cpp', 'operation_resource_consumption.idl', ], - LIBDEPS=[ - '$BUILD_DIR/mongo/base', - '$BUILD_DIR/mongo/idl/idl_parser', - ], LIBDEPS_PRIVATE=[ - '$BUILD_DIR/mongo/db/commands/server_status', + '$BUILD_DIR/mongo/db/commands/server_status_core', '$BUILD_DIR/mongo/db/repl/repl_coordinator_interface', + '$BUILD_DIR/mongo/db/server_base', '$BUILD_DIR/mongo/idl/feature_flag', - '$BUILD_DIR/mongo/idl/server_parameter', ], ) env.Library( - target="transaction_stats", + target='transaction_stats', source=[ - "single_transaction_stats.cpp", + 'single_transaction_stats.cpp', ], - LIBDEPS=[ - '$BUILD_DIR/mongo/base', + LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/db/repl/read_concern_args', + '$BUILD_DIR/mongo/db/server_base', ], ) @@ -124,7 +117,7 @@ env.Library( '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/db/catalog/database_holder', '$BUILD_DIR/mongo/db/catalog/index_catalog', - '$BUILD_DIR/mongo/db/commands/server_status', + '$BUILD_DIR/mongo/db/commands/server_status_core', '$BUILD_DIR/mongo/db/db_raii', '$BUILD_DIR/mongo/db/index/index_access_method', '$BUILD_DIR/mongo/db/pipeline/document_sources_idl', diff --git a/src/mongo/db/stats/counters.cpp b/src/mongo/db/stats/counters.cpp index 44328202169..3cc52b663aa 100644 --- a/src/mongo/db/stats/counters.cpp +++ b/src/mongo/db/stats/counters.cpp @@ -27,25 +27,20 @@ * it in the license file. */ - -#include "mongo/platform/basic.h" - #include "mongo/db/stats/counters.h" #include <fmt/format.h> #include "mongo/client/authenticate.h" +#include "mongo/db/commands/server_status.h" #include "mongo/db/jsobj.h" #include "mongo/logv2/log.h" #define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kDefault - namespace mongo { -namespace { using namespace fmt::literals; -} void OpCounters::_checkWrap(CacheExclusive<AtomicWord<long long>> OpCounters::*counter, int n) { static constexpr auto maxCount = 1LL << 60; @@ -312,6 +307,15 @@ void AuthCounter::append(BSONObjBuilder* b) { mechsBuilder.done(); } +OpCounterServerStatusSection::OpCounterServerStatusSection(const std::string& sectionName, + OpCounters* counters) + : ServerStatusSection(sectionName), _counters(counters) {} + +BSONObj OpCounterServerStatusSection::generateSection(OperationContext* opCtx, + const BSONElement& configElement) const { + return _counters->getObj(); +} + OpCounters globalOpCounters; OpCounters replOpCounters; NetworkCounter networkCounter; diff --git a/src/mongo/db/stats/counters.h b/src/mongo/db/stats/counters.h index e4f12ce7d46..9fe9e7f2126 100644 --- a/src/mongo/db/stats/counters.h +++ b/src/mongo/db/stats/counters.h @@ -31,7 +31,6 @@ #include <map> -#include "mongo/db/commands/server_status_metric.h" #include "mongo/db/curop.h" #include "mongo/db/jsobj.h" #include "mongo/platform/atomic_word.h" |