gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-23 09:04:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

tweaks for non-atomic associated values

Browse source
This commit is contained in:
rfm 2025-03-10 12:26:41 +00:00
parent ac0634f82f
commit d622530819
2 changed files with 49 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Headers/GNUstepBase/GSObjCRuntime.h
View file

@ -82,6 +82,8 @@ GS_EXPORT id objc_storeWeak(id *addr, id obj);
/** objc_AssociationPolicy acts like a bitfield, but
* only specific combinations of flags are permitted.
* NB The atomic forms are (non-atomic-form | 0x300), so 0x300 can be used
* as a marker for the atomic version.
*/
typedef enum uintptr_t {

52
Source/ObjectiveC2/weak.m
View file

@ -484,6 +484,7 @@ getAssociation(const void *key, assocptr ptr, BOOL mayCreate)
if (mayCreate)
{
ptr->more = (assocptr)calloc(1, sizeof(struct assocblock_t));
ptr->more->associations[0].key = key;
return ptr->more->associations;
}
return NULL;
@ -579,11 +580,42 @@ objc_getAssociatedObject(id object, const void *key)
{
association *ptr = getAssociation(key, block, NO);
if (ptr != NULL)
if (NULL == ptr)
{
found = ptr->value;
GS_MUTEX_UNLOCK(block->mutex);
}
else
{
objc_AssociationPolicy policy = ptr->policy;
found = ptr->value;
if (policy & 0x300)
{
// Atomic ... hold lock until after we have retained the value.
switch (policy)
{
case OBJC_ASSOCIATION_COPY:
case OBJC_ASSOCIATION_RETAIN:
found = [found retain];
break;
default:
}
GS_MUTEX_UNLOCK(block->mutex);
switch (policy)
{
case OBJC_ASSOCIATION_COPY:
case OBJC_ASSOCIATION_RETAIN:
found = [found autorelease];
break;
default:
}
}
else
{
// Non-Atomic ... assume we don't need retain/autorelease
GS_MUTEX_UNLOCK(block->mutex);
}
}
GS_MUTEX_UNLOCK(block->mutex);
}
return found;
}
@ -654,7 +686,17 @@ objc_setAssociatedObject(id object, const void *key, id value,
GS_MUTEX_LOCK(blk->mutex);
GS_MUTEX_UNLOCK(associatedLock);
association = getAssociation(key, blk, YES);
setAssociation(association, key, value, policy);
GS_MUTEX_UNLOCK(blk->mutex);
if (policy & 0x300)
{
// Atomic ... hold lock until new value is in place
setAssociation(association, key, value, policy);
GS_MUTEX_UNLOCK(blk->mutex);
}
else
{
// Non-Atomic ... release lock und then set association value
GS_MUTEX_UNLOCK(blk->mutex);
setAssociation(association, key, value, policy);
}
}