0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clean up use of chrono types in log code

Browse source
This commit is contained in:
Charles Dang 2024-09-10 18:23:13 -04:00
parent d32a363ae8
commit 2d765118ed
2 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/log.cpp
View file

@ -425,11 +425,12 @@ std::string get_timespan(const std::time_t& t) {
static void print_precise_timestamp(std::ostream& out) noexcept
{
try {
int64_t micros = std::chrono::duration_cast<std::chrono::microseconds>(std::chrono::high_resolution_clock::now().time_since_epoch()).count();
std::time_t seconds = micros/1'000'000;
int fractional = micros-(seconds*1'000'000);
auto now = std::chrono::system_clock::now();
auto seconds = std::chrono::time_point_cast<std::chrono::seconds>(now);
auto fractional = std::chrono::duration_cast<std::chrono::microseconds>(now - seconds);
std::time_t tm = std::chrono::system_clock::to_time_t(seconds);
char c = out.fill('0');
out << std::put_time(std::localtime(&seconds), "%Y%m%d %H:%M:%S") << "." << std::setw(6) << fractional << ' ';
out << std::put_time(std::localtime(&tm), "%Y%m%d %H:%M:%S") << "." << std::setw(6) << fractional.count() << ' ';
out.fill(c);
} catch(...) {}
}
@ -531,24 +532,20 @@ void log_in_progress::set_auto_newline(bool auto_newline) {
void scope_logger::do_log_entry(const std::string& str) noexcept
{
str_ = str;
try {
ticks_ = std::chrono::duration_cast<std::chrono::microseconds>(std::chrono::high_resolution_clock::now().time_since_epoch()).count();
} catch(...) {}
start_ = std::chrono::steady_clock::now();
debug()(domain_, false, true) | formatter() << "{ BEGIN: " << str_;
++indent;
}
void scope_logger::do_log_exit() noexcept
{
long ticks = 0;
try {
ticks = std::chrono::duration_cast<std::chrono::microseconds>(std::chrono::high_resolution_clock::now().time_since_epoch()).count() - ticks_;
} catch(...) {}
--indent;
auto output = debug()(domain_, false, true);
output.set_indent(indent);
if(timestamp) output.enable_timestamp();
output | formatter() << "} END: " << str_ << " (took " << ticks << "us)";
auto now = std::chrono::steady_clock::now();
auto elapsed = std::chrono::duration_cast<std::chrono::microseconds>(now - start_);
output | formatter() << "} END: " << str_ << " (took " << elapsed.count() << "us)"; // FIXME c++20 stream: operator
}
std::stringstream& log_to_chat()

7
src/log.hpp
View file

@ -55,6 +55,7 @@
#include "utils/optional_fwd.hpp"
#include <string>
#include <utility>
#include <chrono>
#include <ctime>
#include <cstdint>
@ -239,19 +240,19 @@ log_domain& general();
class scope_logger
{
int64_t ticks_;
std::chrono::steady_clock::time_point start_;
const log_domain& domain_;
std::string str_;
public:
scope_logger(const log_domain& domain, const char* str)
: ticks_(0)
: start_()
, domain_(domain)
, str_()
{
if (!debug().dont_log(domain)) do_log_entry(str);
}
scope_logger(const log_domain& domain, const std::string& str)
: ticks_(0)
: start_()
, domain_(domain)
, str_()
{