X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=folly%2Fsmall_vector.h;h=4ef59b67e96565ab86837917c2c3d863ffee7dbf;hb=44ce72fdb5b5dca54f799f62c2e8c7791c2e2fcc;hp=1696ff8a0322f517bd977b95321ee3990c3b1027;hpb=aafd8ff9151615a8de09682d41d1c29966e4c8fe;p=folly.git diff --git a/folly/small_vector.h b/folly/small_vector.h index 1696ff8a..4ef59b67 100644 --- a/folly/small_vector.h +++ b/folly/small_vector.h @@ -1,5 +1,5 @@ /* - * Copyright 2014 Facebook, Inc. + * Copyright 2017 Facebook, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,10 +20,8 @@ * * @author Jordan DeLong */ -#ifndef FOLLY_SMALL_VECTOR_H_ -#define FOLLY_SMALL_VECTOR_H_ -#include "Portability.h" +#pragma once #include #include @@ -44,30 +42,16 @@ #include #include #include -#include -#include "folly/Malloc.h" - -#if defined(__GNUC__) && FOLLY_X64 -# include "folly/SmallLocks.h" -# define FB_PACK_ATTR FOLLY_PACK_ATTR -# define FB_PACK_PUSH FOLLY_PACK_PUSH -# define FB_PACK_POP FOLLY_PACK_POP -#else -# define FB_PACK_ATTR -# define FB_PACK_PUSH -# define FB_PACK_POP -#endif - -#if FOLLY_HAVE_MALLOC_SIZE - extern "C" std::size_t malloc_size(const void*); -# if !FOLLY_HAVE_MALLOC_USABLE_SIZE -# define malloc_usable_size malloc_size -# endif -# ifndef malloc_usable_size -# define malloc_usable_size malloc_size -# endif -#endif +#include +#include +#include +#include +#include +#include +#include +#include +#include // Ignore shadowing warnings within this file, so includers can use -Wshadow. #pragma GCC diagnostic push @@ -87,21 +71,6 @@ namespace small_vector_policy { */ struct NoHeap; -/* - * Passing this policy will cause small_vector to provide lock() and - * unlock() functions using a 1-bit spin lock in the size value. - * - * Note that this is intended for a fairly specialized (although - * strangely common at facebook) use case, where you have billions of - * vectors in memory where none of them are "hot" and most of them are - * small. This allows you to get fine-grained locks without spending - * a lot of memory on mutexes (the alternative of a large hashtable of - * locks leads to extra cache misses in the lookup path). - * - * __x86_64__ only. - */ -struct OneBitMutex; - ////////////////////////////////////////////////////////////////////// } // small_vector_policy @@ -124,10 +93,9 @@ namespace detail { !FOLLY_IS_TRIVIALLY_COPYABLE(T) >::type moveToUninitialized(T* first, T* last, T* out) { - auto const count = last - first; std::size_t idx = 0; try { - for (; idx < count; ++first, ++idx) { + for (; first != last; ++first, ++idx) { new (&out[idx]) T(std::move(*first)); } } catch (...) { @@ -272,65 +240,6 @@ namespace detail { SizeType size_; }; -#if FOLLY_X64 - template - struct OneBitMutexImpl { - typedef SizeType InternalSizeType; - - OneBitMutexImpl() { psl_.init(); } - - void lock() const { psl_.lock(); } - void unlock() const { psl_.unlock(); } - bool try_lock() const { return psl_.try_lock(); } - - protected: - static bool const kShouldUseHeap = ShouldUseHeap; - - static constexpr std::size_t policyMaxSize() { - return SizeType(~(SizeType(1) << kLockBit | kExternMask)); - } - - std::size_t doSize() const { - return psl_.getData() & ~kExternMask; - } - - std::size_t isExtern() const { - return psl_.getData() & kExternMask; - } - - void setExtern(bool b) { - if (b) { - setSize(SizeType(doSize()) | kExternMask); - } else { - setSize(SizeType(doSize()) & ~kExternMask); - } - } - - void setSize(std::size_t sz) { - assert(sz < (std::size_t(1) << kLockBit)); - psl_.setData((kExternMask & psl_.getData()) | SizeType(sz)); - } - - void swapSizePolicy(OneBitMutexImpl& o) { - std::swap(psl_, o.psl_); - } - - private: - static SizeType const kLockBit = sizeof(SizeType) * 8 - 1; - static SizeType const kExternMask = - kShouldUseHeap ? SizeType(1) << (sizeof(SizeType) * 8 - 2) - : 0; - - PicoSpinLock psl_; - }; -#else - template - struct OneBitMutexImpl { - static_assert(std::is_same::value, - "OneBitMutex only works on x86-64"); - }; -#endif - /* * If you're just trying to use this class, ignore everything about * this next small_vector_base class thing. @@ -370,17 +279,6 @@ namespace detail { mpl::size::value == 1, "Multiple size types specified in small_vector<>"); - /* - * Figure out if we're supposed to supply a one-bit mutex. :) - */ - typedef typename mpl::count< - PolicyList,small_vector_policy::OneBitMutex - >::type HasMutex; - - static_assert(HasMutex::value == 0 || HasMutex::value == 1, - "Multiple copies of small_vector_policy::OneBitMutex " - "supplied; this is probably a mistake"); - /* * Determine whether we should allow spilling to the heap or not. */ @@ -395,11 +293,8 @@ namespace detail { /* * Make the real policy base classes. */ - typedef typename mpl::if_< - HasMutex, - OneBitMutexImpl, - IntegralSizePolicy - >::type ActualSizePolicy; + typedef IntegralSizePolicy + ActualSizePolicy; /* * Now inherit from them all. This is done in such a convoluted @@ -431,7 +326,7 @@ namespace detail { } ////////////////////////////////////////////////////////////////////// -FB_PACK_PUSH +FOLLY_PACK_PUSH template, - boost::mpl::int_ - >::type::value - }; + static constexpr std::size_t MaxInline{ + constexpr_max(sizeof(Value*) / sizeof(Value), RequestedMaxInline)}; -public: - typedef std::size_t size_type; + public: + typedef std::size_t size_type; typedef Value value_type; typedef value_type& reference; typedef value_type const& const_reference; @@ -471,22 +362,44 @@ public: typedef std::reverse_iterator reverse_iterator; typedef std::reverse_iterator const_reverse_iterator; - explicit small_vector() {} + explicit small_vector() = default; small_vector(small_vector const& o) { - assign(o.begin(), o.end()); + auto n = o.size(); + makeSize(n); + try { + std::uninitialized_copy(o.begin(), o.end(), begin()); + } catch (...) { + if (this->isExtern()) { + u.freeHeap(); + } + throw; + } + this->setSize(n); } - small_vector(small_vector&& o) { - *this = std::move(o); + small_vector(small_vector&& o) + noexcept(std::is_nothrow_move_constructible::value) { + if (o.isExtern()) { + swap(o); + } else { + std::uninitialized_copy(std::make_move_iterator(o.begin()), + std::make_move_iterator(o.end()), + begin()); + this->setSize(o.size()); + } } small_vector(std::initializer_list il) { constructImpl(il.begin(), il.end(), std::false_type()); } - explicit small_vector(size_type n, value_type const& t = value_type()) { - doConstruct(n, t); + explicit small_vector(size_type n) { + doConstruct(n, [&](void* p) { new (p) value_type(); }); + } + + small_vector(size_type n, value_type const& t) { + doConstruct(n, [&](void* p) { new (p) value_type(t); }); } template @@ -512,16 +425,11 @@ public: } small_vector& operator=(small_vector&& o) { + // TODO: optimization: + // if both are internal, use move assignment where possible + if (this == &o) return *this; clear(); - if (!o.isExtern()) { - makeSize(o.size()); - for (std::size_t i = 0; i < o.size(); ++i) { - new (data() + i) value_type(std::move(o[i])); - } - this->setSize(o.size()); - } else { - swap(o); - } + swap(o); return *this; } @@ -534,7 +442,7 @@ public: } static constexpr size_type max_size() { - return !BaseType::kShouldUseHeap ? MaxInline + return !BaseType::kShouldUseHeap ? static_cast(MaxInline) : BaseType::policyMaxSize(); } @@ -596,19 +504,23 @@ public: } size_type i = oldSmall.size(); + const size_type ci = i; try { for (; i < oldLarge.size(); ++i) { - new (&oldSmall[i]) value_type(std::move(oldLarge[i])); + auto addr = oldSmall.begin() + i; + new (addr) value_type(std::move(oldLarge[i])); oldLarge[i].~value_type(); } } catch (...) { + oldSmall.setSize(i); for (; i < oldLarge.size(); ++i) { oldLarge[i].~value_type(); } - oldLarge.setSize(oldSmall.size()); + oldLarge.setSize(ci); throw; } - this->swapSizePolicy(o); + oldSmall.setSize(i); + oldLarge.setSize(ci); return; } @@ -730,6 +642,17 @@ public: emplaceBack(std::forward(args)...); } + void emplace_back(const value_type& t) { + push_back(t); + } + void emplace_back(value_type& t) { + push_back(t); + } + + void emplace_back(value_type&& t) { + push_back(std::move(t)); + } + void push_back(value_type&& t) { if (capacity() == size()) { makeSize(std::max(size_type(2), 3 * size() / 2), &t, size()); @@ -740,9 +663,17 @@ public: } void push_back(value_type const& t) { - // Make a copy and forward to the rvalue value_type&& overload - // above. - push_back(value_type(t)); + // TODO: we'd like to make use of makeSize (it can be optimized better, + // because it manipulates the internals) + // unfortunately the current implementation only supports moving from + // a supplied rvalue, and doing an extra move just to reuse it is a perf + // net loss + if (size() == capacity()) {// && isInside(&t)) { + value_type tmp(t); + emplaceBack(std::move(tmp)); + } else { + emplaceBack(t); + } } void pop_back() { @@ -811,8 +742,9 @@ public: } iterator erase(const_iterator q1, const_iterator q2) { + if (q1 == q2) return unconst(q1); std::move(unconst(q2), end(), unconst(q1)); - for (auto it = q1; it != end(); ++it) { + for (auto it = (end() - std::distance(q1, q2)); it != end(); ++it) { it->~value_type(); } this->setSize(size() - (q2 - q1)); @@ -855,14 +787,14 @@ public: reference at(size_type i) { if (i >= size()) { - throw std::out_of_range("index out of range"); + std::__throw_out_of_range("index out of range"); } return (*this)[i]; } const_reference at(size_type i) const { if (i >= size()) { - throw std::out_of_range("index out of range"); + std::__throw_out_of_range("index out of range"); } return (*this)[i]; } @@ -880,13 +812,6 @@ private: this->setSize(size() + 1); } - /* - * Special case of emplaceBack for rvalue - */ - void emplaceBack(value_type&& t) { - push_back(std::move(t)); - } - static iterator unconst(const_iterator it) { return const_cast(it); } @@ -942,7 +867,7 @@ private: // With iterators that only allow a single pass, we can't really // do anything sane here. while (first != last) { - push_back(*first++); + emplace_back(*first++); } return; } @@ -950,24 +875,36 @@ private: auto distance = std::distance(first, last); makeSize(distance); this->setSize(distance); - - detail::populateMemForward(data(), distance, - [&] (void* p) { new (p) value_type(*first++); } - ); + try { + detail::populateMemForward(data(), distance, + [&] (void* p) { new (p) value_type(*first++); } + ); + } catch (...) { + if (this->isExtern()) { + u.freeHeap(); + } + throw; + } } - void doConstruct(size_type n, value_type const& val) { + template + void doConstruct(size_type n, InitFunc&& func) { makeSize(n); this->setSize(n); - detail::populateMemForward(data(), n, - [&] (void* p) { new (p) value_type(val); } - ); + try { + detail::populateMemForward(data(), n, std::forward(func)); + } catch (...) { + if (this->isExtern()) { + u.freeHeap(); + } + throw; + } } // The true_type means we should forward to the size_t,value_type // overload. void constructImpl(size_type n, value_type const& val, std::true_type) { - doConstruct(n, val); + doConstruct(n, [&](void* p) { new (p) value_type(val); }); } void makeSize(size_type size, value_type* v = nullptr) { @@ -1090,7 +1027,7 @@ private: InternalSizeType* getCapacity() { return &capacity_; } - } FB_PACK_ATTR; + } FOLLY_PACK_ATTR; struct HeapPtr { // Lower order bit of heap_ is used as flag to indicate whether capacity is @@ -1102,17 +1039,23 @@ private: return static_cast( detail::pointerFlagClear(heap_)); } - } FB_PACK_ATTR; + } FOLLY_PACK_ATTR; -#if FOLLY_X64 - typedef unsigned char InlineStorageType[sizeof(value_type) * MaxInline]; +#if (FOLLY_X64 || FOLLY_PPC64) + typedef unsigned char InlineStorageDataType[sizeof(value_type) * MaxInline]; #else typedef typename std::aligned_storage< sizeof(value_type) * MaxInline, alignof(value_type) - >::type InlineStorageType; + >::type InlineStorageDataType; #endif + typedef typename std::conditional< + sizeof(value_type) * MaxInline != 0, + InlineStorageDataType, + void* + >::type InlineStorageType; + static bool const kHasInlineCapacity = sizeof(HeapPtrWithCapacity) < sizeof(InlineStorageType); @@ -1171,9 +1114,9 @@ private: auto vp = detail::pointerFlagClear(pdata_.heap_); free(vp); } - } FB_PACK_ATTR u; -} FB_PACK_ATTR; -FB_PACK_POP + } FOLLY_PACK_ATTR u; +} FOLLY_PACK_ATTR; +FOLLY_PACK_POP ////////////////////////////////////////////////////////////////////// @@ -1187,14 +1130,16 @@ void swap(small_vector& a, ////////////////////////////////////////////////////////////////////// -} +namespace detail { -#pragma GCC diagnostic pop +// Format support. +template +struct IndexableTraits> + : public IndexableTraitsSeq> { +}; -#ifdef FB_PACK_ATTR -# undef FB_PACK_ATTR -# undef FB_PACK_PUSH -# undef FB_PACK_POP -#endif +} // namespace detail -#endif +} // namespace folly + +#pragma GCC diagnostic pop