Optimisation

Signed-off-by: JCW <a1q123456@users.noreply.github.com>
This commit is contained in:
JCW
2025-08-29 22:59:53 +01:00
parent 61ff2ba0e7
commit 48cf042258
12 changed files with 39 additions and 39 deletions

View File

@@ -68,11 +68,11 @@ private:
operator=(Sink const&) = delete; operator=(Sink const&) = delete;
void void
write(beast::severities::Severity level, std::string const& text) write(beast::severities::Severity level, std::string&& text)
override; override;
void void
writeAlways(beast::severities::Severity level, std::string const& text) writeAlways(beast::severities::Severity level, std::string&& text)
override; override;
}; };

View File

@@ -225,7 +225,7 @@ private:
severities::Severity severity) const; severities::Severity severity) const;
static std::string static std::string
formatLog(std::string const& message); formatLog(std::string&& message);
public: public:
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
@@ -279,7 +279,7 @@ public:
level is below the current threshold(). level is below the current threshold().
*/ */
virtual void virtual void
write(Severity level, std::string const& text) = 0; write(Severity level, std::string&& text) = 0;
/** Bypass filter and write text to the sink at the specified severity. /** Bypass filter and write text to the sink at the specified severity.
* Always write the message, but maintain the same formatting as if * Always write the message, but maintain the same formatting as if
@@ -289,7 +289,7 @@ public:
* @param text Text to write to sink. * @param text Text to write to sink.
*/ */
virtual void virtual void
writeAlways(Severity level, std::string const& text) = 0; writeAlways(Severity level, std::string&& text) = 0;
private: private:
Severity thresh_; Severity thresh_;

View File

@@ -88,14 +88,14 @@ public:
} }
void void
write(beast::severities::Severity level, std::string const& text) override write(beast::severities::Severity level, std::string&& text) override
{ {
using beast::Journal; using beast::Journal;
sink_.write(level, prefix_ + text); sink_.write(level, prefix_ + text);
} }
void void
writeAlways(severities::Severity level, std::string const& text) override writeAlways(severities::Severity level, std::string&& text) override
{ {
using beast::Journal; using beast::Journal;
sink_.writeAlways(level, prefix_ + text); sink_.writeAlways(level, prefix_ + text);

View File

@@ -47,20 +47,20 @@ Logs::Sink::Sink(
} }
void void
Logs::Sink::write(beast::severities::Severity level, std::string const& text) Logs::Sink::write(beast::severities::Severity level, std::string&& text)
{ {
if (level < threshold()) if (level < threshold())
return; return;
logs_.write(level, partition_, text, console()); logs_.write(level, partition_, std::move(text), console());
} }
void void
Logs::Sink::writeAlways( Logs::Sink::writeAlways(
beast::severities::Severity level, beast::severities::Severity level,
std::string const& text) std::string&& text)
{ {
logs_.write(level, partition_, text, console()); logs_.write(level, partition_, std::move(text), console());
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------

View File

@@ -77,12 +77,12 @@ public:
} }
void void
write(severities::Severity, std::string const&) override write(severities::Severity, std::string&&) override
{ {
} }
void void
writeAlways(severities::Severity, std::string const&) override writeAlways(severities::Severity, std::string&&) override
{ {
} }
}; };
@@ -264,7 +264,7 @@ Journal::initMessageContext(
} }
std::string std::string
Journal::formatLog(std::string const& message) Journal::formatLog(std::string&& message)
{ {
if (!m_jsonLogsEnabled) if (!m_jsonLogsEnabled)
{ {
@@ -363,13 +363,13 @@ Journal::ScopedStream::ScopedStream(
Journal::ScopedStream::~ScopedStream() Journal::ScopedStream::~ScopedStream()
{ {
std::string const& s(m_ostream.str()); std::string s(m_ostream.str());
if (!s.empty()) if (!s.empty())
{ {
if (s == "\n") if (s == "\n")
m_sink.write(m_level, formatLog("")); m_sink.write(m_level, formatLog(""));
else else
m_sink.write(m_level, formatLog(s)); m_sink.write(m_level, formatLog(std::move(s)));
} }
} }

View File

@@ -48,14 +48,14 @@ public:
} }
void void
write(severities::Severity level, std::string const&) override write(severities::Severity level, std::string&&) override
{ {
if (level >= threshold()) if (level >= threshold())
++m_count; ++m_count;
} }
void void
writeAlways(severities::Severity level, std::string const&) override writeAlways(severities::Severity level, std::string&&) override
{ {
++m_count; ++m_count;
} }

View File

@@ -49,7 +49,7 @@ public:
} }
void void
write(beast::severities::Severity level, std::string const& text) override write(beast::severities::Severity level, std::string&& text) override
{ {
if (level < threshold()) if (level < threshold())
return; return;
@@ -59,7 +59,7 @@ public:
} }
void void
writeAlways(beast::severities::Severity level, std::string const& text) writeAlways(beast::severities::Severity level, std::string&& text)
override override
{ {
std::cout << clock_.now().time_since_epoch().count() << " " << text std::cout << clock_.now().time_since_epoch().count() << " " << text

View File

@@ -57,7 +57,7 @@ class CaptureLogs : public Logs
} }
void void
write(beast::severities::Severity level, std::string const& text) write(beast::severities::Severity level, std::string&& text)
override override
{ {
std::lock_guard lock(strmMutex_); std::lock_guard lock(strmMutex_);
@@ -65,7 +65,7 @@ class CaptureLogs : public Logs
} }
void void
writeAlways(beast::severities::Severity level, std::string const& text) writeAlways(beast::severities::Severity level, std::string&& text)
override override
{ {
std::lock_guard lock(strmMutex_); std::lock_guard lock(strmMutex_);

View File

@@ -45,7 +45,7 @@ class CheckMessageLogs : public Logs
} }
void void
write(beast::severities::Severity level, std::string const& text) write(beast::severities::Severity level, std::string&& text)
override override
{ {
if (text.find(owner_.msg_) != std::string::npos) if (text.find(owner_.msg_) != std::string::npos)
@@ -53,10 +53,10 @@ class CheckMessageLogs : public Logs
} }
void void
writeAlways(beast::severities::Severity level, std::string const& text) writeAlways(beast::severities::Severity level, std::string&& text)
override override
{ {
write(level, text); write(level, std::move(text));
} }
}; };

