diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2024-04-10 15:38:01 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-04-10 15:38:01 +0200 |
commit | 6adf464776d8690e9ccdff66611c34632511e4fe (patch) | |
tree | 5f4c4c9e65c4b65adcd62239b40df9691e8d0149 | |
parent | a37dba62c9eb879a29f0128d4966cbf9310dbdbe (diff) | |
parent | dc3323bfdd85fae01edae4b0aa5e614d3e7d5c55 (diff) |
Merge pull request #30868 from vespa-engine/vekterli/unsigned-trace-level
Pass trace level as `uint32_t`, which is the underlying type
-rw-r--r-- | persistence/src/vespa/persistence/spi/context.cpp | 2 | ||||
-rw-r--r-- | persistence/src/vespa/persistence/spi/context.h | 18 |
2 files changed, 10 insertions, 10 deletions
diff --git a/persistence/src/vespa/persistence/spi/context.cpp b/persistence/src/vespa/persistence/spi/context.cpp index deed8d451bd..4cd016215d2 100644 --- a/persistence/src/vespa/persistence/spi/context.cpp +++ b/persistence/src/vespa/persistence/spi/context.cpp @@ -4,7 +4,7 @@ namespace storage::spi { -Context::Context(Priority pri, int maxTraceLevel) noexcept +Context::Context(Priority pri, uint32_t maxTraceLevel) noexcept : _priority(pri), _trace(maxTraceLevel), _readConsistency(ReadConsistency::STRONG) diff --git a/persistence/src/vespa/persistence/spi/context.h b/persistence/src/vespa/persistence/spi/context.h index 590acd1c549..2b35d5f3a8d 100644 --- a/persistence/src/vespa/persistence/spi/context.h +++ b/persistence/src/vespa/persistence/spi/context.h @@ -38,7 +38,7 @@ using Priority = uint16_t; // 0 - max pri, 255 - min pri // Define this type just because a ton of tests currently use it. struct Trace { - using TraceLevel = int; + using TraceLevel = uint32_t; }; class Context { @@ -48,10 +48,10 @@ class Context { public: Context(Context &&) noexcept = default; Context & operator = (Context &&) noexcept = default; - Context(Priority pri, int maxTraceLevel) noexcept; + Context(Priority pri, uint32_t maxTraceLevel) noexcept; ~Context(); - Priority getPriority() const noexcept { return _priority; } + [[nodiscard]] Priority getPriority() const noexcept { return _priority; } /** * A read operation might choose to relax its consistency requirements, @@ -65,16 +65,16 @@ public: void setReadConsistency(ReadConsistency consistency) noexcept { _readConsistency = consistency; } - ReadConsistency getReadConsistency() const noexcept { + [[nodiscard]] ReadConsistency getReadConsistency() const noexcept { return _readConsistency; } - vespalib::Trace && steal_trace() noexcept { return std::move(_trace); } - vespalib::Trace& getTrace() noexcept { return _trace; } - const vespalib::Trace& getTrace() const noexcept { return _trace; } + [[nodiscard]] vespalib::Trace && steal_trace() noexcept { return std::move(_trace); } + [[nodiscard]] vespalib::Trace& getTrace() noexcept { return _trace; } + [[nodiscard]] const vespalib::Trace& getTrace() const noexcept { return _trace; } - bool shouldTrace(int level) noexcept { return _trace.shouldTrace(level); } - void trace(int level, vespalib::stringref msg, bool addTime = true) { + [[nodiscard]] bool shouldTrace(uint32_t level) const noexcept { return _trace.shouldTrace(level); } + void trace(uint32_t level, vespalib::stringref msg, bool addTime = true) { _trace.trace(level, msg, addTime); } }; |