mirrors
/
codon
mirror of https://github.com/exaloop/codon.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Better logging

pull/6/head
A. R. Shajii 2021-10-30 19:27:56 -04:00
parent 0bd2a94388
commit 675b412faf
2 changed files with 38 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
codon/util/common.cpp
View File

@ -9,18 +9,19 @@ namespace codon {
namespace {
void compilationMessage(const std::string &header, const std::string &msg,
const std::string &file, int line, int col) {
auto &out = getLogger().err;
assert(!(file.empty() && (line > 0 || col > 0)));
assert(!(col > 0 && line <= 0));
std::cerr << "\033[1m";
out << "\033[1m";
if (!file.empty())
std::cerr << file.substr(file.rfind('/') + 1);
out << file.substr(file.rfind('/') + 1);
if (line > 0)
std::cerr << ":" << line;
out << ":" << line;
if (col > 0)
std::cerr << ":" << col;
out << ":" << col;
if (!file.empty())
std::cerr << ": ";
std::cerr << header << "\033[1m " << msg << "\033[0m" << std::endl;
out << ": ";
out << header << "\033[1m " << msg << "\033[0m" << std::endl;
}
std::vector<Logger> loggers;
@ -64,10 +65,11 @@ bool codon::popLogger() {
return true;
}
void _seqassert(const char *expr_str, const char *file, int line,
const std::string &msg) {
std::cerr << "Assert failed:\t" << msg << "\n"
<< "Expression:\t" << expr_str << "\n"
<< "Source:\t\t" << file << ":" << line << "\n";
void codon::assertionFailure(const char *expr_str, const char *file, int line,
const std::string &msg) {
auto &out = getLogger().err;
out << "Assert failed:\t" << msg << "\n"
<< "Expression:\t" << expr_str << "\n"
<< "Source:\t\t" << file << ":" << line << "\n";
abort();
}

47
codon/util/common.h
View File

@ -1,14 +1,9 @@
#pragma once
#include <cassert>
#include <chrono>
#include <climits>
#include <cstdint>
#include <libgen.h>
#include <memory>
#include <filesystem>
#include <iostream>
#include <ostream>
#include <stdexcept>
#include <sys/stat.h>
#include "codon/config/config.h"
#include "codon/util/fmt/format.h"
@ -18,7 +13,8 @@
#pragma clang diagnostic ignored "-Wgnu-zero-variadic-macro-arguments"
#define DBG(c, ...) \
fmt::print("{}" c "\n", std::string(2 * codon::getLogger().level, ' '), ##__VA_ARGS__)
fmt::print(codon::getLogger().log, "{}" c "\n", \
std::string(2 * codon::getLogger().level, ' '), ##__VA_ARGS__)
#define LOG(c, ...) DBG(c, ##__VA_ARGS__)
#define LOG_TIME(c, ...) \
{ \
@ -51,16 +47,18 @@
#ifndef NDEBUG
#define seqassert(expr, msg, ...) \
((expr) ? (void)(0) \
: _seqassert(#expr, __FILE__, __LINE__, fmt::format(msg, ##__VA_ARGS__)))
: codon::assertionFailure(#expr, __FILE__, __LINE__, \
fmt::format(msg, ##__VA_ARGS__)))
#else
#define seqassert(expr, msg, ...) ;
#endif
#pragma clang diagnostic pop
void _seqassert(const char *expr_str, const char *file, int line,
const std::string &msg);
namespace codon {
void assertionFailure(const char *expr_str, const char *file, int line,
const std::string &msg);
struct Logger {
static constexpr int FLAG_TIME = (1 << 0);
static constexpr int FLAG_REALIZE = (1 << 1);
@ -70,8 +68,11 @@ struct Logger {
int flags;
int level;
std::ostream &out;
std::ostream &err;
std::ostream &log;
Logger() : flags(0), level(0) {}
Logger() : flags(0), level(0), out(std::cout), err(std::cerr), log(std::clog) {}
void parse(const std::string &logs);
};
@ -111,20 +112,22 @@ struct SrcInfo {
int line;
int col;
int len;
int id; /// used to differentiate different
int id; /// used to differentiate different instances
SrcInfo(std::string file, int line, int col, int len)
: file(std::move(file)), line(line), col(col), len(len) {
static int _id(0);
id = _id++;
: file(std::move(file)), line(line), col(col), len(len), id(0) {
static int nextId = 0;
id = nextId++;
};
SrcInfo() : SrcInfo("", 0, 0, 0){};
friend std::ostream &operator<<(std::ostream &out, const codon::SrcInfo &c) {
char buf[PATH_MAX + 1];
strncpy(buf, c.file.c_str(), PATH_MAX);
auto f = basename(buf);
out << f << ":" << c.line << ":" << c.col;
SrcInfo() : SrcInfo("", 0, 0, 0) {}
friend std::ostream &operator<<(std::ostream &out, const codon::SrcInfo &src) {
out << std::filesystem::path(src.file).filename() << ":" << src.line << ":"
<< src.col;
return out;
}
bool operator==(const SrcInfo &src) const { return id == src.id; }
};