Overview
Comment: | OFMapTable: Reseed on resize. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
f7018aedf9101cb6e29cff6e225bed8c |
User & Date: | js on 2012-12-05 21:28:50 |
Other Links: | manifest | tags |
Context
2012-12-06
| ||
00:14 | Improve -[hash] of OFNumber and OFObject. check-in: ac51f5f0cf user: js tags: trunk | |
2012-12-05
| ||
21:28 | OFMapTable: Reseed on resize. check-in: f7018aedf9 user: js tags: trunk | |
12:22 | OFLocking: Add property for lock name. check-in: 5918fe8ab2 user: js tags: trunk | |
Changes
Modified src/OFMapTable.m from [fac29d9273] to [06127d91bb].
︙ | ︙ | |||
14 15 16 17 18 19 20 21 22 23 24 25 26 27 | * file. */ #include "config.h" #include <stdlib.h> #include <string.h> #include <sys/time.h> #import "OFMapTable.h" #import "OFEnumerator.h" #import "OFEnumerationMutationException.h" | > > | 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 | * file. */ #include "config.h" #include <stdlib.h> #include <string.h> #include <assert.h> #include <sys/time.h> #import "OFMapTable.h" #import "OFEnumerator.h" #import "OFEnumerationMutationException.h" |
︙ | ︙ | |||
288 289 290 291 292 293 294 | } return NULL; } - (void)OF_resizeForCount: (uint32_t)newCount { | | | 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 | } return NULL; } - (void)OF_resizeForCount: (uint32_t)newCount { uint32_t i, fullness, newCapacity, newSeed = 0, seedUpdate = 0; struct of_map_table_bucket **newBuckets; if (newCount > UINT32_MAX || newCount > UINT32_MAX / sizeof(*buckets) || newCount > UINT32_MAX / 8) @throw [OFOutOfRangeException exceptionWithClass: [self class]]; fullness = newCount * 8 / capacity; |
︙ | ︙ | |||
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 | return; newBuckets = [self allocMemoryWithSize: sizeof(*newBuckets) count: newCapacity]; for (i = 0; i < newCapacity; i++) newBuckets[i] = NULL; for (i = 0; i < capacity; i++) { if (buckets[i] != NULL && buckets[i] != &deleted) { uint32_t j, last; last = newCapacity; j = buckets[i]->hash & (newCapacity - 1); for (; j < last && newBuckets[j] != NULL; j++); /* In case the last bucket is already used */ if (j >= last) { last = buckets[i]->hash & (newCapacity - 1); for (j = 0; j < last && newBuckets[j] != NULL; j++); } | > > > > > > > > > > > > > | < < < < > | | | > | > | | | 314 315 316 317 318 319 320 321 322 323 324 325 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 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 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 | return; newBuckets = [self allocMemoryWithSize: sizeof(*newBuckets) count: newCapacity]; for (i = 0; i < newCapacity; i++) newBuckets[i] = NULL; if (of_hash_seed != 0) { #if defined(OF_HAVE_ARC4RANDOM) newSeed = arc4random(); #elif defined(OF_HAVE_RANDOM) newSeed = random(); #else newSeed = rand(); #endif seedUpdate = seed ^ newSeed; } for (i = 0; i < capacity; i++) { if (buckets[i] != NULL && buckets[i] != &deleted) { uint32_t j, last; buckets[i]->hash ^= seedUpdate; last = newCapacity; j = buckets[i]->hash & (newCapacity - 1); for (; j < last && newBuckets[j] != NULL; j++); /* In case the last bucket is already used */ if (j >= last) { last = buckets[i]->hash & (newCapacity - 1); for (j = 0; j < last && newBuckets[j] != NULL; j++); } assert(j < last); newBuckets[j] = buckets[i]; } } [self freeMemory: buckets]; buckets = newBuckets; capacity = newCapacity; seed = newSeed; } - (void)OF_setValue: (void*)value forKey: (void*)key hash: (uint32_t)hash { uint32_t i, last, seededHash; void *old; if (key == NULL || value == NULL) @throw [OFInvalidArgumentException exceptionWithClass: [self class] selector: _cmd]; last = capacity; seededHash = hash ^ seed; for (i = seededHash & (capacity - 1); i < last && buckets[i] != NULL; i++) { if (buckets[i] == &deleted) continue; if (keyFunctions.equal(buckets[i]->key, key)) break; } /* In case the last bucket is already used */ if (i >= last) { last = seededHash & (capacity - 1); for (i = 0; i < last && buckets[i] != NULL; i++) { if (buckets[i] == &deleted) continue; if (keyFunctions.equal(buckets[i]->key, key)) break; } } /* Key not in dictionary */ if (i >= last || buckets[i] == NULL || buckets[i] == &deleted || !keyFunctions.equal(buckets[i]->key, key)) { struct of_map_table_bucket *bucket; [self OF_resizeForCount: count + 1]; seededHash = hash ^ seed; mutations++; last = capacity; for (i = seededHash & (capacity - 1); i < last && buckets[i] != NULL && buckets[i] != &deleted; i++); /* In case the last bucket is already used */ if (i >= last) { last = seededHash & (capacity - 1); for (i = 0; i < last && buckets[i] != NULL && buckets[i] != &deleted; i++); } if (i >= last) @throw [OFOutOfRangeException |
︙ | ︙ | |||
423 424 425 426 427 428 429 | bucket->value = valueFunctions.retain(value); } @catch (id e) { keyFunctions.release(key); [self freeMemory: bucket]; @throw e; } | | | 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 | bucket->value = valueFunctions.retain(value); } @catch (id e) { keyFunctions.release(key); [self freeMemory: bucket]; @throw e; } bucket->hash = seededHash; buckets[i] = bucket; count++; return; } |
︙ | ︙ |