Skip to content

Commit

Permalink
cleaned code duplication in memory allocation
Browse files Browse the repository at this point in the history
  • Loading branch information
@tlk00
tlk00 committed Aug 22, 2018
1 parent c12baa9 commit 65674ab
Show file tree
Hide file tree
Showing 7 changed files with 177 additions and 75 deletions.
48 changes: 48 additions & 0 deletions lang-maps/jni/src/jnialloc.h
View file
Expand Up @@ -597,6 +597,54 @@ class mem_alloc
typedef mem_alloc<block_allocator, ptr_allocator, alloc_pool<block_allocator, ptr_allocator> > standard_allocator;


/// Aligned malloc (unlike classic malloc it throws bad_alloc exception)
///
/// @internal
inline
void* aligned_new_malloc(size_t size)
{
void* ptr;

#ifdef BM_ALLOC_ALIGN
#ifdef _MSC_VER
ptr = ::_aligned_malloc(size, BM_ALLOC_ALIGN);
#else
ptr = ::_mm_malloc(size, BM_ALLOC_ALIGN);
#endif
#else
ptr = ::malloc(size);
#endif
if (!ptr)
{
#ifndef BM_NO_STL
throw std::bad_alloc();
#else
BM_THROW(BM_ERR_BADALLOC);
#endif
}
return ptr;
}

/// Aligned free (safe to pass NULL ptr)
///
/// @internal
inline
void aligned_free(void* ptr)
{
if (!ptr)
return;
#ifdef BM_ALLOC_ALIGN
# ifdef _MSC_VER
::_aligned_free(ptr);
#else
::_mm_free(ptr);
# endif
#else
::free(ptr);
#endif
}


} // namespace libbm


Expand Down
3 changes: 2 additions & 1 deletion lang-maps/jni/src/libbmjni.cpp
View file
Expand Up @@ -2,10 +2,11 @@
#define BM_NO_CXX11
#define BMALLOC__H__INCLUDED__

#include "bm.h"
#include "libbm.h"
#include "try_throw_catch.h"
static jmp_buf ex_buf__;
#include "bm.h"


#include "jnialloc.h"

Expand Down
48 changes: 48 additions & 0 deletions lang-maps/libbm/src/bmcalloc.h
View file
Expand Up @@ -350,6 +350,54 @@ typedef libbm::alloc_pool<block_allocator, ptr_allocator> standard_alloc_pool;
typedef libbm::mem_alloc<block_allocator, ptr_allocator, standard_alloc_pool> standard_allocator;


/// Aligned malloc (unlike classic malloc it throws bad_alloc exception)
///
/// @internal
inline
void* aligned_new_malloc(size_t size)
{
void* ptr;

#ifdef BM_ALLOC_ALIGN
#ifdef _MSC_VER
ptr = ::_aligned_malloc(size, BM_ALLOC_ALIGN);
#else
ptr = ::_mm_malloc(size, BM_ALLOC_ALIGN);
#endif
#else
ptr = ::malloc(size);
#endif
if (!ptr)
{
#ifndef BM_NO_STL
throw std::bad_alloc();
#else
BM_THROW(BM_ERR_BADALLOC);
#endif
}
return ptr;
}

/// Aligned free (safe to pass NULL ptr)
///
/// @internal
inline
void aligned_free(void* ptr)
{
if (!ptr)
return;
#ifdef BM_ALLOC_ALIGN
# ifdef _MSC_VER
::_aligned_free(ptr);
#else
::_mm_free(ptr);
# endif
#else
::free(ptr);
#endif
}


} // namespace libbm


Expand Down
73 changes: 24 additions & 49 deletions src/bmaggregator.h
View file
Expand Up @@ -53,6 +53,7 @@ class aggregator
public:
typedef BV bvector_type;
typedef const bvector_type* bvector_type_const_ptr;
typedef bm::id64_t digest_type;

/// Maximum aggregation capacity in one pass
enum max_size
Expand Down Expand Up @@ -188,6 +189,7 @@ class aggregator

/*! @name Horizontal Logical operations used for tests (C-style interface) */
//@{

