mirrors/spdlog
1
0
Fork 0
mirror of https://github.com/gabime/spdlog.git synced 2025-02-04 19:56:46 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

disable syslog by default (enable by #define SPDLOG_ENABLE_SYSLOG )

Browse Source
This commit is contained in:
gabime 2016-08-22 20:52:16 +03:00
parent c68a0de2b6
commit 20cb73e9da
5 changed files with 172 additions and 168 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
example/example.cpp
View File

@ -5,6 +5,7 @@
//
// spdlog usage example
//
//
#include "spdlog/spdlog.h"
#include <iostream>

10
include/spdlog/common.h
View File

@ -37,16 +37,6 @@
#define DEPRECATED
#endif
#include <spdlog/tweakme.h>
#ifndef SPDLOG_ENABLE_SYSLOG
#if defined (__linux__) || defined(__APPLE__) || defined(__FreeBSD__)
#define SPDLOG_ENABLE_SYSLOG
#elif defined(sun) || defined(__sun)
#define SPDLOG_ENABLE_SYSLOG
#endif
#endif
#include <spdlog/fmt/fmt.h>

19
include/spdlog/details/mpmc_bounded_q.h
View File

@ -60,7 +60,8 @@ public:
using item_type = T;
mpmc_bounded_queue(size_t buffer_size)
: buffer_(new cell_t [buffer_size]),
:max_size_(buffer_size),
buffer_(new cell_t [buffer_size]),
buffer_mask_(buffer_size - 1)
{
//queue size must be power of two
@ -132,6 +133,16 @@ public:
return true;
}
size_t approx_size()
{
size_t first_pos = dequeue_pos_.load(std::memory_order_relaxed);
size_t last_pos = enqueue_pos_.load(std::memory_order_relaxed);
if (last_pos <= first_pos)
return 0;
auto size = last_pos - first_pos;
return size < max_size_ ? size : max_size_;
}
private:
struct cell_t
{
@ -139,6 +150,8 @@ private:
T data_;
};
size_t const max_size_;
static size_t const cacheline_size = 64;
typedef char cacheline_pad_t [cacheline_size];
@ -151,8 +164,8 @@ private:
std::atomic<size_t> dequeue_pos_;
cacheline_pad_t pad3_;
mpmc_bounded_queue(mpmc_bounded_queue const&);
void operator = (mpmc_bounded_queue const&);
mpmc_bounded_queue(mpmc_bounded_queue const&) = delete;
void operator= (mpmc_bounded_queue const&) = delete;
};
} // ns details

5
include/spdlog/details/os.h
View File

@ -250,7 +250,6 @@ inline int utc_minutes_offset(const std::tm& tm = details::os::localtime())
offset -= tzinfo.StandardBias;
return offset;
#else
long int offset_seconds;
#if defined(sun) || defined(__sun)
// 'tm_gmtoff' field is BSD extension and it's missing on SunOS/Solaris
@ -280,9 +279,9 @@ inline int utc_minutes_offset(const std::tm& tm = details::os::localtime())
}
};
offset_seconds = helper::calculate_gmt_offset(tm);
long int offset_seconds = helper::calculate_gmt_offset(tm);
#else
offset_seconds = tm.tm_gmtoff;
long int offset_seconds = tm.tm_gmtoff;
#endif
return static_cast<int>(offset_seconds / 60);

17
include/spdlog/tweakme.h
View File

@ -11,13 +11,6 @@
//
///////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
// By default, syslog sink is only enabled on tested operating systems.
// Uncomment to enable it unconditionally.
//
// #define SPDLOG_ENABLE_SYSLOG
///////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
// Under Linux, the much faster CLOCK_REALTIME_COARSE clock can be used.
@ -56,7 +49,6 @@
// #define SPDLOG_NO_NAME
///////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
// Uncomment to enable the SPDLOG_DEBUG/SPDLOG_TRACE macros.
//
@ -100,3 +92,12 @@
//
// #define SPDLOG_FMT_EXTERNAL
///////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
// Uncomment to enable syslog (disabled by default)
//
// #define SPDLOG_ENABLE_SYSLOG
///////////////////////////////////////////////////////////////////////////////