ObjFW  Check-in [e3f22b34ea]

Overview
Comment:Fix a bug with deleted buckets in OFDictionary + a few optimizations.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: e3f22b34eac53c2c183101194a42ac48ce7c47f465af2dce908beb48bff22b2c
User & Date: js on 2010-03-18 13:49:52
Other Links: manifest | tags
Context
2010-03-18
14:23
Fix a minor bug in OFDictionary's -[initWithObject:forKey:]. check-in: 6cef79231a user: js tags: trunk
13:49
Fix a bug with deleted buckets in OFDictionary + a few optimizations. check-in: e3f22b34ea user: js tags: trunk
2010-03-15
20:51
Fix building framework as Universal Binary. check-in: e4a877634a user: js tags: trunk
Changes

Modified src/OFDictionary.h from [21f4bb0265] to [507b931699].

178
179
180
181
182
183
184


178
179
180
181
182
183
184
185
186







+
+
@end

@interface OFDictionaryKeyEnumerator: OFDictionaryEnumerator
@end
/// \endcond

#import "OFMutableDictionary.h"

extern const int of_dictionary_deleted_bucket;

Modified src/OFDictionary.m from [2a8ec54404] to [33cef06086].

15
16
17
18
19
20
21
22


23

24
25
26
27
28
29
30
15
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"

const int of_dictionary_deleted_bucket;

#define BUCKET_SIZE sizeof(struct of_dictionary_bucket)
#define DELETED (id)&of_dictionary_deleted_bucket

@implementation OFDictionary
+ dictionary;
{
	return [[[self alloc] init] autorelease];
}

111
112
113
114
115
116
117
118

119
120
121
122
123
124
125
114
115
116
117
118
119
120

121
122
123
124
125
126
127
128







