Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(66)

Unified Diff: webrtc/base/array_view.h

Issue 2667383006: ArrayView: Support compile-time constant sizes (Closed)
Patch Set: Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | webrtc/base/array_view_unittest.cc » ('j') | webrtc/base/array_view_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/base/array_view.h
diff --git a/webrtc/base/array_view.h b/webrtc/base/array_view.h
index aa73ef72f604074b251e64f580c9fb3e30ae4bfb..7a0bb28954d4880a542eff218acb9c8e0ad9a032 100644
--- a/webrtc/base/array_view.h
+++ b/webrtc/base/array_view.h
@@ -31,9 +31,9 @@ namespace rtc {
// std::vector, rtc::Buffer, ...), but it's error-prone because the caller has
// to correctly specify the array length:
//
-// Contains17(arr, arraysize(arr)); // C array
-// Contains17(&arr[0], arr.size()); // std::vector
-// Contains17(arr, size); // pointer + size
+// Contains17(arr, arraysize(arr)); // C array
+// Contains17(arr.data(), arr.size()); // std::vector
+// Contains17(arr, size); // pointer + size
// ...
//
// It's also kind of messy to have two separate arguments for what is
@@ -60,6 +60,10 @@ namespace rtc {
// Contains17(nullptr); // nullptr -> empty ArrayView
// ...
//
+// ArrayView<T> stores both a pointer and a size, but you may also use
+// ArrayView<T, N>, which has a size that's fixed at compile time (which means
+// it only has to store the pointer).
+//
// One important point is that ArrayView<T> and ArrayView<const T> are
// different types, which allow and don't allow mutation of the array elements,
// respectively. The implicit conversions work just like you'd hope, so that
@@ -68,81 +72,177 @@ namespace rtc {
// (ArrayView itself can be the source type in such conversions, so
// ArrayView<int> will convert to ArrayView<const int>.)
//
-// Note: ArrayView is tiny (just a pointer and a count) and trivially copyable,
-// so it's probably cheaper to pass it by value than by const reference.
+// Note: ArrayView is tiny (just a pointer and a count if variable-sized, just
+// a pointer if fix-sized) and trivially copyable, so it's probably cheaper to
+// pass it by value than by const reference.
+
+namespace impl {
+
+// Magic constant for indicating that the size of an ArrayView is variable
+// instead of fixed.
+enum : std::ptrdiff_t { kArrayViewVarSize = -4711 };
+
+// Base class for ArrayViews of fixed nonzero size.
+template <typename T, std::ptrdiff_t Size>
+class ArrayViewBase {
+ static_assert(Size > 0, "ArrayView size must be variable or non-negative");
+
+ public:
+ ArrayViewBase(T* data, size_t size) : data_(data) {}
+
+ static constexpr size_t size() { return Size; }
+ static constexpr bool empty() { return false; }
+ T* data() const { return data_; }
+
+ protected:
+ static constexpr bool fixed_size() { return true; }
+
+ private:
+ T* data_;
+};
+
+// Specialized base class for ArrayViews of fixed zero size.
template <typename T>
-class ArrayView final {
+class ArrayViewBase<T, 0> {
+ public:
+ explicit ArrayViewBase(T* data, size_t size) {}
+
+ static constexpr size_t size() { return 0; }
+ static constexpr bool empty() { return true; }
+ T* data() const { return nullptr; }
+
+ protected:
+ static constexpr bool fixed_size() { return true; }
+};
+
+// Specialized base class for ArrayViews of variable size.
+template <typename T>
+class ArrayViewBase<T, impl::kArrayViewVarSize> {
+ public:
+ ArrayViewBase(T* data, size_t size)
+ : data_(size == 0 ? nullptr : data), size_(size) {}
+
+ size_t size() const { return size_; }
+ bool empty() const { return size_ == 0; }
+ T* data() const { return data_; }
+
+ protected:
+ static constexpr bool fixed_size() { return false; }
+
+ private:
+ T* data_;
+ size_t size_;
+};
+
+} // namespace impl
+
+template <typename T, std::ptrdiff_t Size = impl::kArrayViewVarSize>
+class ArrayView final : public impl::ArrayViewBase<T, Size> {
public:
using value_type = T;
using const_iterator = const T*;
- // Construct an empty ArrayView.
- ArrayView() : ArrayView(static_cast<T*>(nullptr), 0) {}
- ArrayView(std::nullptr_t) : ArrayView() {}
-
- // Construct an ArrayView for a (pointer,size) pair.
+ // Construct an ArrayView from a pointer and a length.
template <typename U>
ArrayView(U* data, size_t size)
- : data_(size == 0 ? nullptr : data), size_(size) {
- CheckInvariant();
+ : impl::ArrayViewBase<T, Size>::ArrayViewBase(data, size) {
+ RTC_DCHECK_EQ(size == 0 ? nullptr : data, this->data());
+ RTC_DCHECK_EQ(size, this->size());
+ RTC_DCHECK_EQ(!this->data(),
+ this->size() == 0); // data is null iff size == 0.
+ }
+
+ // Construct an empty ArrayView. Note that fixed-size ArrayViews of size > 0
+ // cannot be empty.
+ ArrayView() : ArrayView(nullptr, 0) {}
+ ArrayView(std::nullptr_t) : ArrayView() {}
+ ArrayView(std::nullptr_t, size_t size)
+ : ArrayView(static_cast<T*>(nullptr), size) {
+ static_assert(Size == 0 || Size == impl::kArrayViewVarSize, "");
+ RTC_DCHECK_EQ(0, size);
}
- // Construct an ArrayView for an array.
+ // Construct an ArrayView from an array.
template <typename U, size_t N>
- ArrayView(U (&array)[N]) : ArrayView(&array[0], N) {}
-
- // Construct an ArrayView for any type U that has a size() method whose
- // return value converts implicitly to size_t, and a data() method whose
- // return value converts implicitly to T*. In particular, this means we allow
- // conversion from ArrayView<T> to ArrayView<const T>, but not the other way
- // around. Other allowed conversions include std::vector<T> to ArrayView<T>
- // or ArrayView<const T>, const std::vector<T> to ArrayView<const T>, and
- // rtc::Buffer to ArrayView<uint8_t> (with the same const behavior as
- // std::vector).
+ ArrayView(U (&array)[N]) : ArrayView(array, N) {
+ static_assert(Size == N || Size == impl::kArrayViewVarSize,
+ "Array size must match ArrayView size");
+ }
+
+ // (Only if size is fixed.) Construct an ArrayView from any type U that has a
+ // static constexpr size() method whose return value is equal to Size, and a
+ // data() method whose return value converts implicitly to T*. In particular,
+ // this means we allow conversion from ArrayView<T, N> to ArrayView<const T,
+ // N>, but not the other way around. We also don't allow conversion from
+ // ArrayView<T> to ArrayView<T, N>, or from ArrayView<T, M> to ArrayView<T,
+ // N> when M != N.
+ template <typename U,
+ typename std::enable_if<
+ Size != impl::kArrayViewVarSize &&
+ HasDataAndSize<U, T>::value>::type* = nullptr>
+ ArrayView(U& u) : ArrayView(u.data(), u.size()) {
+ static_assert(U::size() == Size, "Sizes must match exactly");
ossu 2017/03/01 23:16:00 Why can't the converted-to size be <= the converte
kwiberg-webrtc 2017/03/02 03:00:39 Well, it *could*, but IMO what you want for fixed-
ossu 2017/03/02 17:54:07 Yeah, maybe having it implicit is too magical. I'm
kwiberg-webrtc 2017/03/02 19:22:41 Yes, a subview() with only template arguments was
+ }
+
+ // (Only if size is variable.) Construct an ArrayView from any type U that
+ // has a size() method whose return value converts implicitly to size_t, and
+ // a data() method whose return value converts implicitly to T*. In
+ // particular, this means we allow conversion from ArrayView<T> to
+ // ArrayView<const T>, but not the other way around. Other allowed
+ // conversions include
+ // ArrayView<T, N> to ArrayView<T> or ArrayView<const T>,
+ // std::vector<T> to ArrayView<T> or ArrayView<const T>,
+ // const std::vector<T> to ArrayView<const T>,
+ // rtc::Buffer to ArrayView<uint8_t> or ArrayView<const uint8_t>, and
+ // const rtc::Buffer to ArrayView<const uint8_t>.
template <
typename U,
- typename std::enable_if<HasDataAndSize<U, T>::value>::type* = nullptr>
+ typename std::enable_if<Size == impl::kArrayViewVarSize &&
+ HasDataAndSize<U, T>::value>::type* = nullptr>
ArrayView(U& u) : ArrayView(u.data(), u.size()) {}
- // Indexing, size, and iteration. These allow mutation even if the ArrayView
- // is const, because the ArrayView doesn't own the array. (To prevent
- // mutation, use ArrayView<const T>.)
- size_t size() const { return size_; }
- bool empty() const { return size_ == 0; }
- T* data() const { return data_; }
+ // Indexing and iteration. These allow mutation even if the ArrayView is
+ // const, because the ArrayView doesn't own the array. (To prevent mutation,
+ // use a const element type.)
T& operator[](size_t idx) const {
- RTC_DCHECK_LT(idx, size_);
- RTC_DCHECK(data_); // Follows from size_ > idx and the class invariant.
- return data_[idx];
+ RTC_DCHECK_LT(idx, this->size());
+ RTC_DCHECK(this->data());
+ return this->data()[idx];
}
- T* begin() const { return data_; }
- T* end() const { return data_ + size_; }
- const T* cbegin() const { return data_; }
- const T* cend() const { return data_ + size_; }
-
- ArrayView subview(size_t offset, size_t size) const {
- if (offset >= size_)
- return ArrayView();
- return ArrayView(data_ + offset, std::min(size, size_ - offset));
- }
- ArrayView subview(size_t offset) const { return subview(offset, size_); }
+ T* begin() const { return this->data(); }
+ T* end() const { return this->data() + this->size(); }
+ const T* cbegin() const { return this->data(); }
+ const T* cend() const { return this->data() + this->size(); }
- // Comparing two ArrayViews compares their (pointer,size) pairs; it does
- // *not* dereference the pointers.
- friend bool operator==(const ArrayView& a, const ArrayView& b) {
- return a.data_ == b.data_ && a.size_ == b.size_;
+ ArrayView<T> subview(size_t offset, size_t size) const {
ossu 2017/03/01 23:16:00 I guess this is the way to convert to a smaller Ar
kwiberg-webrtc 2017/03/02 03:00:39 Yes, it can be argued both ways. But this was the
ossu 2017/03/02 17:54:07 Alright. SGTM!
+ return offset < this->size()
+ ? ArrayView<T>(this->data() + offset,
+ std::min(size, this->size() - offset))
+ : ArrayView<T>();
}
- friend bool operator!=(const ArrayView& a, const ArrayView& b) {
- return !(a == b);
+ ArrayView<T> subview(size_t offset) const {
+ return subview(offset, this->size());
}
-
- private:
- // Invariant: !data_ iff size_ == 0.
- void CheckInvariant() const { RTC_DCHECK_EQ(!data_, size_ == 0); }
- T* data_;
- size_t size_;
};
+// Comparing two ArrayViews compares their (pointer,size) pairs; it does *not*
+// dereference the pointers.
+template <typename T, std::ptrdiff_t Size1, std::ptrdiff_t Size2>
+bool operator==(const ArrayView<T, Size1>& a, const ArrayView<T, Size2>& b) {
+ return a.data() == b.data() && a.size() == b.size();
+}
+template <typename T, std::ptrdiff_t Size1, std::ptrdiff_t Size2>
+bool operator!=(const ArrayView<T, Size1>& a, const ArrayView<T, Size2>& b) {
+ return !(a == b);
+}
+
+// Variable-size ArrayViews are the size of two pointers; fixed-size ArrayViews
+// are the size of one pointer. (And as a special case, fixed-size ArrayViews
+// of size 0 require no storage.)
+static_assert(sizeof(ArrayView<int>) == 2 * sizeof(int*), "");
+static_assert(sizeof(ArrayView<int, 17>) == sizeof(int*), "");
+static_assert(std::is_empty<ArrayView<int, 0>>::value, "");
+
template <typename T>
inline ArrayView<T> MakeArrayView(T* data, size_t size) {
return ArrayView<T>(data, size);
« no previous file with comments | « no previous file | webrtc/base/array_view_unittest.cc » ('j') | webrtc/base/array_view_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698