View File

@@ -92,7 +92,7 @@ public:
} }
void void
write(beast::severities::Severity level, std::string const& text) write(beast::severities::Severity level, std::string&& text)
override override
{ {
if (level < threshold()) if (level < threshold())
@@ -102,7 +102,7 @@ public:
} }
void void
writeAlways(beast::severities::Severity level, std::string const& text) writeAlways(beast::severities::Severity level, std::string&& text)
override override
{ {
suite_.log << text << std::endl; suite_.log << text << std::endl;

View File

@@ -49,27 +49,27 @@ public:
} }
void void
write(beast::severities::Severity level, std::string const& text) override; write(beast::severities::Severity level, std::string&& text) override;
void void
writeAlways(beast::severities::Severity level, std::string const& text) writeAlways(beast::severities::Severity level, std::string&& text)
override; override;
}; };
inline void inline void
SuiteJournalSink::write( SuiteJournalSink::write(
beast::severities::Severity level, beast::severities::Severity level,
std::string const& text) std::string&& text)
{ {
// Only write the string if the level at least equals the threshold. // Only write the string if the level at least equals the threshold.
if (level >= threshold()) if (level >= threshold())
writeAlways(level, text); writeAlways(level, std::move(text));
} }
inline void inline void
SuiteJournalSink::writeAlways( SuiteJournalSink::writeAlways(
beast::severities::Severity level, beast::severities::Severity level,
std::string const& text) std::string&& text)
{ {
using namespace beast::severities; using namespace beast::severities;
@@ -137,15 +137,15 @@ public:
} }
void void
write(beast::severities::Severity level, std::string const& text) override write(beast::severities::Severity level, std::string&& text) override
{ {
if (level < threshold()) if (level < threshold())
return; return;
writeAlways(level, text); writeAlways(level, std::move(text));
} }
inline void inline void
writeAlways(beast::severities::Severity level, std::string const& text) writeAlways(beast::severities::Severity level, std::string&& text)
override override
{ {
strm_ << text << std::endl; strm_ << text << std::endl;

View File

@@ -49,14 +49,14 @@ private:
operator=(Sink const&) = delete; operator=(Sink const&) = delete;
void void
write(beast::severities::Severity level, std::string const& text) write(beast::severities::Severity level, std::string&& text)
override override
{ {
logs_.logStream_ << text; logs_.logStream_ << text;
} }
void void
writeAlways(beast::severities::Severity level, std::string const& text) writeAlways(beast::severities::Severity level, std::string&& text)
override override
{ {
logs_.logStream_ << text; logs_.logStream_ << text;
@@ -217,13 +217,13 @@ public:
} }
void void
write(beast::severities::Severity level, std::string const& text) override write(beast::severities::Severity level, std::string&& text) override
{ {
strm_ << text; strm_ << text;
} }
void void
writeAlways(beast::severities::Severity level, std::string const& text) writeAlways(beast::severities::Severity level, std::string&& text)
override override
{ {
strm_ << text; strm_ << text;