Revert "Add pooling support on iOS."
This reverts commit 38a93e622b8cb6888d97551ac165406694342c7b.
Reason for revert: need revert first pool change
Original change's description:
> Add pooling support on iOS.
>
> This replaces the `thread_local` attribute with `pthread_setspecific`
> and `pthread_getspecific`. I don't have easy access to iOS 8/9 for
> testing purposes, but on Mac OS X, this implementation works and
> benchmarks the same as the `thread_local` implementation.
>
> Change-Id: I86db88c24d59d946adb66141b32733ebf5261c76
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/328837
> Reviewed-by: Brian Osman <brianosman@google.com>
> Commit-Queue: Brian Osman <brianosman@google.com>
> Auto-Submit: John Stiles <johnstiles@google.com>
TBR=brianosman@google.com,adlai@google.com,johnstiles@google.com
Change-Id: Ic06f9e32e524b2be601ee21a5da605fd19aaa64b
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/329164
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
diff --git a/src/sksl/SkSLPool.cpp b/src/sksl/SkSLPool.cpp
index d872e72..7e47e02 100644
--- a/src/sksl/SkSLPool.cpp
+++ b/src/sksl/SkSLPool.cpp
@@ -13,6 +13,22 @@
namespace SkSL {
+#if defined(SK_BUILD_FOR_IOS) && \
+ (!defined(__IPHONE_9_0) || __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_9_0)
+
+// iOS did not support for C++11 `thread_local` variables until iOS 9.
+// Pooling is not supported here; we allocate all nodes directly.
+struct PoolData {};
+
+Pool::~Pool() {}
+void Pool* Pool::CreatePoolOnThread(int nodesInPool) { return new Pool; }
+void Pool::detachFromThread() {}
+void Pool::attachToThread() {}
+void* Pool::AllocIRNode() { return ::operator new(sizeof(IRNode)); }
+void Pool::FreeIRNode(void* node) { ::operator delete(node); }
+
+#else // !defined(SK_BUILD_FOR_IOS)...
+
namespace { struct IRNodeData {
union {
uint8_t fBuffer[sizeof(IRNode)];
@@ -33,52 +49,15 @@
// Accessors.
ptrdiff_t nodeCount() { return fNodesEnd - fNodes; }
- int nodeIndex(IRNodeData* node) {
+ ptrdiff_t nodeIndex(IRNodeData* node) {
SkASSERT(node >= fNodes);
SkASSERT(node < fNodesEnd);
- return SkToInt(node - fNodes);
+ return node - fNodes;
}
};
-#if defined(SK_BUILD_FOR_IOS) && \
- (!defined(__IPHONE_9_0) || __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_9_0)
-
-#include <pthread.h>
-
-static pthread_key_t get_pthread_key() {
- static pthread_key_t sKey = []{
- pthread_key_t key;
- int result = pthread_key_create(&key, /*destructor=*/nullptr);
- if (result != 0) {
- SK_ABORT("pthread_key_create failure: %d", result);
- }
- return key;
- }();
- return sKey;
-}
-
-static PoolData* get_thread_local_pool_data() {
- return static_cast<PoolData*>(pthread_getspecific(get_pthread_key()));
-}
-
-static void set_thread_local_pool_data(PoolData* poolData) {
- pthread_setspecific(get_pthread_key(), poolData);
-}
-
-#else
-
static thread_local PoolData* sPoolData = nullptr;
-static PoolData* get_thread_local_pool_data() {
- return sPoolData;
-}
-
-static void set_thread_local_pool_data(PoolData* poolData) {
- sPoolData = poolData;
-}
-
-#endif
-
static PoolData* create_pool_data(int nodesInPool) {
// Create a PoolData structure with extra space at the end for additional IRNode data.
int numExtraIRNodes = nodesInPool - 1;
@@ -98,9 +77,9 @@
Pool::~Pool() {
- if (get_thread_local_pool_data() == fData) {
+ if (sPoolData == fData) {
SkDEBUGFAIL("SkSL pool is being destroyed while it is still attached to the thread");
- set_thread_local_pool_data(nullptr);
+ sPoolData = nullptr;
}
// In debug mode, report any leaked nodes.
@@ -138,28 +117,27 @@
}
void Pool::detachFromThread() {
- VLOG("DETACH Pool:0x%016llX\n", (uint64_t)get_thread_local_pool_data());
- SkASSERT(get_thread_local_pool_data() != nullptr);
- set_thread_local_pool_data(nullptr);
+ VLOG("DETACH Pool:0x%016llX\n", (uint64_t)sPoolData);
+ SkASSERT(sPoolData != nullptr);
+ sPoolData = nullptr;
}
void Pool::attachToThread() {
VLOG("ATTACH Pool:0x%016llX\n", (uint64_t)fData);
- SkASSERT(get_thread_local_pool_data() == nullptr);
- set_thread_local_pool_data(fData);
+ SkASSERT(sPoolData == nullptr);
+ sPoolData = fData;
}
void* Pool::AllocIRNode() {
// Is a pool attached?
- PoolData* poolData = get_thread_local_pool_data();
- if (poolData) {
+ if (sPoolData) {
// Does the pool contain a free node?
- IRNodeData* node = poolData->fFreeListHead;
+ IRNodeData* node = sPoolData->fFreeListHead;
if (node) {
// Yes. Take a node from the freelist.
- poolData->fFreeListHead = node->fFreeListNext;
+ sPoolData->fFreeListHead = node->fFreeListNext;
VLOG("ALLOC Pool:0x%016llX Index:%04d 0x%016llX\n",
- (uint64_t)poolData, poolData->nodeIndex(node), (uint64_t)node);
+ (uint64_t)sPoolData, (int)(node - &sPoolData->fNodes[0]), (uint64_t)node);
return node->fBuffer;
}
}
@@ -167,30 +145,31 @@
// The pool is detached or full; allocate nodes using malloc.
void* ptr = ::operator new(sizeof(IRNode));
VLOG("ALLOC Pool:0x%016llX Index:____ malloc 0x%016llX\n",
- (uint64_t)poolData, (uint64_t)ptr);
+ (uint64_t)sPoolData, (uint64_t)ptr);
return ptr;
}
void Pool::FreeIRNode(void* node_v) {
// Is a pool attached?
- PoolData* poolData = get_thread_local_pool_data();
- if (poolData) {
+ if (sPoolData) {
// Did this node come from our pool?
auto* node = static_cast<IRNodeData*>(node_v);
- if (node >= &poolData->fNodes[0] && node < poolData->fNodesEnd) {
+ if (node >= &sPoolData->fNodes[0] && node < sPoolData->fNodesEnd) {
// Yes. Push it back onto the freelist.
VLOG("FREE Pool:0x%016llX Index:%04d 0x%016llX\n",
- (uint64_t)poolData, poolData->nodeIndex(node), (uint64_t)node);
- node->fFreeListNext = poolData->fFreeListHead;
- poolData->fFreeListHead = node;
+ (uint64_t)sPoolData, (int)(node - &sPoolData->fNodes[0]), (uint64_t)node);
+ node->fFreeListNext = sPoolData->fFreeListHead;
+ sPoolData->fFreeListHead = node;
return;
}
}
// No pool is attached or the node was malloced; it must be freed.
VLOG("FREE Pool:0x%016llX Index:____ free 0x%016llX\n",
- (uint64_t)poolData, (uint64_t)node_v);
+ (uint64_t)sPoolData, (uint64_t)node_v);
::operator delete(node_v);
}
+#endif // !defined(SK_BUILD_FOR_IOS)...
+
} // namespace SkSL
