Skip to content

S
spdlog
Commit 6cc7e738 authored by gabime's avatar gabime
Browse files
Options

astyle

parent 40fc5bec
Show whitespace changes
Inline Side-by-side
Showing with 130 additions and 123 deletions
include/spdlog/details/async_log_helper.h
View file @ 6cc7e738
......@@ -57,7 +57,7 @@ class async_log_helper
~async_msg() = default;
async_msg(async_msg&& other) SPDLOG_NOEXCEPT:
async_msg(async_msg&& other) SPDLOG_NOEXCEPT:
logger_name(std::move(other.logger_name)),
level(std::move(other.level)),
time(std::move(other.time)),
......
include/spdlog/details/logger_impl.h
View file @ 6cc7e738
......@@ -38,7 +38,10 @@ inline spdlog::logger::logger(const std::string& logger_name, sinks_init_list si
// ctor with single sink
inline spdlog::logger::logger(const std::string& logger_name, spdlog::sink_ptr single_sink):
logger(logger_name, { single_sink })
logger(logger_name,
{
single_sink
})
{}
......
include/spdlog/details/os.h
View file @ 6cc7e738
......@@ -56,13 +56,13 @@
namespace spdlog
{
namespace details
{
namespace os
{
namespace details
{
namespace os
{
inline spdlog::log_clock::time_point now()
{
inline spdlog::log_clock::time_point now()
{
#if defined __linux__ && defined SPDLOG_CLOCK_COARSE
timespec ts;
......@@ -76,9 +76,9 @@ namespace spdlog
return log_clock::now();
#endif
}
inline std::tm localtime(const std::time_t &time_tt)
{
}
inline std::tm localtime(const std::time_t &time_tt)
{
#ifdef _WIN32
std::tm tm;
......@@ -88,17 +88,17 @@ namespace spdlog
localtime_r(&time_tt, &tm);
#endif
return tm;
}
}
inline std::tm localtime()
{
inline std::tm localtime()
{
std::time_t now_t = time(nullptr);
return localtime(now_t);
}
}
inline std::tm gmtime(const std::time_t &time_tt)
{
inline std::tm gmtime(const std::time_t &time_tt)
{
#ifdef _WIN32
std::tm tm;
......@@ -108,15 +108,15 @@ namespace spdlog
gmtime_r(&time_tt, &tm);
#endif
return tm;
}
}
inline std::tm gmtime()
{
inline std::tm gmtime()
{
std::time_t now_t = time(nullptr);
return gmtime(now_t);
}
inline bool operator==(const std::tm& tm1, const std::tm& tm2)
{
}
inline bool operator==(const std::tm& tm1, const std::tm& tm2)
{
return (tm1.tm_sec == tm2.tm_sec &&
tm1.tm_min == tm2.tm_min &&
tm1.tm_hour == tm2.tm_hour &&
......@@ -124,14 +124,14 @@ namespace spdlog
tm1.tm_mon == tm2.tm_mon &&
tm1.tm_year == tm2.tm_year &&
tm1.tm_isdst == tm2.tm_isdst);
}
}
inline bool operator!=(const std::tm& tm1, const std::tm& tm2)
{
inline bool operator!=(const std::tm& tm1, const std::tm& tm2)
{
return !(tm1 == tm2);
}
}
// eol definition
// eol definition
#if !defined (SPDLOG_EOL)
#ifdef _WIN32
#define SPDLOG_EOL "\r\n"
......@@ -140,11 +140,11 @@ namespace spdlog
#endif
#endif
SPDLOG_CONSTEXPR static const char* eol = SPDLOG_EOL;
SPDLOG_CONSTEXPR static int eol_size = sizeof(SPDLOG_EOL) - 1;
SPDLOG_CONSTEXPR static const char* eol = SPDLOG_EOL;
SPDLOG_CONSTEXPR static int eol_size = sizeof(SPDLOG_EOL) - 1;
inline void prevent_child_fd(FILE *f)
{
inline void prevent_child_fd(FILE *f)
{
#ifdef _WIN32
auto file_handle = (HANDLE)_get_osfhandle(_fileno(f));
if (!::SetHandleInformation(file_handle, HANDLE_FLAG_INHERIT, 0))
......@@ -154,12 +154,12 @@ namespace spdlog
if (fcntl(fd, F_SETFD, FD_CLOEXEC) == -1)
throw spdlog_ex("fcntl with FD_CLOEXEC failed", errno);
#endif
}
}
//fopen_s on non windows for writing
inline int fopen_s(FILE** fp, const filename_t& filename, const filename_t& mode)
{
//fopen_s on non windows for writing
inline int fopen_s(FILE** fp, const filename_t& filename, const filename_t& mode)
{
#ifdef _WIN32
#ifdef SPDLOG_WCHAR_FILENAMES
*fp = _wfsopen((filename.c_str()), mode.c_str(), _SH_DENYWR);
......@@ -175,31 +175,31 @@ namespace spdlog
prevent_child_fd(*fp);
#endif
return *fp == nullptr;
}
}
inline int remove(const filename_t &filename)
{
inline int remove(const filename_t &filename)
{
#if defined(_WIN32) && defined(SPDLOG_WCHAR_FILENAMES)
return _wremove(filename.c_str());
#else
return std::remove(filename.c_str());
#endif
}
}
inline int rename(const filename_t& filename1, const filename_t& filename2)
{
inline int rename(const filename_t& filename1, const filename_t& filename2)
{
#if defined(_WIN32) && defined(SPDLOG_WCHAR_FILENAMES)
return _wrename(filename1.c_str(), filename2.c_str());
#else
return std::rename(filename1.c_str(), filename2.c_str());
#endif
}
}
//Return if file exists
inline bool file_exists(const filename_t& filename)
{
//Return if file exists
inline bool file_exists(const filename_t& filename)
{
#ifdef _WIN32
#ifdef SPDLOG_WCHAR_FILENAMES
auto attribs = GetFileAttributesW(filename.c_str());
......@@ -211,14 +211,14 @@ namespace spdlog
struct stat buffer;
return (stat(filename.c_str(), &buffer) == 0);
#endif
}
}
//Return file size according to open FILE* object
inline size_t filesize(FILE *f)
{
//Return file size according to open FILE* object
inline size_t filesize(FILE *f)
{
if (f == nullptr)
throw spdlog_ex("Failed getting file size. fd is null");
#ifdef _WIN32
......@@ -248,14 +248,14 @@ namespace spdlog
#endif
#endif
throw spdlog_ex("Failed getting file size from fd", errno);
}
}
//Return utc offset in minutes or throw spdlog_ex on failure
inline int utc_minutes_offset(const std::tm& tm = details::os::localtime())
{
//Return utc offset in minutes or throw spdlog_ex on failure
inline int utc_minutes_offset(const std::tm& tm = details::os::localtime())
{
#ifdef _WIN32
#if _WIN32_WINNT < _WIN32_WINNT_WS08
......@@ -313,12 +313,12 @@ namespace spdlog
return static_cast<int>(offset_seconds / 60);
#endif
}
}
//Return current thread id as size_t
//It exists because the std::this_thread::get_id() is much slower(espcially under VS 2013)
inline size_t _thread_id()
{
//Return current thread id as size_t
//It exists because the std::this_thread::get_id() is much slower(espcially under VS 2013)
inline size_t _thread_id()
{
#ifdef _WIN32
return static_cast<size_t>(::GetCurrentThreadId());
#elif __linux__
......@@ -333,56 +333,58 @@ namespace spdlog
#else //Default to standard C++11 (OSX and other Unix)
return static_cast<size_t>(std::hash<std::thread::id>()(std::this_thread::get_id()));
#endif
}
}
//Return current thread id as size_t (from thread local storage)
inline size_t thread_id()
{
//Return current thread id as size_t (from thread local storage)
inline size_t thread_id()
{
#if defined(_MSC_VER) && (_MSC_VER < 1900) || defined(__clang__) && !__has_feature(cxx_thread_local)
return _thread_id();
#else
static thread_local const size_t tid = _thread_id();
return tid;
#endif
}
}
// wchar support for windows file names (SPDLOG_WCHAR_FILENAMES must be defined)
// wchar support for windows file names (SPDLOG_WCHAR_FILENAMES must be defined)
#if defined(_WIN32) && defined(SPDLOG_WCHAR_FILENAMES)
#define SPDLOG_FILENAME_T(s) L ## s
inline std::string filename_to_str(const filename_t& filename)
{
inline std::string filename_to_str(const filename_t& filename)
{
std::wstring_convert<std::codecvt_utf8<wchar_t>, wchar_t> c;
return c.to_bytes(filename);
}
}
#else
#define SPDLOG_FILENAME_T(s) s
inline std::string filename_to_str(const filename_t& filename)
{
inline std::string filename_to_str(const filename_t& filename)
{
return filename;
}
}
#endif
inline std::string errno_to_string(char[256], char* res)
{
inline std::string errno_to_string(char[256], char* res)
{
return std::string(res);
}
}
inline std::string errno_to_string(char buf[256], int res)
inline std::string errno_to_string(char buf[256], int res)
{
if (res == 0)
{
if (res == 0) {
return std::string(buf);
}
else {
else
{
return "Unknown error";
}
}
}
// Return errno string (thread safe)
inline std::string errno_str(int err_num)
{
// Return errno string (thread safe)
inline std::string errno_str(int err_num)
{
char buf[256];
SPDLOG_CONSTEXPR auto buf_size = sizeof(buf);
......@@ -404,10 +406,10 @@ namespace spdlog
auto err = strerror_r(err_num, buf, buf_size); // let compiler choose type
return errno_to_string(buf, err); // use overloading to select correct stringify function
#endif
}
}
inline int pid()
{
inline int pid()
{
#ifdef _WIN32
return ::_getpid();
......@@ -415,13 +417,13 @@ namespace spdlog
return static_cast<int>(::getpid());
#endif
}
}
// Detrmine if the terminal supports colors
// Source: https://github.com/agauniyal/rang/
inline bool is_color_terminal()
{
// Detrmine if the terminal supports colors
// Source: https://github.com/agauniyal/rang/
inline bool is_color_terminal()
{
#ifdef _WIN32
return true;
#else
......@@ -432,30 +434,32 @@ namespace spdlog
};
const char *env_p = std::getenv("TERM");
if (env_p == nullptr) {
if (env_p == nullptr)
{
return false;
}
static const bool result = std::any_of(
std::begin(Terms), std::end(Terms), [&](const char* term) {
std::begin(Terms), std::end(Terms), [&](const char* term)
{
return std::strstr(env_p, term) != nullptr;
});
return result;
#endif
}
}
// Detrmine if the terminal attached
// Source: https://github.com/agauniyal/rang/
inline bool in_terminal(FILE* file)
{
// Detrmine if the terminal attached
// Source: https://github.com/agauniyal/rang/
inline bool in_terminal(FILE* file)
{
#ifdef _WIN32
return _isatty(_fileno(file)) ? true : false;
#else
return isatty(fileno(file)) ? true : false;
#endif
}
} //os
} //details
}
} //os
} //details
} //spdlog
include/spdlog/sinks/ansicolor_sink.h
View file @ 6cc7e738
......@@ -14,18 +14,18 @@
namespace spdlog
{
namespace sinks
{
namespace sinks
{
/**
/**
* @brief The ansi_color_sink is a decorator around another sink and prefixes
* the output with an ANSI escape sequence color code depending on the severity
* of the message.
*/
template <class Mutex>
class ansicolor_sink SPDLOG_FINAL: public base_sink<Mutex>
{
public:
template <class Mutex>
class ansicolor_sink SPDLOG_FINAL: public base_sink<Mutex>
{
public:
ansicolor_sink(FILE* file): target_file_(file)
{
should_do_colors_ = details::os::in_terminal(file) && details::os::is_color_terminal();
......@@ -47,7 +47,7 @@ namespace spdlog
fflush(target_file_);
}
protected:
protected:
virtual void _sink_it(const details::log_msg& msg) override
{
// Wrap the originally formatted message in color codes.
......@@ -68,31 +68,31 @@ namespace spdlog
FILE* target_file_;
bool should_do_colors_;
std::map<level::level_enum, std::string> colors_;
};
};
template<class Mutex>
class ansicolor_stdout_sink: public ansicolor_sink<Mutex>
{
public:
template<class Mutex>
class ansicolor_stdout_sink: public ansicolor_sink<Mutex>
{
public:
ansicolor_stdout_sink(): ansicolor_sink<Mutex>(stdout)
{}
};
};
template<class Mutex>
class ansicolor_stderr_sink: public ansicolor_sink<Mutex>
{
public:
template<class Mutex>
class ansicolor_stderr_sink: public ansicolor_sink<Mutex>
{
public:
ansicolor_stderr_sink(): ansicolor_sink<Mutex>(stderr)
{}
};
};
typedef ansicolor_stdout_sink<std::mutex> ansicolor_stdout_sink_mt;
typedef ansicolor_stdout_sink<details::null_mutex> ansicolor_stdout_sink_st;
typedef ansicolor_stdout_sink<std::mutex> ansicolor_stdout_sink_mt;
typedef ansicolor_stdout_sink<details::null_mutex> ansicolor_stdout_sink_st;
typedef ansicolor_stderr_sink<std::mutex> ansicolor_stderr_sink_mt;
typedef ansicolor_stderr_sink<details::null_mutex> ansicolor_stderr_sink_st;
typedef ansicolor_stderr_sink<std::mutex> ansicolor_stderr_sink_mt;
typedef ansicolor_stderr_sink<details::null_mutex> ansicolor_stderr_sink_st;
} // namespace sinks
} // namespace sinks
} // namespace spdlog
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment