mirror of https://github.com/gabime/spdlog.git
astyle
gabime
8 years ago
parent
6ab2f0e099
commit
93be7713e0
@ -1,168 +1,176 @@
|
|||||||
/*
|
/*
|
||||||
A modified version of Bounded MPMC queue by Dmitry Vyukov.
|
A modified version of Bounded MPMC queue by Dmitry Vyukov.
|
||||||
|
|
||||||
Original code from:
|
Original code from:
|
||||||
http://www.1024cores.net/home/lock-free-algorithms/queues/bounded-mpmc-queue
|
http://www.1024cores.net/home/lock-free-algorithms/queues/bounded-mpmc-queue
|
||||||
|
|
||||||
licensed by Dmitry Vyukov under the terms below:
|
licensed by Dmitry Vyukov under the terms below:
|
||||||
|
|
||||||
Simplified BSD license
|
Simplified BSD license
|
||||||
|
|
||||||
Copyright (c) 2010-2011 Dmitry Vyukov. All rights reserved.
|
Copyright (c) 2010-2011 Dmitry Vyukov. All rights reserved.
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
are permitted provided that the following conditions are met:
|
are permitted provided that the following conditions are met:
|
||||||
1. Redistributions of source code must retain the above copyright notice, this list of
|
1. Redistributions of source code must retain the above copyright notice, this list of
|
||||||
conditions and the following disclaimer.
|
conditions and the following disclaimer.
|
||||||
|
|
||||||
2. Redistributions in binary form must reproduce the above copyright notice, this list
|
2. Redistributions in binary form must reproduce the above copyright notice, this list
|
||||||
of conditions and the following disclaimer in the documentation and/or other materials
|
of conditions and the following disclaimer in the documentation and/or other materials
|
||||||
provided with the distribution.
|
provided with the distribution.
|
||||||
|
|
||||||
THIS SOFTWARE IS PROVIDED BY DMITRY VYUKOV "AS IS" AND ANY EXPRESS OR IMPLIED
|
THIS SOFTWARE IS PROVIDED BY DMITRY VYUKOV "AS IS" AND ANY EXPRESS OR IMPLIED
|
||||||
WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
||||||
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
|
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
|
||||||
SHALL DMITRY VYUKOV OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
SHALL DMITRY VYUKOV OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
||||||
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||||
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
|
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
|
||||||
OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
|
OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
|
||||||
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
|
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
|
||||||
OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
||||||
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
|
||||||
The views and conclusions contained in the software and documentation are those of the authors and
|
The views and conclusions contained in the software and documentation are those of the authors and
|
||||||
should not be interpreted as representing official policies, either expressed or implied, of Dmitry Vyukov.
|
should not be interpreted as representing official policies, either expressed or implied, of Dmitry Vyukov.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*
|
/*
|
||||||
The code in its current form adds the license below:
|
The code in its current form adds the license below:
|
||||||
|
|
||||||
Copyright(c) 2015 Gabi Melman.
|
Copyright(c) 2015 Gabi Melman.
|
||||||
Distributed under the MIT License (http://opensource.org/licenses/MIT)
|
Distributed under the MIT License (http://opensource.org/licenses/MIT)
|
||||||
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "spdlog/common.h"
|
#include "spdlog/common.h"
|
||||||
|
|
||||||
#include <atomic>
|
#include <atomic>
|
||||||
#include <utility>
|
#include <utility>
|
||||||
|
|
||||||
namespace spdlog
|
namespace spdlog
|
||||||
{
|
{
|
||||||
namespace details
|
namespace details
|
||||||
{
|
{
|
||||||
|
|
||||||
template<typename T>
|
template<typename T>
|
||||||
class mpmc_bounded_queue
|
class mpmc_bounded_queue
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
|
||||||
using item_type = T;
|
using item_type = T;
|
||||||
mpmc_bounded_queue(size_t buffer_size)
|
mpmc_bounded_queue(size_t buffer_size)
|
||||||
:max_size_(buffer_size),
|
:max_size_(buffer_size),
|
||||||
buffer_(new cell_t[buffer_size]),
|
buffer_(new cell_t[buffer_size]),
|
||||||
buffer_mask_(buffer_size - 1)
|
buffer_mask_(buffer_size - 1)
|
||||||
{
|
{
|
||||||
//queue size must be power of two
|
//queue size must be power of two
|
||||||
if (!((buffer_size >= 2) && ((buffer_size & (buffer_size - 1)) == 0)))
|
if (!((buffer_size >= 2) && ((buffer_size & (buffer_size - 1)) == 0)))
|
||||||
throw spdlog_ex("async logger queue size must be power of two");
|
throw spdlog_ex("async logger queue size must be power of two");
|
||||||
|
|
||||||
for (size_t i = 0; i != buffer_size; i += 1)
|
for (size_t i = 0; i != buffer_size; i += 1)
|
||||||
buffer_[i].sequence_.store(i, std::memory_order_relaxed);
|
buffer_[i].sequence_.store(i, std::memory_order_relaxed);
|
||||||
enqueue_pos_.store(0, std::memory_order_relaxed);
|
enqueue_pos_.store(0, std::memory_order_relaxed);
|
||||||
dequeue_pos_.store(0, std::memory_order_relaxed);
|
dequeue_pos_.store(0, std::memory_order_relaxed);
|
||||||
}
|
}
|
||||||
|
|
||||||
~mpmc_bounded_queue()
|
~mpmc_bounded_queue()
|
||||||
{
|
{
|
||||||
delete[] buffer_;
|
delete[] buffer_;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
bool enqueue(T&& data)
|
bool enqueue(T&& data)
|
||||||
{
|
{
|
||||||
cell_t* cell;
|
cell_t* cell;
|
||||||
size_t pos = enqueue_pos_.load(std::memory_order_relaxed);
|
size_t pos = enqueue_pos_.load(std::memory_order_relaxed);
|
||||||
for (;;) {
|
for (;;)
|
||||||
cell = &buffer_[pos & buffer_mask_];
|
{
|
||||||
size_t seq = cell->sequence_.load(std::memory_order_acquire);
|
cell = &buffer_[pos & buffer_mask_];
|
||||||
intptr_t dif = static_cast<intptr_t>(seq) - static_cast<intptr_t>(pos);
|
size_t seq = cell->sequence_.load(std::memory_order_acquire);
|
||||||
if (dif == 0) {
|
intptr_t dif = static_cast<intptr_t>(seq) - static_cast<intptr_t>(pos);
|
||||||
if (enqueue_pos_.compare_exchange_weak(pos, pos + 1, std::memory_order_relaxed))
|
if (dif == 0)
|
||||||
break;
|
{
|
||||||
}
|
if (enqueue_pos_.compare_exchange_weak(pos, pos + 1, std::memory_order_relaxed))
|
||||||
else if (dif < 0) {
|
break;
|
||||||
return false;
|
}
|
||||||
}
|
else if (dif < 0)
|
||||||
else {
|
{
|
||||||
pos = enqueue_pos_.load(std::memory_order_relaxed);
|
return false;
|
||||||
}
|
}
|
||||||
}
|
else
|
||||||
cell->data_ = std::move(data);
|
{
|
||||||
cell->sequence_.store(pos + 1, std::memory_order_release);
|
pos = enqueue_pos_.load(std::memory_order_relaxed);
|
||||||
return true;
|
}
|
||||||
}
|
}
|
||||||
|
cell->data_ = std::move(data);
|
||||||
bool dequeue(T& data)
|
cell->sequence_.store(pos + 1, std::memory_order_release);
|
||||||
{
|
return true;
|
||||||
cell_t* cell;
|
}
|
||||||
size_t pos = dequeue_pos_.load(std::memory_order_relaxed);
|
|
||||||
for (;;) {
|
bool dequeue(T& data)
|
||||||
cell = &buffer_[pos & buffer_mask_];
|
{
|
||||||
size_t seq =
|
cell_t* cell;
|
||||||
cell->sequence_.load(std::memory_order_acquire);
|
size_t pos = dequeue_pos_.load(std::memory_order_relaxed);
|
||||||
intptr_t dif = static_cast<intptr_t>(seq) - static_cast<intptr_t>(pos + 1);
|
for (;;)
|
||||||
if (dif == 0) {
|
{
|
||||||
if (dequeue_pos_.compare_exchange_weak(pos, pos + 1, std::memory_order_relaxed))
|
cell = &buffer_[pos & buffer_mask_];
|
||||||
break;
|
size_t seq =
|
||||||
}
|
cell->sequence_.load(std::memory_order_acquire);
|
||||||
else if (dif < 0)
|
intptr_t dif = static_cast<intptr_t>(seq) - static_cast<intptr_t>(pos + 1);
|
||||||
return false;
|
if (dif == 0)
|
||||||
else
|
{
|
||||||
pos = dequeue_pos_.load(std::memory_order_relaxed);
|
if (dequeue_pos_.compare_exchange_weak(pos, pos + 1, std::memory_order_relaxed))
|
||||||
}
|
break;
|
||||||
data = std::move(cell->data_);
|
}
|
||||||
cell->sequence_.store(pos + buffer_mask_ + 1, std::memory_order_release);
|
else if (dif < 0)
|
||||||
return true;
|
return false;
|
||||||
}
|
else
|
||||||
|
pos = dequeue_pos_.load(std::memory_order_relaxed);
|
||||||
bool is_empty()
|
}
|
||||||
{
|
data = std::move(cell->data_);
|
||||||
size_t front, front1, back;
|
cell->sequence_.store(pos + buffer_mask_ + 1, std::memory_order_release);
|
||||||
// try to take a consistent snapshot of front/tail.
|
return true;
|
||||||
do {
|
}
|
||||||
front = enqueue_pos_.load(std::memory_order_acquire);
|
|
||||||
back = dequeue_pos_.load(std::memory_order_acquire);
|
bool is_empty()
|
||||||
front1 = enqueue_pos_.load(std::memory_order_relaxed);
|
{
|
||||||
} while (front != front1);
|
size_t front, front1, back;
|
||||||
return back == front;
|
// try to take a consistent snapshot of front/tail.
|
||||||
}
|
do
|
||||||
|
{
|
||||||
private:
|
front = enqueue_pos_.load(std::memory_order_acquire);
|
||||||
struct cell_t
|
back = dequeue_pos_.load(std::memory_order_acquire);
|
||||||
{
|
front1 = enqueue_pos_.load(std::memory_order_relaxed);
|
||||||
std::atomic<size_t> sequence_;
|
}
|
||||||
T data_;
|
while (front != front1);
|
||||||
};
|
return back == front;
|
||||||
|
}
|
||||||
size_t const max_size_;
|
|
||||||
|
private:
|
||||||
static size_t const cacheline_size = 64;
|
struct cell_t
|
||||||
typedef char cacheline_pad_t[cacheline_size];
|
{
|
||||||
|
std::atomic<size_t> sequence_;
|
||||||
cacheline_pad_t pad0_;
|
T data_;
|
||||||
cell_t* const buffer_;
|
};
|
||||||
size_t const buffer_mask_;
|
|
||||||
cacheline_pad_t pad1_;
|
size_t const max_size_;
|
||||||
std::atomic<size_t> enqueue_pos_;
|
|
||||||
cacheline_pad_t pad2_;
|
static size_t const cacheline_size = 64;
|
||||||
std::atomic<size_t> dequeue_pos_;
|
typedef char cacheline_pad_t[cacheline_size];
|
||||||
cacheline_pad_t pad3_;
|
|
||||||
|
cacheline_pad_t pad0_;
|
||||||
mpmc_bounded_queue(mpmc_bounded_queue const&) = delete;
|
cell_t* const buffer_;
|
||||||
void operator= (mpmc_bounded_queue const&) = delete;
|
size_t const buffer_mask_;
|
||||||
};
|
cacheline_pad_t pad1_;
|
||||||
|
std::atomic<size_t> enqueue_pos_;
|
||||||
} // ns details
|
cacheline_pad_t pad2_;
|
||||||
} // ns spdlog
|
std::atomic<size_t> dequeue_pos_;
|
||||||
|
cacheline_pad_t pad3_;
|
||||||
|
|
||||||
|
mpmc_bounded_queue(mpmc_bounded_queue const&) = delete;
|
||||||
|
void operator= (mpmc_bounded_queue const&) = delete;
|
||||||
|
};
|
||||||
|
|
||||||
|
} // ns details
|
||||||
|
} // ns spdlog
|
||||||
|
|||||||
@ -1,469 +1,469 @@
|
|||||||
//
|
//
|
||||||
// Copyright(c) 2015 Gabi Melman.
|
// Copyright(c) 2015 Gabi Melman.
|
||||||
// Distributed under the MIT License (http://opensource.org/licenses/MIT)
|
// Distributed under the MIT License (http://opensource.org/licenses/MIT)
|
||||||
//
|
//
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "spdlog/common.h"
|
#include "spdlog/common.h"
|
||||||
|
|
||||||
#include <cstdio>
|
#include <cstdio>
|
||||||
#include <ctime>
|
#include <ctime>
|
||||||
#include <functional>
|
#include <functional>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <chrono>
|
#include <chrono>
|
||||||
#include <thread>
|
#include <thread>
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <cstring>
|
#include <cstring>
|
||||||
#include <cstdlib>
|
#include <cstdlib>
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
|
|
||||||
#ifndef NOMINMAX
|
#ifndef NOMINMAX
|
||||||
#define NOMINMAX //prevent windows redefining min/max
|
#define NOMINMAX //prevent windows redefining min/max
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef WIN32_LEAN_AND_MEAN
|
#ifndef WIN32_LEAN_AND_MEAN
|
||||||
#define WIN32_LEAN_AND_MEAN
|
#define WIN32_LEAN_AND_MEAN
|
||||||
#endif
|
#endif
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
#include <process.h> // _get_pid support
|
#include <process.h> // _get_pid support
|
||||||
#include <io.h> // _get_osfhandle and _isatty support
|
#include <io.h> // _get_osfhandle and _isatty support
|
||||||
|
|
||||||
#ifdef __MINGW32__
|
#ifdef __MINGW32__
|
||||||
#include <share.h>
|
#include <share.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#else // unix
|
#else // unix
|
||||||
|
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
|
|
||||||
#ifdef __linux__
|
#ifdef __linux__
|
||||||
#include <sys/syscall.h> //Use gettid() syscall under linux to get thread id
|
#include <sys/syscall.h> //Use gettid() syscall under linux to get thread id
|
||||||
|
|
||||||
#elif __FreeBSD__
|
#elif __FreeBSD__
|
||||||
#include <sys/thr.h> //Use thr_self() syscall under FreeBSD to get thread id
|
#include <sys/thr.h> //Use thr_self() syscall under FreeBSD to get thread id
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif //unix
|
#endif //unix
|
||||||
|
|
||||||
#ifndef __has_feature // Clang - feature checking macros.
|
#ifndef __has_feature // Clang - feature checking macros.
|
||||||
#define __has_feature(x) 0 // Compatibility with non-clang compilers.
|
#define __has_feature(x) 0 // Compatibility with non-clang compilers.
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
namespace spdlog
|
namespace spdlog
|
||||||
{
|
{
|
||||||
namespace details
|
namespace details
|
||||||
{
|
{
|
||||||
namespace os
|
namespace os
|
||||||
{
|
{
|
||||||
|
|
||||||
inline spdlog::log_clock::time_point now()
|
inline spdlog::log_clock::time_point now()
|
||||||
{
|
{
|
||||||
|
|
||||||
#if defined __linux__ && defined SPDLOG_CLOCK_COARSE
|
#if defined __linux__ && defined SPDLOG_CLOCK_COARSE
|
||||||
timespec ts;
|
timespec ts;
|
||||||
::clock_gettime(CLOCK_REALTIME_COARSE, &ts);
|
::clock_gettime(CLOCK_REALTIME_COARSE, &ts);
|
||||||
return std::chrono::time_point<log_clock, typename log_clock::duration>(
|
return std::chrono::time_point<log_clock, typename log_clock::duration>(
|
||||||
std::chrono::duration_cast<typename log_clock::duration>(
|
std::chrono::duration_cast<typename log_clock::duration>(
|
||||||
std::chrono::seconds(ts.tv_sec) + std::chrono::nanoseconds(ts.tv_nsec)));
|
std::chrono::seconds(ts.tv_sec) + std::chrono::nanoseconds(ts.tv_nsec)));
|
||||||
|
|
||||||
|
|
||||||
#else
|
#else
|
||||||
return log_clock::now();
|
return log_clock::now();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
}
|
}
|
||||||
inline std::tm localtime(const std::time_t &time_tt)
|
inline std::tm localtime(const std::time_t &time_tt)
|
||||||
{
|
{
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
std::tm tm;
|
std::tm tm;
|
||||||
localtime_s(&tm, &time_tt);
|
localtime_s(&tm, &time_tt);
|
||||||
#else
|
#else
|
||||||
std::tm tm;
|
std::tm tm;
|
||||||
localtime_r(&time_tt, &tm);
|
localtime_r(&time_tt, &tm);
|
||||||
#endif
|
#endif
|
||||||
return tm;
|
return tm;
|
||||||
}
|
}
|
||||||
|
|
||||||
inline std::tm localtime()
|
inline std::tm localtime()
|
||||||
{
|
{
|
||||||
std::time_t now_t = time(nullptr);
|
std::time_t now_t = time(nullptr);
|
||||||
return localtime(now_t);
|
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
|
#ifdef _WIN32
|
||||||
std::tm tm;
|
std::tm tm;
|
||||||
gmtime_s(&tm, &time_tt);
|
gmtime_s(&tm, &time_tt);
|
||||||
#else
|
#else
|
||||||
std::tm tm;
|
std::tm tm;
|
||||||
gmtime_r(&time_tt, &tm);
|
gmtime_r(&time_tt, &tm);
|
||||||
#endif
|
#endif
|
||||||
return tm;
|
return tm;
|
||||||
}
|
}
|
||||||
|
|
||||||
inline std::tm gmtime()
|
inline std::tm gmtime()
|
||||||
{
|
{
|
||||||
std::time_t now_t = time(nullptr);
|
std::time_t now_t = time(nullptr);
|
||||||
return gmtime(now_t);
|
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 &&
|
return (tm1.tm_sec == tm2.tm_sec &&
|
||||||
tm1.tm_min == tm2.tm_min &&
|
tm1.tm_min == tm2.tm_min &&
|
||||||
tm1.tm_hour == tm2.tm_hour &&
|
tm1.tm_hour == tm2.tm_hour &&
|
||||||
tm1.tm_mday == tm2.tm_mday &&
|
tm1.tm_mday == tm2.tm_mday &&
|
||||||
tm1.tm_mon == tm2.tm_mon &&
|
tm1.tm_mon == tm2.tm_mon &&
|
||||||
tm1.tm_year == tm2.tm_year &&
|
tm1.tm_year == tm2.tm_year &&
|
||||||
tm1.tm_isdst == tm2.tm_isdst);
|
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);
|
return !(tm1 == tm2);
|
||||||
}
|
}
|
||||||
|
|
||||||
// eol definition
|
// eol definition
|
||||||
#if !defined (SPDLOG_EOL)
|
#if !defined (SPDLOG_EOL)
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
#define SPDLOG_EOL "\r\n"
|
#define SPDLOG_EOL "\r\n"
|
||||||
#else
|
#else
|
||||||
#define SPDLOG_EOL "\n"
|
#define SPDLOG_EOL "\n"
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
SPDLOG_CONSTEXPR static const char* eol = SPDLOG_EOL;
|
SPDLOG_CONSTEXPR static const char* eol = SPDLOG_EOL;
|
||||||
SPDLOG_CONSTEXPR static int eol_size = sizeof(SPDLOG_EOL) - 1;
|
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
|
#ifdef _WIN32
|
||||||
auto file_handle = (HANDLE)_get_osfhandle(_fileno(f));
|
auto file_handle = (HANDLE)_get_osfhandle(_fileno(f));
|
||||||
if (!::SetHandleInformation(file_handle, HANDLE_FLAG_INHERIT, 0))
|
if (!::SetHandleInformation(file_handle, HANDLE_FLAG_INHERIT, 0))
|
||||||
throw spdlog_ex("SetHandleInformation failed", errno);
|
throw spdlog_ex("SetHandleInformation failed", errno);
|
||||||
#else
|
#else
|
||||||
auto fd = fileno(f);
|
auto fd = fileno(f);
|
||||||
if (fcntl(fd, F_SETFD, FD_CLOEXEC) == -1)
|
if (fcntl(fd, F_SETFD, FD_CLOEXEC) == -1)
|
||||||
throw spdlog_ex("fcntl with FD_CLOEXEC failed", errno);
|
throw spdlog_ex("fcntl with FD_CLOEXEC failed", errno);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
//fopen_s on non windows for writing
|
//fopen_s on non windows for writing
|
||||||
inline int fopen_s(FILE** fp, const filename_t& filename, const filename_t& mode)
|
inline int fopen_s(FILE** fp, const filename_t& filename, const filename_t& mode)
|
||||||
{
|
{
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
#ifdef SPDLOG_WCHAR_FILENAMES
|
#ifdef SPDLOG_WCHAR_FILENAMES
|
||||||
*fp = _wfsopen((filename.c_str()), mode.c_str(), _SH_DENYWR);
|
*fp = _wfsopen((filename.c_str()), mode.c_str(), _SH_DENYWR);
|
||||||
#else
|
#else
|
||||||
*fp = _fsopen((filename.c_str()), mode.c_str(), _SH_DENYWR);
|
*fp = _fsopen((filename.c_str()), mode.c_str(), _SH_DENYWR);
|
||||||
#endif
|
#endif
|
||||||
#else //unix
|
#else //unix
|
||||||
*fp = fopen((filename.c_str()), mode.c_str());
|
*fp = fopen((filename.c_str()), mode.c_str());
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef SPDLOG_PREVENT_CHILD_FD
|
#ifdef SPDLOG_PREVENT_CHILD_FD
|
||||||
if (*fp != nullptr)
|
if (*fp != nullptr)
|
||||||
prevent_child_fd(*fp);
|
prevent_child_fd(*fp);
|
||||||
#endif
|
#endif
|
||||||
return *fp == nullptr;
|
return *fp == nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
inline int remove(const filename_t &filename)
|
inline int remove(const filename_t &filename)
|
||||||
{
|
{
|
||||||
#if defined(_WIN32) && defined(SPDLOG_WCHAR_FILENAMES)
|
#if defined(_WIN32) && defined(SPDLOG_WCHAR_FILENAMES)
|
||||||
return _wremove(filename.c_str());
|
return _wremove(filename.c_str());
|
||||||
#else
|
#else
|
||||||
return std::remove(filename.c_str());
|
return std::remove(filename.c_str());
|
||||||
#endif
|
#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)
|
#if defined(_WIN32) && defined(SPDLOG_WCHAR_FILENAMES)
|
||||||
return _wrename(filename1.c_str(), filename2.c_str());
|
return _wrename(filename1.c_str(), filename2.c_str());
|
||||||
#else
|
#else
|
||||||
return std::rename(filename1.c_str(), filename2.c_str());
|
return std::rename(filename1.c_str(), filename2.c_str());
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
//Return if file exists
|
//Return if file exists
|
||||||
inline bool file_exists(const filename_t& filename)
|
inline bool file_exists(const filename_t& filename)
|
||||||
{
|
{
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
#ifdef SPDLOG_WCHAR_FILENAMES
|
#ifdef SPDLOG_WCHAR_FILENAMES
|
||||||
auto attribs = GetFileAttributesW(filename.c_str());
|
auto attribs = GetFileAttributesW(filename.c_str());
|
||||||
#else
|
#else
|
||||||
auto attribs = GetFileAttributesA(filename.c_str());
|
auto attribs = GetFileAttributesA(filename.c_str());
|
||||||
#endif
|
#endif
|
||||||
return (attribs != INVALID_FILE_ATTRIBUTES && !(attribs & FILE_ATTRIBUTE_DIRECTORY));
|
return (attribs != INVALID_FILE_ATTRIBUTES && !(attribs & FILE_ATTRIBUTE_DIRECTORY));
|
||||||
#else //common linux/unix all have the stat system call
|
#else //common linux/unix all have the stat system call
|
||||||
struct stat buffer;
|
struct stat buffer;
|
||||||
return (stat(filename.c_str(), &buffer) == 0);
|
return (stat(filename.c_str(), &buffer) == 0);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//Return file size according to open FILE* object
|
//Return file size according to open FILE* object
|
||||||
inline size_t filesize(FILE *f)
|
inline size_t filesize(FILE *f)
|
||||||
{
|
{
|
||||||
if (f == nullptr)
|
if (f == nullptr)
|
||||||
throw spdlog_ex("Failed getting file size. fd is null");
|
throw spdlog_ex("Failed getting file size. fd is null");
|
||||||
#if defined ( _WIN32) && !defined(__CYGWIN__)
|
#if defined ( _WIN32) && !defined(__CYGWIN__)
|
||||||
int fd = _fileno(f);
|
int fd = _fileno(f);
|
||||||
#if _WIN64 //64 bits
|
#if _WIN64 //64 bits
|
||||||
struct _stat64 st;
|
struct _stat64 st;
|
||||||
if (_fstat64(fd, &st) == 0)
|
if (_fstat64(fd, &st) == 0)
|
||||||
return st.st_size;
|
return st.st_size;
|
||||||
|
|
||||||
#else //windows 32 bits
|
#else //windows 32 bits
|
||||||
long ret = _filelength(fd);
|
long ret = _filelength(fd);
|
||||||
if (ret >= 0)
|
if (ret >= 0)
|
||||||
return static_cast<size_t>(ret);
|
return static_cast<size_t>(ret);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#else // unix
|
#else // unix
|
||||||
int fd = fileno(f);
|
int fd = fileno(f);
|
||||||
//64 bits(but not in osx or cygwin, where fstat64 is deprecated)
|
//64 bits(but not in osx or cygwin, where fstat64 is deprecated)
|
||||||
#if !defined(__FreeBSD__) && !defined(__APPLE__) && (defined(__x86_64__) || defined(__ppc64__)) && !defined(__CYGWIN__)
|
#if !defined(__FreeBSD__) && !defined(__APPLE__) && (defined(__x86_64__) || defined(__ppc64__)) && !defined(__CYGWIN__)
|
||||||
struct stat64 st;
|
struct stat64 st;
|
||||||
if (fstat64(fd, &st) == 0)
|
if (fstat64(fd, &st) == 0)
|
||||||
return static_cast<size_t>(st.st_size);
|
return static_cast<size_t>(st.st_size);
|
||||||
#else // unix 32 bits or cygwin
|
#else // unix 32 bits or cygwin
|
||||||
struct stat st;
|
struct stat st;
|
||||||
if (fstat(fd, &st) == 0)
|
if (fstat(fd, &st) == 0)
|
||||||
return static_cast<size_t>(st.st_size);
|
return static_cast<size_t>(st.st_size);
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
throw spdlog_ex("Failed getting file size from fd", errno);
|
throw spdlog_ex("Failed getting file size from fd", errno);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//Return utc offset in minutes or throw spdlog_ex on failure
|
//Return utc offset in minutes or throw spdlog_ex on failure
|
||||||
inline int utc_minutes_offset(const std::tm& tm = details::os::localtime())
|
inline int utc_minutes_offset(const std::tm& tm = details::os::localtime())
|
||||||
{
|
{
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
#if _WIN32_WINNT < _WIN32_WINNT_WS08
|
#if _WIN32_WINNT < _WIN32_WINNT_WS08
|
||||||
TIME_ZONE_INFORMATION tzinfo;
|
TIME_ZONE_INFORMATION tzinfo;
|
||||||
auto rv = GetTimeZoneInformation(&tzinfo);
|
auto rv = GetTimeZoneInformation(&tzinfo);
|
||||||
#else
|
#else
|
||||||
DYNAMIC_TIME_ZONE_INFORMATION tzinfo;
|
DYNAMIC_TIME_ZONE_INFORMATION tzinfo;
|
||||||
auto rv = GetDynamicTimeZoneInformation(&tzinfo);
|
auto rv = GetDynamicTimeZoneInformation(&tzinfo);
|
||||||
#endif
|
#endif
|
||||||
if (rv == TIME_ZONE_ID_INVALID)
|
if (rv == TIME_ZONE_ID_INVALID)
|
||||||
throw spdlog::spdlog_ex("Failed getting timezone info. ", errno);
|
throw spdlog::spdlog_ex("Failed getting timezone info. ", errno);
|
||||||
|
|
||||||
int offset = -tzinfo.Bias;
|
int offset = -tzinfo.Bias;
|
||||||
if (tm.tm_isdst)
|
if (tm.tm_isdst)
|
||||||
offset -= tzinfo.DaylightBias;
|
offset -= tzinfo.DaylightBias;
|
||||||
else
|
else
|
||||||
offset -= tzinfo.StandardBias;
|
offset -= tzinfo.StandardBias;
|
||||||
return offset;
|
return offset;
|
||||||
#else
|
#else
|
||||||
|
|
||||||
#if defined(sun) || defined(__sun)
|
#if defined(sun) || defined(__sun)
|
||||||
// 'tm_gmtoff' field is BSD extension and it's missing on SunOS/Solaris
|
// 'tm_gmtoff' field is BSD extension and it's missing on SunOS/Solaris
|
||||||
struct helper
|
struct helper
|
||||||
{
|
{
|
||||||
static long int calculate_gmt_offset(const std::tm & localtm = details::os::localtime(), const std::tm & gmtm = details::os::gmtime())
|
static long int calculate_gmt_offset(const std::tm & localtm = details::os::localtime(), const std::tm & gmtm = details::os::gmtime())
|
||||||
{
|
{
|
||||||
int local_year = localtm.tm_year + (1900 - 1);
|
int local_year = localtm.tm_year + (1900 - 1);
|
||||||
int gmt_year = gmtm.tm_year + (1900 - 1);
|
int gmt_year = gmtm.tm_year + (1900 - 1);
|
||||||
|
|
||||||
long int days = (
|
long int days = (
|
||||||
// difference in day of year
|
// difference in day of year
|
||||||
localtm.tm_yday - gmtm.tm_yday
|
localtm.tm_yday - gmtm.tm_yday
|
||||||
|
|
||||||
// + intervening leap days
|
// + intervening leap days
|
||||||
+ ((local_year >> 2) - (gmt_year >> 2))
|
+ ((local_year >> 2) - (gmt_year >> 2))
|
||||||
- (local_year / 100 - gmt_year / 100)
|
- (local_year / 100 - gmt_year / 100)
|
||||||
+ ((local_year / 100 >> 2) - (gmt_year / 100 >> 2))
|
+ ((local_year / 100 >> 2) - (gmt_year / 100 >> 2))
|
||||||
|
|
||||||
// + difference in years * 365 */
|
// + difference in years * 365 */
|
||||||
+ (long int)(local_year - gmt_year) * 365
|
+ (long int)(local_year - gmt_year) * 365
|
||||||
);
|
);
|
||||||
|
|
||||||
long int hours = (24 * days) + (localtm.tm_hour - gmtm.tm_hour);
|
long int hours = (24 * days) + (localtm.tm_hour - gmtm.tm_hour);
|
||||||
long int mins = (60 * hours) + (localtm.tm_min - gmtm.tm_min);
|
long int mins = (60 * hours) + (localtm.tm_min - gmtm.tm_min);
|
||||||
long int secs = (60 * mins) + (localtm.tm_sec - gmtm.tm_sec);
|
long int secs = (60 * mins) + (localtm.tm_sec - gmtm.tm_sec);
|
||||||
|
|
||||||
return secs;
|
return secs;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
long int offset_seconds = helper::calculate_gmt_offset(tm);
|
long int offset_seconds = helper::calculate_gmt_offset(tm);
|
||||||
#else
|
#else
|
||||||
long int offset_seconds = tm.tm_gmtoff;
|
long int offset_seconds = tm.tm_gmtoff;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
return static_cast<int>(offset_seconds / 60);
|
return static_cast<int>(offset_seconds / 60);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
//Return current thread id as size_t
|
//Return current thread id as size_t
|
||||||
//It exists because the std::this_thread::get_id() is much slower(espcially under VS 2013)
|
//It exists because the std::this_thread::get_id() is much slower(espcially under VS 2013)
|
||||||
inline size_t _thread_id()
|
inline size_t _thread_id()
|
||||||
{
|
{
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
return static_cast<size_t>(::GetCurrentThreadId());
|
return static_cast<size_t>(::GetCurrentThreadId());
|
||||||
#elif __linux__
|
#elif __linux__
|
||||||
# if defined(__ANDROID__) && defined(__ANDROID_API__) && (__ANDROID_API__ < 21)
|
# if defined(__ANDROID__) && defined(__ANDROID_API__) && (__ANDROID_API__ < 21)
|
||||||
# define SYS_gettid __NR_gettid
|
# define SYS_gettid __NR_gettid
|
||||||
# endif
|
# endif
|
||||||
return static_cast<size_t>(syscall(SYS_gettid));
|
return static_cast<size_t>(syscall(SYS_gettid));
|
||||||
#elif __FreeBSD__
|
#elif __FreeBSD__
|
||||||
long tid;
|
long tid;
|
||||||
thr_self(&tid);
|
thr_self(&tid);
|
||||||
return static_cast<size_t>(tid);
|
return static_cast<size_t>(tid);
|
||||||
#elif __APPLE__
|
#elif __APPLE__
|
||||||
uint64_t tid;
|
uint64_t tid;
|
||||||
pthread_threadid_np(nullptr, &tid);
|
pthread_threadid_np(nullptr, &tid);
|
||||||
return static_cast<size_t>(tid);
|
return static_cast<size_t>(tid);
|
||||||
#else //Default to standard C++11 (other Unix)
|
#else //Default to standard C++11 (other Unix)
|
||||||
return static_cast<size_t>(std::hash<std::thread::id>()(std::this_thread::get_id()));
|
return static_cast<size_t>(std::hash<std::thread::id>()(std::this_thread::get_id()));
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
//Return current thread id as size_t (from thread local storage)
|
//Return current thread id as size_t (from thread local storage)
|
||||||
inline size_t thread_id()
|
inline size_t thread_id()
|
||||||
{
|
{
|
||||||
#if defined(_MSC_VER) && (_MSC_VER < 1900) || defined(__clang__) && !__has_feature(cxx_thread_local)
|
#if defined(_MSC_VER) && (_MSC_VER < 1900) || defined(__clang__) && !__has_feature(cxx_thread_local)
|
||||||
return _thread_id();
|
return _thread_id();
|
||||||
#else
|
#else
|
||||||
static thread_local const size_t tid = _thread_id();
|
static thread_local const size_t tid = _thread_id();
|
||||||
return tid;
|
return tid;
|
||||||
#endif
|
#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)
|
#if defined(_WIN32) && defined(SPDLOG_WCHAR_FILENAMES)
|
||||||
#define SPDLOG_FILENAME_T(s) L ## s
|
#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;
|
std::wstring_convert<std::codecvt_utf8<wchar_t>, wchar_t> c;
|
||||||
return c.to_bytes(filename);
|
return c.to_bytes(filename);
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
#define SPDLOG_FILENAME_T(s) s
|
#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;
|
return filename;
|
||||||
}
|
}
|
||||||
#endif
|
#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);
|
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);
|
return std::string(buf);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
return "Unknown error";
|
return "Unknown error";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Return errno string (thread safe)
|
// Return errno string (thread safe)
|
||||||
inline std::string errno_str(int err_num)
|
inline std::string errno_str(int err_num)
|
||||||
{
|
{
|
||||||
char buf[256];
|
char buf[256];
|
||||||
SPDLOG_CONSTEXPR auto buf_size = sizeof(buf);
|
SPDLOG_CONSTEXPR auto buf_size = sizeof(buf);
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
if (strerror_s(buf, buf_size, err_num) == 0)
|
if (strerror_s(buf, buf_size, err_num) == 0)
|
||||||
return std::string(buf);
|
return std::string(buf);
|
||||||
else
|
else
|
||||||
return "Unknown error";
|
return "Unknown error";
|
||||||
|
|
||||||
#elif defined(__FreeBSD__) || defined(__APPLE__) || defined(ANDROID) || defined(__SUNPRO_CC) || \
|
#elif defined(__FreeBSD__) || defined(__APPLE__) || defined(ANDROID) || defined(__SUNPRO_CC) || \
|
||||||
((_POSIX_C_SOURCE >= 200112L) && ! defined(_GNU_SOURCE)) // posix version
|
((_POSIX_C_SOURCE >= 200112L) && ! defined(_GNU_SOURCE)) // posix version
|
||||||
|
|
||||||
if (strerror_r(err_num, buf, buf_size) == 0)
|
if (strerror_r(err_num, buf, buf_size) == 0)
|
||||||
return std::string(buf);
|
return std::string(buf);
|
||||||
else
|
else
|
||||||
return "Unknown error";
|
return "Unknown error";
|
||||||
|
|
||||||
#else // gnu version (might not use the given buf, so its retval pointer must be used)
|
#else // gnu version (might not use the given buf, so its retval pointer must be used)
|
||||||
auto err = strerror_r(err_num, buf, buf_size); // let compiler choose type
|
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
|
return errno_to_string(buf, err); // use overloading to select correct stringify function
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
inline int pid()
|
inline int pid()
|
||||||
{
|
{
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
return ::_getpid();
|
return ::_getpid();
|
||||||
#else
|
#else
|
||||||
return static_cast<int>(::getpid());
|
return static_cast<int>(::getpid());
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Detrmine if the terminal supports colors
|
// Detrmine if the terminal supports colors
|
||||||
// Source: https://github.com/agauniyal/rang/
|
// Source: https://github.com/agauniyal/rang/
|
||||||
inline bool is_color_terminal()
|
inline bool is_color_terminal()
|
||||||
{
|
{
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
return true;
|
return true;
|
||||||
#else
|
#else
|
||||||
static constexpr const char* Terms[] =
|
static constexpr const char* Terms[] =
|
||||||
{
|
{
|
||||||
"ansi", "color", "console", "cygwin", "gnome", "konsole", "kterm",
|
"ansi", "color", "console", "cygwin", "gnome", "konsole", "kterm",
|
||||||
"linux", "msys", "putty", "rxvt", "screen", "vt100", "xterm"
|
"linux", "msys", "putty", "rxvt", "screen", "vt100", "xterm"
|
||||||
};
|
};
|
||||||
|
|
||||||
const char *env_p = std::getenv("TERM");
|
const char *env_p = std::getenv("TERM");
|
||||||
if (env_p == nullptr)
|
if (env_p == nullptr)
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
static const bool result = std::any_of(
|
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 std::strstr(env_p, term) != nullptr;
|
||||||
});
|
});
|
||||||
return result;
|
return result;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Detrmine if the terminal attached
|
// Detrmine if the terminal attached
|
||||||
// Source: https://github.com/agauniyal/rang/
|
// Source: https://github.com/agauniyal/rang/
|
||||||
inline bool in_terminal(FILE* file)
|
inline bool in_terminal(FILE* file)
|
||||||
{
|
{
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
return _isatty(_fileno(file)) ? true : false;
|
return _isatty(_fileno(file)) ? true : false;
|
||||||
#else
|
#else
|
||||||
return isatty(fileno(file)) ? true : false;
|
return isatty(fileno(file)) ? true : false;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
} //os
|
} //os
|
||||||
} //details
|
} //details
|
||||||
} //spdlog
|
} //spdlog
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue