X-Git-Url: https://git.saurik.com/apple/security.git/blobdiff_plain/5c19dc3ae3bd8e40a9c028b0deddd50ff337692c..7e6b461318c8a779d91381531435a68ee4e8b6ed:/OSX/libsecurity_utilities/lib/globalizer.h?ds=inline diff --git a/OSX/libsecurity_utilities/lib/globalizer.h b/OSX/libsecurity_utilities/lib/globalizer.h index 66480469..5610cc8a 100644 --- a/OSX/libsecurity_utilities/lib/globalizer.h +++ b/OSX/libsecurity_utilities/lib/globalizer.h @@ -33,6 +33,7 @@ #include #include #include +#include namespace Security { @@ -60,14 +61,14 @@ private: protected: void *create(void *(*make)()); - void lock() {OSSpinLockLock(&access);} - void unlock() {OSSpinLockUnlock(&access);} + void lock() {os_unfair_lock_lock(&access);} + void unlock() {os_unfair_lock_unlock(&access);} protected: // all of these will be statically initialized to zero void *pointer; dispatch_once_t once; - OSSpinLock access; + os_unfair_lock access; }; template @@ -127,7 +128,7 @@ class CleanModuleNexus : public ModuleNexus { public: ~CleanModuleNexus() { - secdebug("nexus", "ModuleNexus %p destroyed object 0x%x", + secinfo("nexus", "ModuleNexus %p destroyed object 0x%x", this, ModuleNexus::pointer); delete reinterpret_cast(ModuleNexus::pointer); }