Overview
| Comment: | Reduce memory usage of OFDictionary and fix hashing. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
d46212a8cdffd88142b88fa79da50f57 |
| User & Date: | js on 2010-04-17 13:29:54 |
| Other Links: | manifest | tags |
Context
|
2010-04-17
| ||
| 13:44 | Improve performance of OFArray's +[arrayWithCArray:]. check-in: 8c4adb2599 user: js tags: trunk | |
| 13:29 | Reduce memory usage of OFDictionary and fix hashing. check-in: d46212a8cd user: js tags: trunk | |
| 11:12 | Rewrite OFDictionary code to make it more readable. check-in: 9f260d5f50 user: js tags: trunk | |
Changes
Modified src/OFDictionary.h from [06ef929ac6] to [af6491b4d3].
| ︙ | ︙ | |||
27 28 29 30 31 32 33 |
/**
* \brief A class for storing objects in a hash table.
*/
@interface OFDictionary: OFObject <OFCopying, OFMutableCopying,
OFFastEnumeration>
{
| | | 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 |
/**
* \brief A class for storing objects in a hash table.
*/
@interface OFDictionary: OFObject <OFCopying, OFMutableCopying,
OFFastEnumeration>
{
struct of_dictionary_bucket **data;
uint32_t size;
size_t count;
}
/**
* Creates a new OFDictionary.
*
|
| ︙ | ︙ | |||
158 159 160 161 162 163 164 |
*/
- (OFEnumerator*)keyEnumerator;
@end
/// \cond internal
@interface OFDictionaryEnumerator: OFEnumerator
{
| | | | | 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 |
*/
- (OFEnumerator*)keyEnumerator;
@end
/// \cond internal
@interface OFDictionaryEnumerator: OFEnumerator
{
struct of_dictionary_bucket **data;
uint32_t size;
unsigned long mutations;
unsigned long *mutations_ptr;
uint32_t pos;
}
- initWithData: (struct of_dictionary_bucket**)data
size: (uint32_t)size
mutationsPointer: (unsigned long*)mutations_ptr;
@end
@interface OFDictionaryObjectEnumerator: OFDictionaryEnumerator
@end
@interface OFDictionaryKeyEnumerator: OFDictionaryEnumerator
@end
/// \endcond
#import "OFMutableDictionary.h"
extern struct of_dictionary_bucket of_dictionary_deleted_bucket;
|
Modified src/OFDictionary.m from [cdc962433d] to [dccfd91447].
| ︙ | ︙ | |||
16 17 18 19 20 21 22 | #import "OFDictionary.h" #import "OFEnumerator.h" #import "OFArray.h" #import "OFAutoreleasePool.h" #import "OFExceptions.h" #import "macros.h" | | | | | 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 |
#import "OFDictionary.h"
#import "OFEnumerator.h"
#import "OFArray.h"
#import "OFAutoreleasePool.h"
#import "OFExceptions.h"
#import "macros.h"
struct of_dictionary_bucket of_dictionary_deleted_bucket = {};
#define BUCKET struct of_dictionary_bucket
#define DELETED &of_dictionary_deleted_bucket
@implementation OFDictionary
+ dictionary;
{
return [[[self alloc] init] autorelease];
}
|
| ︙ | ︙ | |||
66 67 68 69 70 71 72 |
- init
{
self = [super init];
size = 1;
@try {
| | | | > > > > | < | < > | | | | | > > | > > > > < < > | | | > > > | > > > < | | > | | > > | > | | < > | | | > | | | 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 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 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 |
- init
{
self = [super init];
size = 1;
@try {
data = [self allocMemoryWithSize: sizeof(BUCKET*)];
} @catch (OFException *e) {
/*
* We can't use [super dealloc] on OS X here. Compiler bug?
* Anyway, set size to 0 so that [self dealloc] works.
*/
size = 0;
[self dealloc];
@throw e;
}
data[0] = NULL;
return self;
}
- initWithDictionary: (OFDictionary*)dict
{
uint32_t i;
self = [super init];
if (dict == nil) {
Class c = isa;
size = 0;
[self dealloc];
@throw [OFInvalidArgumentException newWithClass: c
selector: _cmd];
}
@try {
data = [self allocMemoryForNItems: dict->size
withSize: sizeof(BUCKET*)];
for (i = 0; i < dict->size; i++)
data[i] = NULL;
} @catch (OFException *e) {
/*
* We can't use [super dealloc] on OS X here. Compiler bug?
* Anyway, we didn't do anything yet anyway, so [self dealloc]
* works.
*/
[self dealloc];
@throw e;
}
size = dict->size;
count = dict->count;
for (i = 0; i < size; i++) {
OFObject <OFCopying> *key;
BUCKET *b;
if (dict->data[i] == NULL || dict->data[i] == DELETED)
continue;
@try {
b = [self allocMemoryWithSize: sizeof(BUCKET)];
key = [dict->data[i]->key copy];
} @catch (OFException *e) {
[self dealloc];
@throw e;
}
@try {
[dict->data[i]->object retain];
} @catch (OFException *e) {
[key release];
[self dealloc];
@throw e;
}
b->key = key;
b->object = dict->data[i]->object;
b->hash = dict->data[i]->hash;
data[i] = b;
}
return self;
}
- initWithObject: (OFObject*)obj
forKey: (OFObject <OFCopying>*)key
{
uint32_t i;
BUCKET *b;
self = [self init];
@try {
data = [self allocMemoryForNItems: 2
withSize: sizeof(BUCKET*)];
size = 2;
for (i = 0; i < size; i++)
data[i] = NULL;
} @catch (OFException *e) {
/*
* We can't use [super dealloc] on OS X here. Compiler bug?
* Anyway, we didn't do anything yet anyway, so [self dealloc]
* works.
*/
[self dealloc];
@throw e;
}
i = [key hash] & 1;
@try {
b = [self allocMemoryWithSize: sizeof(BUCKET)];
key = [key copy];
} @catch (OFException *e) {
[self dealloc];
@throw e;
}
@try {
[obj retain];
} @catch (OFException *e) {
[key release];
[self dealloc];
@throw e;
}
b->key = key;
b->object = obj;
b->hash = [key hash];
data[i] = b;
count = 1;
return self;
}
- initWithObjects: (OFArray*)objs
forKeys: (OFArray*)keys
{
id *objs_carray, *keys_carray;
size_t i;
self = [super init];
@try {
uint32_t j;
keys_carray = [keys cArray];
objs_carray = [objs cArray];
count = [keys count];
if (count > UINT32_MAX)
@throw [OFOutOfRangeException newWithClass: isa];
for (size = 1; size < count; size <<= 1);
if (size == 0)
@throw [OFOutOfRangeException newWithClass: isa];
data = [self allocMemoryForNItems: size
withSize: sizeof(BUCKET*)];
for (j = 0; j < size; j++)
data[j] = NULL;
} @catch (OFException *e) {
/*
* We can't use [super dealloc] on OS X here. Compiler bug?
* Anyway, set size to 0 so that [self dealloc] works.
*/
size = 0;
[self dealloc];
@throw e;
}
for (i = 0; i < count; i++) {
uint32_t j, hash, last;
hash = [keys_carray[i] hash];
last = size;
for (j = hash & (size - 1); j < last && data[j] != NULL; j++)
if ([data[j]->key isEqual: keys_carray[i]])
break;
/* In case the last bucket is already used */
if (j >= last) {
last = hash & (size - 1);
for (j = 0; j < last && data[j] != NULL; j++)
if ([data[j]->key isEqual: keys_carray[i]])
break;
}
/* Key not in dictionary */
if (j >= last || data[j] == NULL ||
![data[j]->key isEqual: keys_carray[i]]) {
BUCKET *b;
OFObject <OFCopying> *key;
last = size;
j = hash & (size - 1);
for (; j < last && data[j] != NULL; j++);
/* In case the last bucket is already used */
if (j >= last) {
last = hash & (size - 1);
for (j = 0; j < last && data[j] != NULL; j++);
}
if (j >= last) {
Class c = isa;
[self dealloc];
@throw [OFOutOfRangeException newWithClass: c];
}
@try {
b = [self allocMemoryWithSize: sizeof(BUCKET)];
key = [keys_carray[i] copy];
} @catch (OFException *e) {
[self dealloc];
@throw e;
}
@try {
[objs_carray[i] retain];
} @catch (OFException *e) {
[key release];
[self dealloc];
@throw e;
}
b->key = key;
b->object = objs_carray[i];
b->hash = hash;
data[j] = b;
continue;
}
/*
* They key is already in the dictionary. However, we just
* replace it so that the programmer gets the same behavior
* as if he'd call setObject:forKey: for each key/object pair.
*/
@try {
[objs_carray[i] retain];
} @catch (OFException *e) {
[self dealloc];
@throw e;
}
@try {
[data[j]->object release];
} @catch (OFException *e) {
[objs_carray[i] release];
[self dealloc];
@throw e;
}
data[j]->object = objs_carray[i];
}
return self;
}
- initWithKeysAndObjects: (OFObject <OFCopying>*)first, ...
{
|
| ︙ | ︙ | |||
327 328 329 330 331 332 333 334 335 336 337 338 339 340 |
return ret;
}
- initWithKey: (OFObject <OFCopying>*)key
argList: (va_list)args
{
OFObject *obj;
size_t i;
uint32_t j, hash;
va_list args2;
self = [super init];
| > | 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 |
return ret;
}
- initWithKey: (OFObject <OFCopying>*)key
argList: (va_list)args
{
BUCKET *b;
OFObject *obj;
size_t i;
uint32_t j, hash;
va_list args2;
self = [super init];
|
| ︙ | ︙ | |||
354 355 356 357 358 359 360 |
Class c = isa;
[self dealloc];
@throw [OFOutOfRangeException newWithClass: c];
}
@try {
data = [self allocMemoryForNItems: size
| | > > > < | > > | > > > > | | | > | | > | | > > | | | < > | | | > | | | | | | | | | | | 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 |
Class c = isa;
[self dealloc];
@throw [OFOutOfRangeException newWithClass: c];
}
@try {
data = [self allocMemoryForNItems: size
withSize: sizeof(BUCKET*)];
for (j = 0; j < size; j++)
data[j] = NULL;
} @catch (OFException *e) {
/*
* We can't use [super dealloc] on OS X here. Compiler bug?
* Anyway, set size to 0 so that [self dealloc] works.
* */
size = 0;
[self dealloc];
@throw e;
}
if (key == nil) {
Class c = isa;
size = 0;
[self dealloc];
@throw [OFInvalidArgumentException newWithClass: c
selector: _cmd];
}
if ((obj = va_arg(args, OFObject*)) == nil) {
Class c = isa;
[self dealloc];
@throw [OFInvalidArgumentException newWithClass: c
selector: _cmd];
}
/* Add first key / object pair */
hash = [key hash];
j = hash & (size - 1);
@try {
b = [self allocMemoryWithSize: sizeof(BUCKET)];
key = [key copy];
} @catch (OFException *e) {
[self dealloc];
@throw e;
}
@try {
[obj retain];
} @catch (OFException *e) {
[key release];
[self dealloc];
@throw e;
}
b->key = key;
b->object = obj;
b->hash = hash;
data[j] = b;
for (i = 1; i < count; i++) {
uint32_t last;
key = va_arg(args, OFObject <OFCopying>*);
obj = va_arg(args, OFObject*);
if (key == nil || obj == nil) {
Class c = isa;
[self dealloc];
@throw [OFInvalidArgumentException newWithClass: c
selector: _cmd];
}
hash = [key hash];
last = size;
for (j = hash & (size - 1); j < last && data[j] != NULL; j++)
if ([data[j]->key isEqual: key])
break;
/* In case the last bucket is already used */
if (j >= last) {
last = hash & (size - 1);
for (j = 0; j < last && data[j] != NULL; j++)
if ([data[j]->key isEqual: key])
break;
}
/* Key not in dictionary */
if (j >= last || data[j] == NULL ||
![data[j]->key isEqual: key]) {
last = size;
j = hash & (size - 1);
for (; j < last && data[j] != NULL; j++);
/* In case the last bucket is already used */
if (j >= last) {
last = hash & (size - 1);
for (j = 0; j < last && data[j] != NULL; j++);
}
if (j >= last) {
Class c = isa;
[self dealloc];
@throw [OFOutOfRangeException newWithClass: c];
}
@try {
b = [self allocMemoryWithSize: sizeof(BUCKET)];
key = [key copy];
} @catch (OFException *e) {
[self dealloc];
@throw e;
}
@try {
[obj retain];
} @catch (OFException *e) {
[key release];
[self dealloc];
@throw e;
}
b->key = key;
b->object = obj;
b->hash = hash;
data[j] = b;
continue;
}
/*
* They key is already in the dictionary. However, we just
* replace it so that the programmer gets the same behavior
* as if he'd call setObject:forKey: for each key/object pair.
*/
@try {
[obj retain];
} @catch (OFException *e) {
[self dealloc];
@throw e;
}
@try {
[data[j]->object release];
} @catch (OFException *e) {
[obj release];
[self dealloc];
@throw e;
}
data[j]->object = obj;
}
return self;
}
- (id)objectForKey: (OFObject <OFCopying>*)key
{
uint32_t i, hash, last;
if (key == nil)
@throw [OFInvalidArgumentException newWithClass: isa
selector: _cmd];
hash = [key hash];
last = size;
for (i = hash & (size - 1); i < last && data[i] != NULL; i++) {
if (data[i] == DELETED)
continue;
if ([data[i]->key isEqual: key])
return [[data[i]->object retain] autorelease];
}
if (i < last)
return nil;
/* In case the last bucket is already used */
last = hash & (size - 1);
for (i = 0; i < last && data[i] != NULL; i++) {
if (data[i] == DELETED)
continue;
if ([data[i]->key isEqual: key])
return [[data[i]->object retain] autorelease];
}
return nil;
}
- (size_t)count
{
|
| ︙ | ︙ | |||
554 555 556 557 558 559 560 |
{
uint32_t i;
if ([dict count] != count)
return NO;
for (i = 0; i < size; i++)
| | | > | | | | 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 |
{
uint32_t i;
if ([dict count] != count)
return NO;
for (i = 0; i < size; i++)
if (data[i] != NULL && data[i]!= DELETED &&
![[dict objectForKey: data[i]->key]
isEqual: data[i]->object])
return NO;
return YES;
}
- (int)countByEnumeratingWithState: (of_fast_enumeration_state_t*)state
objects: (id*)objects
count: (int)count_
{
int i;
for (i = 0; i < count_; i++) {
for (; state->state < size && (data[state->state] == NULL ||
data[state->state] == DELETED); state->state++);
if (state->state < size) {
objects[i] = data[state->state]->key;
state->state++;
} else
break;
}
state->itemsPtr = objects;
state->mutationsPtr = (unsigned long*)self;
|
| ︙ | ︙ | |||
605 606 607 608 609 610 611 |
}
- (void)dealloc
{
uint32_t i;
for (i = 0; i < size; i++) {
| | | | | | | | | | | | | | | | 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 |
}
- (void)dealloc
{
uint32_t i;
for (i = 0; i < size; i++) {
if (data[i] != NULL && data[i] != DELETED) {
[data[i]->key release];
[data[i]->object release];
}
}
[super dealloc];
}
- (uint32_t)hash
{
uint32_t i;
uint32_t hash;
OF_HASH_INIT(hash);
for (i = 0; i < size; i++) {
if (data[i] != NULL && data[i] != DELETED) {
uint32_t h = [data[i]->object hash];
OF_HASH_ADD(hash, data[i]->hash >> 24);
OF_HASH_ADD(hash, (data[i]->hash >> 16) & 0xFF);
OF_HASH_ADD(hash, (data[i]->hash >> 8) & 0xFF);
OF_HASH_ADD(hash, data[i]->hash & 0xFF);
OF_HASH_ADD(hash, h >> 24);
OF_HASH_ADD(hash, (h >> 16) & 0xFF);
OF_HASH_ADD(hash, (h >> 8) & 0xFF);
OF_HASH_ADD(hash, h & 0xFF);
}
}
OF_HASH_FINALIZE(hash);
return hash;
}
@end
/// \cond internal
@implementation OFDictionaryEnumerator
- initWithData: (struct of_dictionary_bucket**)data_
size: (uint32_t)size_
mutationsPointer: (unsigned long*)mutations_ptr_
{
self = [super init];
data = data_;
size = size_;
|
| ︙ | ︙ | |||
676 677 678 679 680 681 682 |
@implementation OFDictionaryObjectEnumerator
- (id)nextObject
{
if (mutations_ptr != NULL && *mutations_ptr != mutations)
@throw [OFEnumerationMutationException newWithClass: isa];
| | | | | | | | 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 |
@implementation OFDictionaryObjectEnumerator
- (id)nextObject
{
if (mutations_ptr != NULL && *mutations_ptr != mutations)
@throw [OFEnumerationMutationException newWithClass: isa];
for (; pos < size && (data[pos] == NULL ||
data[pos] == DELETED); pos++);
if (pos < size)
return data[pos++]->object;
else
return nil;
}
@end
@implementation OFDictionaryKeyEnumerator
- (id)nextObject
{
if (mutations_ptr != NULL && *mutations_ptr != mutations)
@throw [OFEnumerationMutationException newWithClass: isa];
for (; pos < size && (data[pos] == NULL ||
data[pos] == DELETED); pos++);
if (pos < size)
return data[pos++]->key;
else
return nil;
}
@end
/// \endcond
|
Modified src/OFMutableDictionary.m from [c6cdd10ae1] to [68b8ff9c5e].
| ︙ | ︙ | |||
13 14 15 16 17 18 19 | #include <string.h> #import "OFMutableDictionary.h" #import "OFExceptions.h" #import "macros.h" | | | | | | > > | | | | | | | < < | | | | | | | | > > | | | | > > > | > > > > > | | | > | | | | | | | > | | | | | | > | | 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 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 221 |
#include <string.h>
#import "OFMutableDictionary.h"
#import "OFExceptions.h"
#import "macros.h"
#define BUCKET struct of_dictionary_bucket
#define DELETED &of_dictionary_deleted_bucket
@implementation OFMutableDictionary
- (void)_resizeForCount: (size_t)newcount
{
size_t fill = newcount * 4 / size;
size_t newsize;
struct of_dictionary_bucket **newdata;
uint32_t i;
if (newcount > UINT32_MAX)
@throw [OFOutOfRangeException newWithClass: isa];
if (fill >= 3)
newsize = size << 1;
else if (fill <= 1)
newsize = size >> 1;
else
return;
if (newsize == 0)
@throw [OFOutOfRangeException newWithClass: isa];
newdata = [self allocMemoryForNItems: newsize
withSize: sizeof(BUCKET*)];
for (i = 0; i < newsize; i++)
newdata[i] = NULL;
for (i = 0; i < size; i++) {
if (data[i] != NULL && data[i] != DELETED) {
uint32_t j, last;
last = newsize;
j = data[i]->hash & (newsize - 1);
for (; j < last && newdata[j] != NULL; j++);
/* In case the last bucket is already used */
if (j >= last) {
last = data[i]->hash & (newsize - 1);
for (j = 0; j < last &&
newdata[j] != NULL; i++);
}
if (j >= last) {
[self freeMemory: newdata];
@throw [OFOutOfRangeException
newWithClass: isa];
}
newdata[j] = data[i];
}
}
[self freeMemory: data];
data = newdata;
size = newsize;
}
- setObject: (OFObject*)obj
forKey: (OFObject <OFCopying>*)key
{
uint32_t i, hash, last;
if (key == nil || obj == nil)
@throw [OFInvalidArgumentException newWithClass: isa
selector: _cmd];
hash = [key hash];
last = size;
for (i = hash & (size - 1); i < last && data[i] != NULL; i++) {
if (data[i] == DELETED)
continue;
if ([data[i]->key isEqual: key])
break;
}
/* In case the last bucket is already used */
if (i >= last) {
last = hash & (size - 1);
for (i = 0; i < last && data[i] != NULL; i++) {
if (data[i] == DELETED)
continue;
if ([data[i]->key isEqual: key])
break;
}
}
/* Key not in dictionary */
if (i >= last || data[i] == NULL || data[i] == DELETED ||
![data[i]->key isEqual: key]) {
BUCKET *b;
[self _resizeForCount: count + 1];
mutations++;
last = size;
for (i = hash & (size - 1); i < last && data[i] != NULL &&
data[i] != DELETED; i++);
/* In case the last bucket is already used */
if (i >= last) {
last = hash & (size - 1);
for (i = 0; i < last && data[i] != NULL &&
data[i] != DELETED; i++);
}
if (i >= last)
@throw [OFOutOfRangeException newWithClass: isa];
b = [self allocMemoryWithSize: sizeof(BUCKET)];
@try {
key = [key copy];
} @catch (OFException *e) {
[self freeMemory: b];
}
@try {
[obj retain];
} @catch (OFException *e) {
[self freeMemory: b];
[key release];
@throw e;
}
b->key = key;
b->object = obj;
b->hash = hash;
data[i] = b;
count++;
return self;
}
[obj retain];
[data[i]->object release];
data[i]->object = obj;
return self;
}
- removeObjectForKey: (OFObject*)key
{
uint32_t i, hash, last;
if (key == nil)
@throw [OFInvalidArgumentException newWithClass: isa
selector: _cmd];
hash = [key hash];
last = size;
for (i = hash & (size - 1); i < last && data[i] != NULL; i++) {
if (data[i] == DELETED)
continue;
if ([data[i]->key isEqual: key]) {
[data[i]->key release];
[data[i]->object release];
[self freeMemory: data[i]];
data[i] = DELETED;
count--;
mutations++;
[self _resizeForCount: count];
return self;
}
}
if (i < last)
return self;
/* In case the last bucket is already used */
last = hash & (size - 1);
for (i = 0; i < last && data[i] != NULL; i++) {
if (data[i] == DELETED)
continue;
if ([data[i]->key isEqual: key]) {
[data[i]->key release];
[data[i]->object release];
[self freeMemory: data[i]];
data[i] = DELETED;
count--;
mutations++;
[self _resizeForCount: count];
return self;
}
|
| ︙ | ︙ | |||
219 220 221 222 223 224 225 |
- (int)countByEnumeratingWithState: (of_fast_enumeration_state_t*)state
objects: (id*)objects
count: (int)count_
{
int i;
for (i = 0; i < count_; i++) {
| | | | | 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 |
- (int)countByEnumeratingWithState: (of_fast_enumeration_state_t*)state
objects: (id*)objects
count: (int)count_
{
int i;
for (i = 0; i < count_; i++) {
for (; state->state < size && (data[state->state] == NULL ||
data[state->state] == DELETED); state->state++);
if (state->state < size) {
objects[i] = data[state->state]->key;
state->state++;
} else
break;
}
state->itemsPtr = objects;
state->mutationsPtr = &mutations;
|
| ︙ | ︙ |