averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Runtime: make generic non-assembly entry points use atomics

Browse Source 
Our conditional use of atomics goal will have to wait until 2.0.

Swift SVN r15305
This commit is contained in:
Dave Zarzycki
2014-03-20 23:32:07 +00:00
parent b07c029af0
commit c07ebee7b1
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
stdlib/runtime/HeapObject.cpp
View File

@@ -227,7 +227,7 @@ HeapObject *swift::swift_retain(HeapObject *object) {
}
void swift::swift_release(HeapObject *object) {
if (object && ((object->refCount -= RC_INTERVAL) == 0)) {
if (object && (__sync_sub_and_fetch(&object->refCount, RC_INTERVAL) == 0)) {
_swift_release_slow(object);
}
}
@@ -235,9 +235,8 @@ void swift::swift_release(HeapObject *object) {
void swift::swift_weakRetain(HeapObject *object) {
if (!object) return;
// FIXME: not thread-safe
// FIXME: should check carry bit
if ((object->weakRefCount += WRC_INTERVAL) < WRC_INTERVAL) {
if (__sync_add_and_fetch(&object->weakRefCount, WRC_INTERVAL) < WRC_INTERVAL){
assert(0 && "weak retain count overflow");
}
}
@@ -245,8 +244,7 @@ void swift::swift_weakRetain(HeapObject *object) {
void swift::swift_weakRelease(HeapObject *object) {
if (!object) return;
// FIXME: not thread-safe
uint32_t newCount = (object->weakRefCount -= WRC_INTERVAL);
uint32_t newCount = __sync_sub_and_fetch(&object->weakRefCount, WRC_INTERVAL);
if (newCount >= (uint32_t)~WRC_INTERVAL) {
assert(0 && "weak retain count underflow");
}
@@ -258,11 +256,10 @@ void swift::swift_weakRelease(HeapObject *object) {
HeapObject *swift::swift_tryRetain(HeapObject *object) {
if (!object) return nullptr;
// FIXME: not thread-safe
uint32_t newCount = (object->refCount += RC_INTERVAL);
uint32_t newCount = __sync_add_and_fetch(&object->refCount, RC_INTERVAL);
assert(newCount >= RC_INTERVAL && "retain count overflow");
if (newCount & RC_DEALLOCATING_BIT) {
object->refCount -= RC_INTERVAL;
__sync_fetch_and_sub(&object->refCount, RC_INTERVAL);
return nullptr;
}
return object;