Overview
| Comment: | runtime/arc.m: Use -[{allows,retain}WeakReference]
This is to have consistent behavior with the Apple runtime, which |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
4ee6b746cdb034ebf73a895b4d7cfa24 |
| User & Date: | js on 2016-05-29 00:55:37 |
| Other Links: | manifest | tags |
Context
|
2016-05-29
| ||
| 13:02 | Rename OFInflateStream back to OFDeflateStream check-in: 134a1121c7 user: js tags: trunk | |
| 00:55 | runtime/arc.m: Use -[{allows,retain}WeakReference] check-in: 4ee6b746cd user: js tags: trunk | |
| 00:42 | Add -[{allows,retain}WeakReference] to OFObject check-in: 1d57af4a31 user: js tags: trunk | |
Changes
Modified src/OFObject.h from [2a9718be8b] to [5b937156e8].
| ︙ | ︙ | |||
349 350 351 352 353 354 355 356 357 358 359 360 361 362 | /*! * @brief Returns whether the object is a proxy object. * * @return A boolean whether the object is a proxy object */ - (bool)isProxy; @end /*! * @class OFObject OFObject.h ObjFW/OFObject.h * * @brief The root class for all other classes inside ObjFW. */ | > > > > > > > > > > > > > > | 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 | /*! * @brief Returns whether the object is a proxy object. * * @return A boolean whether the object is a proxy object */ - (bool)isProxy; /*! * @brief Returns whether the class allows weak references. * * @return Whether the class allows weak references */ - (bool)allowsWeakReference; /*! * @brief Retain a weak reference to this object. * * @return Whether a weak reference to this object has been retained */ - (bool)retainWeakReference; @end /*! * @class OFObject OFObject.h ObjFW/OFObject.h * * @brief The root class for all other classes inside ObjFW. */ |
| ︙ | ︙ |
Modified src/runtime/arc.m from [e3373421cc] to [7673f65032].
| ︙ | ︙ | |||
152 153 154 155 156 157 158 | } break; } } } | | > | > | | > > > > | | 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 |
}
break;
}
}
}
if (value != nil && class_respondsToSelector(object_getClass(value),
@selector(allowsWeakReference)) && [value allowsWeakReference]) {
struct weak_ref *ref = objc_hashtable_get(hashtable, value);
if (ref == NULL) {
if ((ref = calloc(1, sizeof(*ref))) == NULL)
OBJC_ERROR("Not enough memory to allocate weak "
"reference!");
objc_hashtable_set(hashtable, value, ref);
}
if ((ref->locations = realloc(ref->locations,
(ref->count + 1) * sizeof(id*))) == NULL)
OBJC_ERROR("Not enough memory to allocate weak "
"reference!")
ref->locations[ref->count++] = object;
} else
value = nil;
*object = value;
#ifdef OF_HAVE_THREADS
if (!of_spinlock_unlock(&spinlock))
OBJC_ERROR("Failed to unlock spinlock!")
#endif
return value;
}
id
objc_loadWeakRetained(id *object)
{
id value = nil;
struct weak_ref *ref;
#ifdef OF_HAVE_THREADS
if (!of_spinlock_lock(&spinlock))
OBJC_ERROR("Failed to lock spinlock!")
#endif
if ((ref = objc_hashtable_get(hashtable, *object)) != NULL)
value = *object;
#ifdef OF_HAVE_THREADS
if (!of_spinlock_unlock(&spinlock))
OBJC_ERROR("Failed to unlock spinlock!")
#endif
if (class_respondsToSelector(object_getClass(value),
@selector(retainWeakReference)) && [value retainWeakReference])
return value;
return nil;
}
id
objc_initWeak(id *object, id value)
{
*object = nil;
return objc_storeWeak(object, value);
|
| ︙ | ︙ |