Overview
Comment: | Add -[OFDataArray initWithItemSize:capacity:]. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
e403ca05cbe63a37f5d02e7850cd02b8 |
User & Date: | js on 2013-02-18 10:38:00 |
Other Links: | manifest | tags |
Context
2013-02-18
| ||
11:07 | Add -[OFMutableDictionary initWithCapacity:]. check-in: 4fb0f4bf66 user: js tags: trunk | |
10:38 | Add -[OFDataArray initWithItemSize:capacity:]. check-in: e403ca05cb user: js tags: trunk | |
2013-02-17
| ||
13:36 | Use __VA_ARGS__ for Block_copy. check-in: c875400bbf user: js tags: trunk | |
Changes
Modified src/OFDataArray.h from [ccf132759c] to [82ab1af0db].
︙ | |||
28 29 30 31 32 33 34 | 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 | - + - | * * For security reasons, serialization and deserialization is only implemented * for OFDataArrays with item size 1. */ @interface OFDataArray: OFObject <OFCopying, OFComparing, OFSerialization> { uint8_t *_items; |
︙ | |||
54 55 56 57 58 59 60 61 62 63 64 65 66 67 | 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 | + + + + + + + + + + + | * size. * * @param itemSize The size of a single element in the OFDataArray * @return A new autoreleased OFDataArray */ + (instancetype)dataArrayWithItemSize: (size_t)itemSize; /*! * @brief Creates a new OFDataArray with enough memory to hold the specified * number of items which all have the same specified size. * * @param itemSize The size of a single element in the OFDataArray * @param capacity The initial capacity for the OFDataArray * @return A new autoreleased OFDataArray */ + (instancetype)dataArrayWithItemSize: (size_t)itemSize capacity: (size_t)capacity; /*! * @brief Creates a new OFDataArary with an item size of 1, containing the data * of the specified file. * * @param path The path of the file * @return A new autoreleased OFDataArray */ |
︙ | |||
99 100 101 102 103 104 105 106 107 108 109 110 111 112 | 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 | + + + + + + + + + + + + | * same size. * * @param itemSize The size of a single element in the OFDataArray * @return An initialized OFDataArray */ - initWithItemSize: (size_t)itemSize; /*! * @brief Initializes an already allocated OFDataArray with enough memory to * hold the specified number of items which all have the same specified * size. * * @param itemSize The size of a single element in the OFDataArray * @param capacity The initial capacity for the OFDataArray * @return An initialized OFDataArray */ - initWithItemSize: (size_t)itemSize capacity: (size_t)capacity; /*! * @brief Initializes an already allocated OFDataArray with an item size of 1, * containing the data of the specified file. * * @param path The path of the file * @return An initialized OFDataArray */ |
︙ |
Modified src/OFDataArray.m from [85eaead6fd] to [a9fd1ff3d3].
︙ | |||
54 55 56 57 58 59 60 61 62 63 64 65 66 67 | 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 | + + + + + + + | return [[[self alloc] init] autorelease]; } + (instancetype)dataArrayWithItemSize: (size_t)itemSize { return [[[self alloc] initWithItemSize: itemSize] autorelease]; } + (instancetype)dataArrayWithItemSize: (size_t)itemSize capacity: (size_t)capacity { return [[[self alloc] initWithItemSize: itemSize capacity: capacity] autorelease]; } + (instancetype)dataArrayWithContentsOfFile: (OFString*)path { return [[[self alloc] initWithContentsOfFile: path] autorelease]; } + (instancetype)dataArrayWithContentsOfURL: (OFURL*)URL |
︙ | |||
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 | - - - - - + + + + + + + + + + + + + - - + + + + - + + + | + (instancetype)dataArrayWithBase64EncodedString: (OFString*)string { return [[[self alloc] initWithBase64EncodedString: string] autorelease]; } - init { |
︙ | |||
167 168 169 170 171 172 173 174 175 176 177 178 179 180 | 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 | + + + + | if ([reply statusCode] != 200) @throw [OFHTTPRequestFailedException exceptionWithClass: [request class] request: request reply: reply]; /* * TODO: This can be optimized by allocating a data array with the * capacity from the Content-Length header. */ self = [[reply readDataArrayTillEndOfStream] retain]; headers = [reply headers]; if ((contentLength = [headers objectForKey: @"Content-Length"]) != nil) if ([self count] != (size_t)[contentLength decimalValue]) @throw [OFTruncatedDataException exceptionWithClass: [self class]]; |
︙ | |||
238 239 240 241 242 243 244 | 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 | - + + - - - - - - - - - + - - - | } return self; } - initWithBase64EncodedString: (OFString*)string { |
︙ | |||
336 337 338 339 340 341 342 | 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 | + - - - + + + + + + - - - + + + + + + - - - + + + + + | } - (void)addItem: (const void*)item { if (SIZE_MAX - _count < 1) @throw [OFOutOfRangeException exceptionWithClass: [self class]]; if (_count + 1 > _capacity) { |
︙ | |||
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 | 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 | + + + - + + | (_count - range.location - range.length) * _itemSize); _count -= range.length; @try { _items = [self resizeMemory: _items size: _itemSize count: _count]; _capacity = _count; } @catch (OFOutOfMemoryException *e) { /* We don't really care, as we only made it smaller */ } } - (void)removeLastItem { if (_count == 0) return; _count--; @try { _items = [self resizeMemory: _items size: _itemSize count: _count]; _capacity = _count; } @catch (OFOutOfMemoryException *e) { /* We don't care, as we only made it smaller */ } } - (void)removeAllItems { [self freeMemory: _items]; _items = NULL; _count = 0; _capacity = 0; } - copy { |
︙ | |||
588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 | 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 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 | + + + + + + + + + + + - + + + - + + + - + + + | objc_autoreleasePoolPop(pool); return [element autorelease]; } @end @implementation OFBigDataArray - initWithItemSize: (size_t)itemSize capacity: (size_t)capacity { size_t lastPageByte = [OFSystemInfo pageSize] - 1; capacity = (capacity * itemSize + lastPageByte) & ~lastPageByte; return [super initWithItemSize: itemSize capacity: capacity]; } - (void)addItem: (const void*)item { size_t size, lastPageByte; if (SIZE_MAX - _count < 1 || _count + 1 > SIZE_MAX / _itemSize) @throw [OFOutOfRangeException exceptionWithClass: [self class]]; lastPageByte = [OFSystemInfo pageSize] - 1; size = ((_count + 1) * _itemSize + lastPageByte) & ~lastPageByte; |
︙ | |||
674 675 676 677 678 679 680 681 682 683 684 685 686 687 | 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 | + | pageSize = [OFSystemInfo pageSize]; size = (_count * _itemSize + pageSize - 1) & ~(pageSize - 1); if (_size != size && size >= pageSize) { @try { _items = [self resizeMemory: _items size: size]; _capacity = size; } @catch (OFOutOfMemoryException *e) { /* We don't care, as we only made it smaller */ } _size = size; } } |
︙ | |||
697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 | 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 | + + | pageSize = [OFSystemInfo pageSize]; size = (_count * _itemSize + pageSize - 1) & ~(pageSize - 1); if (_size != size && size >= pageSize) { @try { _items = [self resizeMemory: _items size: size]; _capacity = size; } @catch (OFOutOfMemoryException *e) { /* We don't care, as we only made it smaller */ } _size = size; } } - (void)removeAllItems { size_t pageSize = [OFSystemInfo pageSize]; @try { _items = [self resizeMemory: _items size: pageSize]; _capacity = pageSize; _size = pageSize; } @catch (OFOutOfMemoryException *e) { /* We don't care, as we only made it smaller */ } _count = 0; } @end |
Modified src/OFFile.h from [5c8981b0ad] to [d7d2855fce].
︙ | |||
272 273 274 275 276 277 278 | 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 | - + - + - + | #ifdef __cplusplus extern "C" { #endif /*! @file */ /*! |
Modified src/OFObject.m from [9691c753e2] to [68901c9b91].
︙ | |||
834 835 836 837 838 839 840 841 842 843 844 845 846 847 | 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 | + + + | return [OFString stringWithFormat: @"<%@: %p>", [self className], self]; } - (void*)allocMemoryWithSize: (size_t)size { void *pointer; struct pre_mem *preMem; if OF_UNLIKELY (size == 0) return NULL; if OF_UNLIKELY (size > SIZE_MAX - PRE_IVARS_ALIGN) @throw [OFOutOfRangeException exceptionWithClass: [self class]]; if OF_UNLIKELY ((pointer = malloc(PRE_MEM_ALIGN + size)) == NULL) @throw [OFOutOfMemoryException exceptionWithClass: [self class] requestedSize: size]; |
︙ | |||
860 861 862 863 864 865 866 | 863 864 865 866 867 868 869 870 871 872 873 874 875 876 | - - - | return (char*)pointer + PRE_MEM_ALIGN; } - (void*)allocMemoryWithSize: (size_t)size count: (size_t)count { |
︙ |