forked from TextureGroup/Texture
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Reimplement ASRectTable using unordered_map to avoid obscure NSMapTab…
…le exception. (TextureGroup#719) * Reimplement ASRectTable using unordered_map to avoid obscure NSMapTable exception. The new class is called ASRectMap, which patterns alongside ASIntegerMap in both name and implementation. After some pretty detailed investigation, including study of open-source reimplementations of Foundation, the best lead I've found on the NSMapTable exception is that some NSPointerFunction types are not fully supported. Strangely, the ones being used do seem to work fine almost all of the time. The main concern is the Struct memory type, which is not officially re-declared in NSMapTable, and as such the documentation claims that there may exist some combinations of NSPointerFunction that are not supported. Because the exception is occurring frequently enough to be a concern (in the hundreds to low thousands, though only 50 a day) - I decided to replace NSMapTable entirely in order to ensure full correctness. "*** -[NSMapTable initWithKeyPointerFunctions:valuePointerFunctions:capacity:] Requested configuration not supported." * Fix Xcode project
- Loading branch information
1 parent
b480eb8
commit cc0cc79
Showing
8 changed files
with
155 additions
and
177 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| // | ||
| // ASRectMap.h | ||
| // Texture | ||
| // | ||
| // Copyright (c) 2017-present, Pinterest, Inc. All rights reserved. | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
|
|
||
| #import <Foundation/Foundation.h> | ||
| #import <CoreGraphics/CGGeometry.h> | ||
|
|
||
| NS_ASSUME_NONNULL_BEGIN | ||
|
|
||
| /** | ||
| * A category for indexing weak pointers to CGRects. Similar to ASIntegerMap. | ||
| */ | ||
| @interface ASRectMap : NSObject | ||
|
|
||
| /** | ||
| * Creates a new rect map. The keys are never retained. | ||
| */ | ||
| + (ASRectMap *)rectMapForWeakObjectPointers; | ||
|
|
||
| /** | ||
| * Retrieves the rect for a given key, or CGRectNull if the key is not found. | ||
| * | ||
| * @param key An object to lookup the rect for. | ||
| */ | ||
| - (CGRect)rectForKey:(id)key; | ||
|
|
||
| /** | ||
| * Sets the given rect for the associated key. Key *will not be retained!* | ||
| * | ||
| * @param rect The rect to store as value. | ||
| * @param key The key to use for the rect. | ||
| */ | ||
| - (void)setRect:(CGRect)rect forKey:(id)key; | ||
|
|
||
| /** | ||
| * Removes the rect for the given key, if one exists. | ||
| * | ||
| * @param key The key to remove. | ||
| */ | ||
| - (void)removeRectForKey:(id)key; | ||
|
|
||
| @end | ||
|
|
||
| NS_ASSUME_NONNULL_END |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,78 @@ | ||
| // | ||
| // ASRectMap.mm | ||
| // Texture | ||
| // | ||
| // Copyright (c) 2017-present, Pinterest, Inc. All rights reserved. | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
|
|
||
| #import "ASRectMap.h" | ||
| #import "ASObjectDescriptionHelpers.h" | ||
| #import <UIKit/UIGeometry.h> | ||
| #import <unordered_map> | ||
|
|
||
| @implementation ASRectMap { | ||
| std::unordered_map<void *, CGRect> _map; | ||
| } | ||
|
|
||
| + (ASRectMap *)rectMapForWeakObjectPointers | ||
| { | ||
| return [[self alloc] init]; | ||
| } | ||
|
|
||
| - (CGRect)rectForKey:(id)key | ||
| { | ||
| auto result = _map.find((__bridge void *)key); | ||
| if (result != _map.end()) { | ||
| // result->first is the key; result->second is the value, a CGRect. | ||
| return result->second; | ||
| } else { | ||
| return CGRectNull; | ||
| } | ||
| } | ||
|
|
||
| - (void)setRect:(CGRect)rect forKey:(id)key | ||
| { | ||
| if (key) { | ||
| _map[(__bridge void *)key] = rect; | ||
| } | ||
| } | ||
|
|
||
| - (void)removeRectForKey:(id)key | ||
| { | ||
| if (key) { | ||
| _map.erase((__bridge void *)key); | ||
| } | ||
| } | ||
|
|
||
| - (id)copyWithZone:(NSZone *)zone | ||
| { | ||
| ASRectMap *copy = [ASRectMap rectMapForWeakObjectPointers]; | ||
| copy->_map = _map; | ||
| return copy; | ||
| } | ||
|
|
||
| - (NSMutableArray<NSDictionary *> *)propertiesForDescription | ||
| { | ||
| NSMutableArray *result = [NSMutableArray array]; | ||
|
|
||
| // { ptr1->rect1 ptr2->rect2 ptr3->rect3 } | ||
| NSMutableString *str = [NSMutableString string]; | ||
| for (auto it = _map.begin(); it != _map.end(); it++) { | ||
| [str appendFormat:@" %@->%@", it->first, NSStringFromCGRect(it->second)]; | ||
| } | ||
| [result addObject:@{ @"ASRectMap": str }]; | ||
|
|
||
| return result; | ||
| } | ||
|
|
||
| - (NSString *)description | ||
| { | ||
| return ASObjectDescriptionMakeWithoutObject([self propertiesForDescription]); | ||
| } | ||
|
|
||
| @end |
Oops, something went wrong.