-
+








	size = dict->size;
	count = dict->count;

	for (i = 0; i < size; i++) {
		OFObject <OFCopying> *key;

		if (dict->data[i].key == nil) {
		if (dict->data[i].key == nil || dict->data[i].key == DELETED) {
			data[i].key = nil;
			continue;
		}

		@try {
			key = [dict->data[i].key copy];
		} @catch (OFException *e) {
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
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







-
+


+

-
+



-
-
+
+
+
+

-
+
+

-
+


+
+

-
+


-
-
+
+
+
+

+
+
-
+







		size = 0;
		[self dealloc];
		@throw e;
	}
	memset(data, 0, size * BUCKET_SIZE);

	for (i = 0; i < count; i++) {
		uint32_t j, hash;
		uint32_t j, hash, last;

		hash = [keys_carray[i] hash];
		last = size;

		for (j = hash & (size - 1); j < size && data[j].key != nil &&
		for (j = hash & (size - 1); j < last && data[j].key != nil &&
		    ![data[j].key isEqual: keys_carray[i]]; j++);

		/* In case the last bucket is already used */
		if (j >= size)
			for (j = 0; j < size && data[j].key != nil &&
		if (j >= last) {
			last = hash & (size - 1);

			for (j = 0; j < last && data[j].key != nil &&
			    ![data[j].key isEqual: keys_carray[i]]; j++);

		}

		/* Key not in dictionary */
		if (j >= size || ![data[j].key isEqual: keys_carray[i]]) {
		if (j >= last || ![data[j].key isEqual: keys_carray[i]]) {
			OFObject <OFCopying> *key;

			last = size;

			j = hash & (size - 1);
			for (; j < size && data[j].key != nil; j++);
			for (; j < last && data[j].key != nil; j++);

			/* In case the last bucket is already used */
			if (j >= size)
				for (j = 0; j < size && data[j].key != nil;
			if (j >= last) {
				last = hash & (size - 1);

				for (j = 0; j < last && data[j].key != nil;
				    j++);
			}

			if (j >= size) {
			if (j >= last) {
				Class c = isa;
				[self dealloc];
				@throw [OFOutOfRangeException newWithClass: c];
			}

			@try {
				key = [keys_carray[i] copy];
326
327
328
329
330
331
332

333

334
335
336
337
338
339
340
341
342
343

344
345
346
347
348
349
350
339
340
341
342
343
344
345
346

347
348
349
350
351
352
353
354
355


356
357
358
359
360
361
362
363







+
-
+








-
-
+







		[self dealloc];
		@throw e;
	}
	memset(data, 0, size * BUCKET_SIZE);

	if (key == nil)
		return self;

	else if ((obj = va_arg(args, OFObject*)) == nil) {
	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];

	for (j = hash & (size - 1); j < size && data[j].key != nil; j++);
	j = hash & (size - 1);

	@try {
		key = [key copy];
	} @catch (OFException *e) {
		[self dealloc];
		@throw e;
	}
358
359
360
361
362
363
364


365
366
367
368
369
370
371
372
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
371
372
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







+
+











+

-
+



-
-
+
+
+
+

-
+
+

-
+
+
+

-
+


-
-
+
+
+
+

+
+
-
+







	}

	data[j].key = key;
	data[j].object = obj;
	data[j].hash = hash;

	for (i = 1; i < count; i++) {
		size_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 < size && data[j].key != nil &&
		for (j = hash & (size - 1); j < last && data[j].key != nil &&
		    ![data[j].key isEqual: key]; j++);

		/* In case the last bucket is already used */
		if (j >= size)
			for (j = 0; j < size && data[j].key != nil &&
		if (j >= last) {
			last = hash & (size - 1);

			for (j = 0; j < last && data[j].key != nil &&
			    ![data[j].key isEqual: key]; j++);

		}

		/* Key not in dictionary */
		if (j >= size || ![data[j].key isEqual: key]) {
		if (j >= last || ![data[j].key isEqual: key]) {
			last = size;

			j = hash & (size - 1);
			for (; j < size && data[j].key != nil; j++);
			for (; j < last && data[j].key != nil; j++);

			/* In case the last bucket is already used */
			if (j >= size)
				for (j = 0; j < size && data[j].key != nil;
			if (j >= last) {
				last = hash & (size - 1);

				for (j = 0; j < last && data[j].key != nil;
				    j++);
			}

			if (j >= size) {
			if (j >= last) {
				Class c = isa;
				[self dealloc];
				@throw [OFOutOfRangeException newWithClass: c];
			}

			@try {
				key = [key copy];
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
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







-
+






+

-
-
+
+

-
+



-
-
-
-
+
+
+
+
+
+
+
+

+
-
+







	}

	return self;
}

- (id)objectForKey: (OFObject <OFCopying>*)key
{
	uint32_t i, hash;
	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 < size && data[i].key != nil &&
	    ![data[i].key isEqual: key]; i++);
	for (i = hash & (size - 1); i < last && data[i].key != nil &&
	    (data[i].key == DELETED || ![data[i].key isEqual: key]); i++);

	if (i < size && data[i].key == nil)
	if (i < last && (data[i].key == nil || data[i].key == DELETED))
		return nil;

	/* In case the last bucket is already used */
	if (i >= size)
		for (i = 0; i < size && data[i].key != nil &&
		    ![data[i].key isEqual: key]; i++);

	if (i >= last) {
		last = hash & (size - 1);

		for (i = 0; i < last && data[i].key != nil &&
		    (data[i].key == DELETED || ![data[i].key isEqual: key]);
		    i++);
	}

	/* Key not in dictionary */
	if (i >= last || data[i].key == nil || data[i].key == DELETED ||
	if (i >= size || ![data[i].key isEqual: key])
	    ![data[i].key isEqual: key])
		return nil;

	return [[data[i].object retain] autorelease];
}

- (size_t)count
{
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
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







-
+













-
-
+
+







{
	size_t i;

	if ([dict count] != count)
		return NO;

	for (i = 0; i < size; i++)
		if (data[i].key != nil &&
		if (data[i].key != nil && data[i].key != 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_
{
	size_t i;

	for (i = 0; i < count_; i++) {
		for (; state->state < size && data[state->state].key == nil;
		    state->state++);
		for (; state->state < size && (data[state->state].key == nil ||
		    data[state->state].key == DELETED); state->state++);

		if (state->state < size) {
			objects[i] = data[state->state].key;
			state->state++;
		} else
			break;
	}
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
572
573
574
574
575
576
577
578
579
580

581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597

598
599
600
601
602
603
604
605







-
+
















-
+







}

- (void)dealloc
{
	size_t i;

	for (i = 0; i < size; i++) {
		if (data[i].key != nil) {
		if (data[i].key != nil && data[i].key != DELETED) {
			[data[i].key release];
			[data[i].object release];
		}
	}

	[super dealloc];
}

- (uint32_t)hash
{
	size_t i;
	uint32_t hash;

	OF_HASH_INIT(hash);

	for (i = 0; i < size; i++) {
		if (data[i].key != nil) {
		if (data[i].key != nil && data[i].key != DELETED) {
			uint32_t kh = [data[i].key hash];

			OF_HASH_ADD(hash, kh >> 24);
			OF_HASH_ADD(hash, (kh >> 16) & 0xFF);
			OF_HASH_ADD(hash, (kh >> 8) & 0xFF);
			OF_HASH_ADD(hash, kh & 0xFF);

614
615
616
617
618
619
620
621


622
623
624
625
626
627
628
629
630
631
632
633
634
635
636


637
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







-
+
+














-
+
+









@implementation OFDictionaryObjectEnumerator
- (id)nextObject
{
	if (mutations_ptr != NULL && *mutations_ptr != mutations)
		@throw [OFEnumerationMutationException newWithClass: isa];

	for (; pos < size && data[pos].key == nil; pos++);
	for (; pos < size && (data[pos].key == nil ||
	    data[pos].key == 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].key == nil; pos++);
	for (; pos < size && (data[pos].key == nil ||
	    data[pos].key == DELETED); pos++);

	if (pos < size)
		return data[pos++].key;
	else
		return nil;
}
@end
/// \endcond

Modified src/OFMutableDictionary.m from [2ba9682b11] to [5a9553cf23].

14
15
16
17
18
19
20

21
22
23
24
25
26
27
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28







+







#include <string.h>

#import "OFMutableDictionary.h"
#import "OFExceptions.h"
#import "macros.h"

#define BUCKET_SIZE sizeof(struct of_dictionary_bucket)
#define DELETED (id)&of_dictionary_deleted_bucket

static OF_INLINE void
resize(id self, Class isa, size_t count, struct of_dictionary_bucket **data,
    size_t *size)
{
	size_t fill = count * 4 / *size;
	size_t newsize;
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
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







-
-
-
+
+
+
+
+
+
+


-
-
+
+
+
+

+
+
-
+


















-
+






+

-
-
+
+


-
-
-
-
+
+
+
+
+
+
+
+

+
-
+



+

-
-
+
+


-
-
-
+
+
+
+
+
+
+
+







		return;

	newdata = [self allocMemoryForNItems: newsize
				    withSize: BUCKET_SIZE];
	memset(newdata, 0, newsize * BUCKET_SIZE);

	for (i = 0; i < *size; i++) {
		if ((*data)[i].key != nil) {
			uint32_t j = (*data)[i].hash & (newsize - 1);
			for (; j < newsize && newdata[j].key != nil; j++);
		if ((*data)[i].key != nil && (*data)[i].key != DELETED) {
			uint32_t j, last;

			last = newsize;

			j = (*data)[i].hash & (newsize - 1);
			for (; j < last && newdata[j].key != nil; j++);

			/* In case the last bucket is already used */
			if (j >= newsize)
				for (j = 0; j < newsize &&
			if (j >= last) {
				last = (*data)[i].hash & (newsize - 1);

				for (j = 0; j < last &&
				    newdata[j].key != nil; i++);
			}

			if (j >= newsize)
			if (j >= last)
				@throw [OFOutOfRangeException
				    newWithClass: [self class]];

			newdata[j].key = (*data)[i].key;
			newdata[j].object = (*data)[i].object;
			newdata[j].hash = (*data)[i].hash;
		}
	}

	[self freeMemory: *data];
	*data = newdata;
	*size = newsize;
}

@implementation OFMutableDictionary
- setObject: (OFObject*)obj
     forKey: (OFObject <OFCopying>*)key
{
	uint32_t i, hash;
	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 < size && data[i].key != nil &&
	    ![data[i].key isEqual: key]; i++);
	for (i = hash & (size - 1); i < last && data[i].key != nil &&
	    (data[i].key == DELETED || ![data[i].key isEqual: key]); i++);

	/* In case the last bucket is already used */
	if (i >= size)
		for (i = 0; i < size && data[i].key != nil &&
		    ![data[i].key isEqual: key]; i++);

	if (i >= last) {
		last = hash & (size - 1);

		for (i = 0; i < last && data[i].key != nil &&
		    (data[i].key == DELETED || ![data[i].key isEqual: key]);
		    i++);
	}

	/* Key not in dictionary */
	if (i >= last || data[i].key == nil || data[i].key == DELETED ||
	if (i >= size || ![data[i].key isEqual: key]) {
	    ![data[i].key isEqual: key]) {
		resize(self, isa, count + 1, &data, &size);

		mutations++;
		last = size;

		i = hash & (size - 1);
		for (; i < size && data[i].key != nil; i++);
		for (i = hash & (size - 1); i < last && data[i].key != nil &&
		    data[i].key != DELETED; i++);

		/* In case the last bucket is already used */
		if (i >= size)
			for (i = 0; i < size && data[i].key != nil; i++);
		if (i >= size)
		if (i >= last) {
			last = hash & (size - 1);

			for (i = 0; i < last && data[i].key != nil &&
			    data[i].key != DELETED; i++);
		}

		if (i >= last)
			@throw [OFOutOfRangeException newWithClass: isa];

		key = [key copy];
		@try {
			[obj retain];
		} @catch (OFException *e) {
			[key release];
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
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







-
+






+

-
-
+
+

+
-
+



-
-
-
-
+
+
+
+
+
+
+
+

+
-
+




-
+




















-
-
+
+







	data[i].object = obj;

	return self;
}

- removeObjectForKey: (OFObject*)key
{
	uint32_t i, hash;
	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 < size && data[i].key != nil &&
	    ![data[i].key isEqual: key]; i++);
	for (i = hash & (size - 1); i < last && data[i].key != nil &&
	    (data[i].key == DELETED || ![data[i].key isEqual: key]); i++);

	if (i < last && (data[i].key == nil || data[i].key == DELETED ||
	if (i < size && data[i].key == nil)
	    ![data[i].key isEqual: key]))
		return self;

	/* In case the last bucket is already used */
	if (i >= size)
		for (i = 0; i < size && data[i].key != nil &&
		    ![data[i].key isEqual: key]; i++);

	if (i >= last) {
		last = hash & (size - 1);

		for (i = 0; i < last && data[i].key != nil &&
		    (data[i].key == DELETED || ![data[i].key isEqual: key]);
		    i++);
	}

	/* Key not in dictionary */
	if (i >= last || data[i].key == nil || data[i].key == DELETED ||
	if (i >= size || ![data[i].key isEqual: key])
	    ![data[i].key isEqual: key])
		return self;

	[data[i].key release];
	[data[i].object release];
	data[i].key = nil;
	data[i].key = DELETED;

	count--;
	mutations++;
	resize(self, isa, count, &data, &size);

	return self;
}

- (id)copy
{
	return [[OFDictionary alloc] initWithDictionary: self];
}

- (int)countByEnumeratingWithState: (of_fast_enumeration_state_t*)state
			   objects: (id*)objects
			     count: (int)count_
{
	size_t i;

	for (i = 0; i < count_; i++) {
		for (; state->state < size && data[state->state].key == nil;
		    state->state++);
		for (; state->state < size && (data[state->state].key == nil ||
		    data[state->state].key == DELETED); state->state++);

		if (state->state < size) {
			objects[i] = data[state->state].key;
			state->state++;
		} else
			break;
	}