Security-58286.20.16.tar.gz

[apple/security.git] / OSX / libsecurity_utilities / lib / seccfobject.cpp

diff --git a/OSX/libsecurity_utilities/lib/seccfobject.cpp b/OSX/libsecurity_utilities/lib/seccfobject.cpp
index 11220f456f5fb572deee35662b5ef720afa8dd10..93185ffc660d49f6f4c3575a907659a3aa948966 100644 (file)
--- a/OSX/libsecurity_utilities/lib/seccfobject.cpp
+++ b/OSX/libsecurity_utilities/lib/seccfobject.cpp
@@ -25,10 +25,13 @@
 #include <security_utilities/cfclass.h>
 #include <security_utilities/errors.h>
 #include <security_utilities/debugging.h>
 #include <security_utilities/cfclass.h>
 #include <security_utilities/errors.h>
 #include <security_utilities/debugging.h>

+#include <os/lock.h>

 
 #include <list>
 #include <security_utilities/globalizer.h>
 
 #include <list>
 #include <security_utilities/globalizer.h>

+#if( __cplusplus <= 201103L)

 #include <stdatomic.h>
 #include <stdatomic.h>

+#endif

 
 SecPointerBase::SecPointerBase(const SecPointerBase& p)
 {
 
 SecPointerBase::SecPointerBase(const SecPointerBase& p)
 {


@@ -146,11 +149,7 @@ void
 SecCFObject::operator delete(void *object) throw()
 {
        CFTypeRef cfType = reinterpret_cast<CFTypeRef>(reinterpret_cast<const uint8_t *>(object) - kAlignedRuntimeSize);
 SecCFObject::operator delete(void *object) throw()
 {
        CFTypeRef cfType = reinterpret_cast<CFTypeRef>(reinterpret_cast<const uint8_t *>(object) - kAlignedRuntimeSize);

-    if (CF_IS_COLLECTABLE(cfType))
-    {
-        return;
-    }
-    
+

     CFAllocatorRef allocator = CFGetAllocator(cfType);
     CFAllocatorDeallocate(allocator, (void*) cfType);
 }
     CFAllocatorRef allocator = CFGetAllocator(cfType);
     CFAllocatorDeallocate(allocator, (void*) cfType);
 }


@@ -158,12 +157,12 @@ SecCFObject::operator delete(void *object) throw()
 SecCFObject::SecCFObject()
 {
     mRetainCount = 1;
 SecCFObject::SecCFObject()
 {
     mRetainCount = 1;

-    mRetainSpinLock = OS_SPINLOCK_INIT;
+    mRetainLock = OS_UNFAIR_LOCK_INIT;

 }
 
 uint32_t SecCFObject::updateRetainCount(intptr_t direction, uint32_t *oldCount)
 {
 }
 
 uint32_t SecCFObject::updateRetainCount(intptr_t direction, uint32_t *oldCount)
 {

-    OSSpinLockLock(&mRetainSpinLock);
+    os_unfair_lock_lock(&mRetainLock);

 
     if (oldCount != NULL)
     {
 
     if (oldCount != NULL)
     {


@@ -181,7 +180,7 @@ uint32_t SecCFObject::updateRetainCount(intptr_t direction, uint32_t *oldCount)
     
     uint32_t result = mRetainCount;
 
     
     uint32_t result = mRetainCount;
 

-    OSSpinLockUnlock(&mRetainSpinLock);
+    os_unfair_lock_unlock(&mRetainLock);

     
     return result;
 }
     
     return result;
 }