projects
/
folly.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix SimpleBarrier
[folly.git]
/
folly
/
Padded.h
diff --git
a/folly/Padded.h
b/folly/Padded.h
index 504a0bc7b4f20f4199a406af7f8f1741012bd7cb..aa2ddd369de44133c34dc811021c02164dd0a94b 100644
(file)
--- a/
folly/Padded.h
+++ b/
folly/Padded.h
@@
-1,5
+1,5
@@
/*
/*
- * Copyright 201
4
Facebook, Inc.
+ * Copyright 201
6
Facebook, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-14,9
+14,9
@@
* limitations under the License.
*/
* limitations under the License.
*/
-#ifndef FOLLY_PADDED_H_
-#define FOLLY_PADDED_H_
+#pragma once
+#include <algorithm>
#include <cassert>
#include <cstdint>
#include <cstring>
#include <cassert>
#include <cstdint>
#include <cstring>
@@
-28,6
+28,7
@@
#include <boost/iterator/iterator_adaptor.hpp>
#include <folly/Portability.h>
#include <boost/iterator/iterator_adaptor.hpp>
#include <folly/Portability.h>
+#include <folly/ContainerTraits.h>
/**
* Code that aids in storing data aligned on block (possibly cache-line)
/**
* Code that aids in storing data aligned on block (possibly cache-line)
@@
-344,13
+345,14
@@
class Adaptor {
lastCount_(lastCount) {
}
explicit Adaptor(size_t n, const value_type& value = value_type())
lastCount_(lastCount) {
}
explicit Adaptor(size_t n, const value_type& value = value_type())
- : c_(Node::nodeCount(n), fullNode(value)),
- lastCount_(n % Node::kElementCount ?: Node::kElementCount) {
+ : c_(Node::nodeCount(n), fullNode(value)) {
+ const auto count = n % Node::kElementCount;
+ lastCount_ = count != 0 ? count : Node::kElementCount;
}
Adaptor(const Adaptor&) = default;
Adaptor& operator=(const Adaptor&) = default;
}
Adaptor(const Adaptor&) = default;
Adaptor& operator=(const Adaptor&) = default;
- Adaptor(Adaptor&& other)
+ Adaptor(Adaptor&& other)
noexcept
: c_(std::move(other.c_)),
lastCount_(other.lastCount_) {
other.lastCount_ = Node::kElementCount;
: c_(std::move(other.c_)),
lastCount_(other.lastCount_) {
other.lastCount_ = Node::kElementCount;
@@
-424,12
+426,13
@@
class Adaptor {
return c_.back().data()[lastCount_ - 1];
}
return c_.back().data()[lastCount_ - 1];
}
+ template <typename... Args>
+ void emplace_back(Args&&... args) {
+ new (allocate_back()) value_type(std::forward<Args>(args)...);
+ }
+
void push_back(value_type x) {
void push_back(value_type x) {
- if (lastCount_ == Node::kElementCount) {
- c_.push_back(Node());
- lastCount_ = 0;
- }
- c_.back().data()[lastCount_++] = std::move(x);
+ emplace_back(std::move(x));
}
void pop_back() {
}
void pop_back() {
@@
-490,6
+493,14
@@
class Adaptor {
}
private:
}
private:
+ value_type* allocate_back() {
+ if (lastCount_ == Node::kElementCount) {
+ container_emplace_back_or_push_back(c_);
+ lastCount_ = 0;
+ }
+ return &c_.back().data()[lastCount_++];
+ }
+
static Node fullNode(const value_type& value) {
Node n;
std::fill(n.data(), n.data() + kElementsPerNode, value);
static Node fullNode(const value_type& value) {
Node n;
std::fill(n.data(), n.data() + kElementsPerNode, value);
@@
-501,6
+512,3
@@
class Adaptor {
} // namespace padded
} // namespace folly
} // namespace padded
} // namespace folly
-
-#endif /* FOLLY_PADDED_H_ */
-