gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-20 20:26:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add support (and test) for weak keys and values in NSMapTable. This support should work in GC mode. It also works if the runtime supports ARC, even if the compiler does not use this support.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@33617 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
theraven 2011-07-23 16:16:01 +00:00
parent ccc571be66
commit fc206e3169
4 changed files with 123 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

76
Source/NSConcretePointerFunctions.h
View file

@ -24,10 +24,38 @@
*/
#import "Foundation/NSPointerFunctions.h"
#if __OBJC_GC__
#include <objc/objc-auto.h>
#ifdef __GNUSTEP_RUNTIME__
# include <objc/capabilities.h>
#endif
// Define a weak read barrier macro for ARC or GC, depending on which one this
// target supports. If this target doesn't support zeroing weak references,
// then use an unsafe unretained access.
#if __OBJC_GC__
# include <objc/objc-auto.h>
# define WEAK_READ(x) objc_read_weak((id*)x)
# define WEAK_WRITE(addr, x) objc_assign_weak((id)x, (id*)addr)
# define STRONG_WRITE(addr, x) objc_assign_strongCast((id)x, (id*)addr)
# define STRONG_ACQUIRE(x) x
#elif defined(OBJC_CAP_ARC)
# include <objc/objc-arc.h>
# define WEAK_READ(x) objc_loadWeak((id*)x)
# define WEAK_WRITE(addr, x) objc_storeWeak((id*)addr, (id)x)
# define STRONG_WRITE(addr, x) objc_storeStrong((id*)addr, (id)x)
# define STRONG_ACQUIRE(x) objc_retain(x)
#else
# define WEAK_READ(x) (*x)
# if GS_WITH_GC
# define WEAK_WRITE(addr, x) GSAssignZeroingWeakPointer(addr, x)
# else
# define WEAK_WRITE(addr, x) (*(addr) = x)
# endif
# define STRONG_WRITE(addr, x) ASSIGN(*(addr), x)
# define STRONG_ACQUIRE(x) RETAIN(x)
#endif
/* Declare a structure type to copy pointer functions information
* around easily.
*/
@ -68,29 +96,13 @@ typedef struct
/* Acquire the pointer value to store for the specified item.
*/
static inline void
static inline void *
pointerFunctionsAcquire(PFInfo *PF, void **dst, void *src)
{
if (PF->acquireFunction != 0)
src = (*PF->acquireFunction)(src, PF->sizeFunction,
PF->options & NSPointerFunctionsCopyIn ? YES : NO);
#if __OBJC_GC__
if (PF->options & NSPointerFunctionsZeroingWeakMemory)
{
objc_assign_weak((id)src, (id*)dst);
}
else
{
objc_assign_strongCast((id)src, (id*)dst);
}
#else
#if GS_WITH_GC
if (PF->options & NSPointerFunctionsZeroingWeakMemory)
GSAssignZeroingWeakPointer(dst, src);
else
#endif
*dst = src;
#endif
return src;
}
/**
@ -99,12 +111,10 @@ pointerFunctionsAcquire(PFInfo *PF, void **dst, void *src)
*/
static inline void *pointerFunctionsRead(PFInfo *PF, void **addr)
{
#if __OBJC_GC__
if (PF->options & NSPointerFunctionsZeroingWeakMemory)
{
return objc_read_weak((id*)addr);
return WEAK_READ((id*)addr);
}
#endif
return *addr;
}
@ -113,21 +123,18 @@ static inline void *pointerFunctionsRead(PFInfo *PF, void **addr)
*/
static inline void pointerFunctionsAssign(PFInfo *PF, void **addr, void *value)
{
#if __OBJC_GC__
if (PF->options & NSPointerFunctionsZeroingWeakMemory)
{
objc_assign_weak(value, (id*)addr);
WEAK_WRITE(addr, value);
}
else if (PF->options & NSPointerFunctionsStrongMemory)
{
STRONG_WRITE(addr, value);
}
else
{
objc_assign_strongCast(value, (id*)addr);
*addr = value;
}
#elif GS_WITH_GC
if (PF->options & NSPointerFunctionsZeroingWeakMemory)
GSAssignZeroingWeakPointer(addr, value);
#else
*addr = value;
#endif
}
/**
@ -179,6 +186,7 @@ pointerFunctionsEqual(PFInfo *PF, void *item1, void *item2)
static inline void
pointerFunctionsRelinquish(PFInfo *PF, void **itemptr)
{
if (PF->relinquishFunction != 0)
(*PF->relinquishFunction)(*itemptr, PF->sizeFunction);
if (PF->options & NSPointerFunctionsZeroingWeakMemory)
@ -198,11 +206,9 @@ pointerFunctionsReplace(PFInfo *PF, void **dst, void *src)
PF->options & NSPointerFunctionsCopyIn ? YES : NO);
if (PF->relinquishFunction != 0)
(*PF->relinquishFunction)(*dst, PF->sizeFunction);
#if GS_WITH_GC
if (PF->options & NSPointerFunctionsZeroingWeakMemory)
GSAssignZeroingWeakPointer(dst, src);
WEAK_WRITE(dst, src);
else
#endif
*dst = src;
}
}