/**
Horizontal OR aggregation (potentially slower) method.
\param bv_target - target vector
Expand Down Expand Up @@ -233,7 +235,7 @@ class aggregator
bvector_type& bv_target,
const bvector_type_const_ptr* bv_src, unsigned src_size);

bm::id64_t combine_and_sub(unsigned i, unsigned j,
digest_type combine_and_sub(unsigned i, unsigned j,
const bvector_type_const_ptr* bv_src_and, unsigned src_and_size,
const bvector_type_const_ptr* bv_src_sub, unsigned src_sub_size);

Expand Down Expand Up @@ -261,13 +263,13 @@ class aggregator
bool process_gap_blocks_or(blocks_manager_type& bman_target,
unsigned i, unsigned j, unsigned block_count);

bm::id64_t process_bit_blocks_and(unsigned block_count, bm::id64_t digest);
digest_type process_bit_blocks_and(unsigned block_count, digest_type digest);

bm::id64_t process_gap_blocks_and(unsigned block_count, bm::id64_t digest);
digest_type process_gap_blocks_and(unsigned block_count, digest_type digest);

bm::id64_t process_bit_blocks_sub(unsigned block_count, bm::id64_t digest);
digest_type process_bit_blocks_sub(unsigned block_count, digest_type digest);

bm::id64_t process_gap_blocks_sub(unsigned block_count, bm::id64_t digest);
digest_type process_gap_blocks_sub(unsigned block_count, digest_type digest);

static
unsigned find_effective_sub_block_size(unsigned i,
Expand Down Expand Up @@ -306,29 +308,11 @@ class aggregator
//
// ------------------------------------------------------------------------

#if defined(BMSSE2OPT) || defined(BMSSE42OPT)
#define BM_ALLOC_ALIGN 16
#endif
#if defined(BMAVX2OPT)
#define BM_ALLOC_ALIGN 32
#endif

template<typename BV>
aggregator<BV>::aggregator()
{
#if defined(BM_ALLOC_ALIGN)
#ifdef _MSC_VER
ar_ = (arena*) ::_aligned_malloc(sizeof(arena), BM_ALLOC_ALIGN);
#else
ar_ = (arena*) ::_mm_malloc(sizeof(arena), BM_ALLOC_ALIGN);
#endif
#else
ar_ = (arena*) ::malloc(sizeof(arena));
#endif
if (!ar_)
{
BV::throw_bad_alloc();
}
ar_ = (arena*) bm::aligned_new_malloc(sizeof(arena));
}

// ------------------------------------------------------------------------
Expand All @@ -337,21 +321,9 @@ template<typename BV>
aggregator<BV>::~aggregator()
{
BM_ASSERT(ar_);
if (!ar_)
return;
#ifdef BM_ALLOC_ALIGN
# ifdef _MSC_VER
::_aligned_free(ar_);
#else
::_mm_free(ar_);
# endif
#else
::free(ar_);
#endif
bm::aligned_free(ar_);
}

#undef BM_ALLOC_ALIGN

// ------------------------------------------------------------------------

template<typename BV>
Expand Down Expand Up @@ -522,7 +494,7 @@ bool aggregator<BV>::combine_and_sub(bvector_type& bv_target,
unsigned j = 0;
do
{
bm::id64_t digest = combine_and_sub(i, j,
digest_type digest = combine_and_sub(i, j,
bv_src_and, src_and_size,
bv_src_sub, src_sub_size);
bool found = digest;
Expand Down Expand Up @@ -574,7 +546,7 @@ bool aggregator<BV>::find_first_and_sub(bm::id_t& idx,
unsigned j = 0;
do
{
bm::id64_t digest = combine_and_sub(i, j,
digest_type digest = combine_and_sub(i, j,
bv_src_and, src_and_size,
bv_src_sub, src_sub_size);
if (digest)
Expand Down Expand Up @@ -729,7 +701,8 @@ void aggregator<BV>::combine_and(unsigned i, unsigned j,
// ------------------------------------------------------------------------

template<typename BV>
bm::id64_t aggregator<BV>::combine_and_sub(unsigned i, unsigned j,
typename aggregator<BV>::digest_type
aggregator<BV>::combine_and_sub(unsigned i, unsigned j,
const bvector_type_const_ptr* bv_src_and, unsigned src_and_size,
const bvector_type_const_ptr* bv_src_sub, unsigned src_sub_size)
{
Expand All @@ -749,7 +722,7 @@ bm::id64_t aggregator<BV>::combine_and_sub(unsigned i, unsigned j,
if (!blk) // nothing to do - golden block(!)
return 0;

bm::id64_t digest = 0;
digest_type digest = 0;

if (arg_blk_and_count || arg_blk_and_gap_count)
{
Expand Down Expand Up @@ -895,8 +868,9 @@ bool aggregator<BV>::process_gap_blocks_or(blocks_manager_type& bman_target,
// ------------------------------------------------------------------------

template<typename BV>
bm::id64_t aggregator<BV>::process_gap_blocks_and(unsigned arg_blk_gap_count,
bm::id64_t digest)
typename aggregator<BV>::digest_type
aggregator<BV>::process_gap_blocks_and(unsigned arg_blk_gap_count,
digest_type digest)
{
BM_ASSERT(arg_blk_gap_count);
BM_ASSERT(digest);
Expand All @@ -920,8 +894,9 @@ bm::id64_t aggregator<BV>::process_gap_blocks_and(unsigned arg_blk_gap_count,
// ------------------------------------------------------------------------

template<typename BV>
bm::id64_t aggregator<BV>::process_gap_blocks_sub(unsigned arg_blk_gap_count,
bm::id64_t digest)
typename aggregator<BV>::digest_type
aggregator<BV>::process_gap_blocks_sub(unsigned arg_blk_gap_count,
digest_type digest)
{
BM_ASSERT(arg_blk_gap_count);
BM_ASSERT(digest);
Expand Down Expand Up @@ -1014,9 +989,9 @@ bool aggregator<BV>::process_bit_blocks_or(blocks_manager_type& bman_target,
// ------------------------------------------------------------------------

template<typename BV>
bm::id64_t
typename aggregator<BV>::digest_type
aggregator<BV>::process_bit_blocks_and(unsigned arg_blk_count,
bm::id64_t digest)
digest_type digest)
{
bm::word_t* blk = ar_->tb1;

Expand Down Expand Up @@ -1055,9 +1030,9 @@ aggregator<BV>::process_bit_blocks_and(unsigned arg_blk_count,
// ------------------------------------------------------------------------

template<typename BV>
bm::id64_t
typename aggregator<BV>::digest_type
aggregator<BV>::process_bit_blocks_sub(unsigned arg_blk_count,
bm::id64_t digest)
digest_type digest)
{
bm::word_t* blk = ar_->tb1;

Expand Down
50 changes: 50 additions & 0 deletions src/bmalloc.h
View file
Expand Up @@ -389,6 +389,56 @@ typedef bm::mem_alloc<block_allocator, ptr_allocator, standard_alloc_pool> stand

/** @} */


/// Aligned malloc (unlike classic malloc it throws bad_alloc exception)
///
/// @internal
inline
void* aligned_new_malloc(size_t size)
{
void* ptr;

#ifdef BM_ALLOC_ALIGN
#ifdef _MSC_VER
ptr = ::_aligned_malloc(size, BM_ALLOC_ALIGN);
#else
ptr = ::_mm_malloc(size, BM_ALLOC_ALIGN);
#endif
#else
ptr = ::malloc(size);
#endif
if (!ptr)
{
#ifndef BM_NO_STL
throw std::bad_alloc();
#else
BM_THROW(BM_ERR_BADALLOC);
#endif
}
return ptr;
}

/// Aligned free
///
/// @internal
inline
void aligned_free(void* ptr)
{
if (!ptr)
return;
#ifdef BM_ALLOC_ALIGN
# ifdef _MSC_VER
::_aligned_free(ptr);
#else
::_mm_free(ptr);
# endif
#else
::free(ptr);
#endif
}



#undef BM_ALLOC_ALIGN

} // namespace bm
Expand Down

0 comments on commit 65674ab

Please sign in to comment.