boost/log
2
0
Fork 0
mirror of https://github.com/boostorg/log.git synced 2026-02-09 11:12:38 +00:00
Code Issues Projects Releases Wiki Activity

Merged recent changes from trunk. Fixes #8730.

Browse Source 
[SVN r85093]
This commit is contained in:
Andrey Semashev
2013-07-20 18:09:32 +00:00
parent 1720f79e9a
commit cdd85fc887
17 changed files with 447 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
src/threadsafe_queue.cpp
View File

@@ -25,44 +25,14 @@
#ifndef BOOST_LOG_NO_THREADS
#include <stdlib.h>
#include <new>
#include <boost/assert.hpp>
#include <boost/static_assert.hpp>
#include <boost/throw_exception.hpp>
#include <boost/type_traits/alignment_of.hpp>
#include <boost/log/detail/spin_mutex.hpp>
#include <boost/log/detail/locks.hpp>
#include <boost/log/detail/alignas.hpp>
#if defined(BOOST_HAS_UNISTD_H)
#include <unistd.h> // _POSIX_VERSION
#endif
#if defined(BOOST_HAS_STDINT_H)
#include <stdint.h> // uintptr_t
#else
// MSVC defines integer types here
#include <stddef.h> // uintptr_t
#endif
#if defined(__APPLE__) || defined(__APPLE_CC__) || defined(macintosh)
#include <AvailabilityMacros.h>
#if defined(MAC_OS_X_VERSION_MIN_REQUIRED) && (MAC_OS_X_VERSION_MIN_REQUIRED >= 1060)
// Mac OS X 10.6 and later have posix_memalign
#define BOOST_LOG_HAS_POSIX_MEMALIGN 1
#endif
#elif (defined(_POSIX_VERSION) && (_POSIX_VERSION >= 200112L)) || (defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 600))
// Solaris 10 does not have posix_memalign. Solaris 11 and later seem to have it.
#if !(defined(sun) || defined(__sun)) || defined(__SunOS_5_11) || defined(__SunOS_5_12)
#define BOOST_LOG_HAS_POSIX_MEMALIGN 1
#endif
#endif
#if defined(BOOST_WINDOWS)
#include <malloc.h> // _aligned_malloc, _aligned_free
#endif
#include <boost/log/detail/malloc_aligned.hpp>
#include <boost/log/detail/header.hpp>
namespace boost {
@@ -81,9 +51,9 @@ private:
/*!
* A structure that contains a pointer to the node and the associated mutex.
* The alignment below allows to eliminate false sharing, it should be not less than CPU cache line size (which is assumed to be 64 bytes in most cases).
* The alignment below allows to eliminate false sharing, it should not be less than CPU cache line size.
*/
struct BOOST_LOG_ALIGNAS(64) pointer
struct BOOST_LOG_ALIGNAS(BOOST_LOG_CPU_CACHE_LINE_SIZE) pointer
{
//! Pointer to the either end of the queue
node_base* node;
@@ -168,41 +138,15 @@ BOOST_LOG_API threadsafe_queue_impl* threadsafe_queue_impl::create(node_base* fi
BOOST_LOG_API void* threadsafe_queue_impl::operator new (std::size_t size)
{
void* p = NULL;
#if defined(BOOST_LOG_HAS_POSIX_MEMALIGN)
if (posix_memalign(&p, 64, size) || !p)
BOOST_THROW_EXCEPTION(std::bad_alloc());
return p;
#elif defined(BOOST_WINDOWS)
p = _aligned_malloc(size, 64);
void* p = malloc_aligned(size, BOOST_LOG_CPU_CACHE_LINE_SIZE);
if (!p)
BOOST_THROW_EXCEPTION(std::bad_alloc());
#else
p = malloc(size + 64);
if (!p)
BOOST_THROW_EXCEPTION(std::bad_alloc());
unsigned char* q = static_cast< unsigned char* >(p) + 64;
q = (unsigned char*)((uintptr_t)q & (~(uintptr_t)63));
const unsigned char diff = q - static_cast< unsigned char* >(p);
p = q;
*--q = diff;
#endif
return p;
}
BOOST_LOG_API void threadsafe_queue_impl::operator delete (void* p, std::size_t)
{
#if defined(BOOST_LOG_HAS_POSIX_MEMALIGN)
free(p);
#elif defined(BOOST_WINDOWS)
_aligned_free(p);
#else
unsigned char* q = static_cast< unsigned char* >(p);
const unsigned char diff = *--q;
free(static_cast< unsigned char* >(p) - diff);
#endif
free_aligned(p);
}
} // namespace aux