Comment: | Use class swizzling as an optimization. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
06f539766fc09a00dfb0ed4cbf738c83 |
User & Date: | js on 2011-02-26 19:40:50 |
Other Links: | manifest | tags |
2011-02-27
| ||
00:09 | OFURL: Include the / in the path for http(s). check-in: 3d041cd4bf user: js tags: trunk | |
2011-02-26
| ||
19:40 | Use class swizzling as an optimization. check-in: 06f539766f user: js tags: trunk | |
19:00 | Make isa public to allow for better class swizzling. check-in: 58c07e80e4 user: js tags: trunk | |
Modified src/OFApplication.h from [f1e2ce1411] to [b0da128322].
︙ | ︙ | |||
55 56 57 58 59 60 61 | OFMutableDictionary *environment; id <OFApplicationDelegate> delegate; int *argc; char ***argv; } #ifdef OF_HAVE_PROPERTIES | | | | | 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 | OFMutableDictionary *environment; id <OFApplicationDelegate> delegate; int *argc; char ***argv; } #ifdef OF_HAVE_PROPERTIES @property (readonly, copy) OFString *programName; @property (readonly, copy) OFArray *arguments; @property (readonly, copy) OFDictionary *environment; @property (retain) id <OFApplicationDelegate> delegate; #endif /** * \return The only OFApplication instance in the application */ + sharedApplication; |
︙ | ︙ |
Modified src/OFApplication.m from [b6ae30499e] to [1a56a34657].
︙ | ︙ | |||
128 129 130 131 132 133 134 135 136 137 138 139 140 141 | value = [OFString stringWithCString: sep + 1]; [environment setObject: value forKey: key]; [pool releaseObjects]; } [pool release]; } @catch (id e) { [self release]; @throw e; } return self; } | > > > > > > > > | 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 | value = [OFString stringWithCString: sep + 1]; [environment setObject: value forKey: key]; [pool releaseObjects]; } [pool release]; /* * Class swizzle the environment to be immutable, as we don't * need to change it anymore and expose it only as * OFDictionary*. But not swizzling it would create a real copy * each time -[copy] is called. */ environment->isa = [OFDictionary class]; } @catch (id e) { [self release]; @throw e; } return self; } |
︙ | ︙ | |||
154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 | programName = [[OFString alloc] initWithCString: (*argv)[0]]; arguments = [[OFMutableArray alloc] init]; for (i = 1; i < *argc; i++) [arguments addObject: [OFString stringWithCString: (*argv)[i]]]; [pool release]; } - (void)getArgumentCount: (int**)argc_ andArgumentValues: (char****)argv_ { *argc_ = argc; *argv_ = argv; } - (OFString*)programName { | > > > > > > > | | | | 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 | programName = [[OFString alloc] initWithCString: (*argv)[0]]; arguments = [[OFMutableArray alloc] init]; for (i = 1; i < *argc; i++) [arguments addObject: [OFString stringWithCString: (*argv)[i]]]; /* * Class swizzle the arguments to be immutable, as we don't need to * change them anymore and expose them only as OFArray*. But not * swizzling it would create a real copy each time -[copy] is called. */ arguments->isa = [OFArray class]; [pool release]; } - (void)getArgumentCount: (int**)argc_ andArgumentValues: (char****)argv_ { *argc_ = argc; *argv_ = argv; } - (OFString*)programName { return [[programName copy] autorelease]; } - (OFArray*)arguments { return [[arguments copy] autorelease]; } - (OFDictionary*)environment { return [[environment copy] autorelease]; } - (id <OFApplicationDelegate>)delegate { return [[(id)delegate retain] autorelease]; } |
︙ | ︙ |
Modified src/OFArray.m from [e3c5e67130] to [5597d30fef].
︙ | ︙ | |||
332 333 334 335 336 337 338 339 340 341 342 343 344 345 | [pool releaseObjects]; } append(str, @selector(appendString:), [objs[i] description]); [pool release]; return str; } - (BOOL)isEqual: (id)obj { id *objs, *objs2; size_t i, count, count2; | > > > > > > | 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 | [pool releaseObjects]; } append(str, @selector(appendString:), [objs[i] description]); [pool release]; /* * Class swizzle the string to be immutable. We declared the return type * to be OFString*, so it can't be modified anyway. But not swizzling it * would create a real copy each time -[copy] is called. */ str->isa = [OFString class]; return str; } - (BOOL)isEqual: (id)obj { id *objs, *objs2; size_t i, count, count2; |
︙ | ︙ | |||
397 398 399 400 401 402 403 | [ret appendString: @")"]; } @catch (id e) { [ret release]; } [pool release]; | | > > > > > > > > | 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 | [ret appendString: @")"]; } @catch (id e) { [ret release]; } [pool release]; [ret autorelease]; /* * Class swizzle the string to be immutable. We declared the return type * to be OFString*, so it can't be modified anyway. But not swizzling it * would create a real copy each time -[copy] is called. */ ret->isa = [OFString class]; return ret; } - (int)countByEnumeratingWithState: (of_fast_enumeration_state_t*)state objects: (id*)objects count: (int)count_ { size_t count = [array count]; |
︙ | ︙ |
Modified src/OFDictionary.m from [484283a6ae] to [fc36854d4b].
︙ | ︙ | |||
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 | size_t i; for (i = 0; i < size; i++) if (data[i] != NULL && data[i] != DELETED) [dict setObject: block(data[i]->key, data[i]->object) forKey: data[i]->key]; return dict; } - (OFDictionary*)filteredDictionaryUsingBlock: (of_dictionary_filter_block_t)block { OFMutableDictionary *dict = [OFMutableDictionary dictionary]; size_t i; for (i = 0; i < size; i++) if (data[i] != NULL && data[i] != DELETED) if (block(data[i]->key, data[i]->object)) [dict setObject: data[i]->object forKey: data[i]->key]; return dict; } #endif - (void)dealloc { uint32_t i; | > > > > > > > > > > > > | 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 | size_t i; for (i = 0; i < size; i++) if (data[i] != NULL && data[i] != DELETED) [dict setObject: block(data[i]->key, data[i]->object) forKey: data[i]->key]; /* * Class swizzle the dictionary to be immutable. We declared the return * type to be OFDictionary*, so it can't be modified anyway. But not * swizzling it would create a real copy each time -[copy] is called. */ dict->isa = [OFDictionary class]; return dict; } - (OFDictionary*)filteredDictionaryUsingBlock: (of_dictionary_filter_block_t)block { OFMutableDictionary *dict = [OFMutableDictionary dictionary]; size_t i; for (i = 0; i < size; i++) if (data[i] != NULL && data[i] != DELETED) if (block(data[i]->key, data[i]->object)) [dict setObject: data[i]->object forKey: data[i]->key]; /* * Class swizzle the dictionary to be immutable. We declared the return * type to be OFDictionary*, so it can't be modified anyway. But not * swizzling it would create a real copy each time -[copy] is called. */ dict->isa = [OFDictionary class]; return dict; } #endif - (void)dealloc { uint32_t i; |
︙ | ︙ | |||
702 703 704 705 706 707 708 709 710 711 712 713 714 715 | [pool2 releaseObjects]; } [ret appendString: @"}"]; [pool release]; return ret; } @end @implementation OFDictionaryEnumerator - initWithData: (struct of_dictionary_bucket**)data_ size: (uint32_t)size_ | > > > > > > | 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 | [pool2 releaseObjects]; } [ret appendString: @"}"]; [pool release]; /* * Class swizzle the string to be immutable. We declared the return type * to be OFString*, so it can't be modified anyway. But not swizzling it * would create a real copy each time -[copy] is called. */ ret->isa = [OFString class]; return ret; } @end @implementation OFDictionaryEnumerator - initWithData: (struct of_dictionary_bucket**)data_ size: (uint32_t)size_ |
︙ | ︙ |
Modified src/OFFile.m from [9d8d131cd6] to [23bde42f6d].
︙ | ︙ | |||
198 199 200 201 202 203 204 205 206 207 208 209 210 211 | } [ret addObject: [OFString stringWithCString: path_c + last length: i - last]]; [pool release]; return ret; } + (OFString*)lastComponentOfPath: (OFString*)path { const char *path_c = [path cString]; size_t path_len = [path cStringLength]; | > > > > > > | 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 | } [ret addObject: [OFString stringWithCString: path_c + last length: i - last]]; [pool release]; /* * Class swizzle the array to be immutable. We declared the return type * to be OFArray*, so it can't be modified anyway. But not swizzling it * would create a real copy each time -[copy] is called. */ ret->isa = [OFArray class]; return ret; } + (OFString*)lastComponentOfPath: (OFString*)path { const char *path_c = [path cString]; size_t path_len = [path cStringLength]; |
︙ | ︙ | |||
384 385 386 387 388 389 390 391 392 393 394 395 396 397 | [pool release]; } @finally { FindClose(handle); } #endif return files; } + (void)changeToDirectory: (OFString*)path { if (chdir([path cString])) @throw [OFChangeDirectoryFailedException newWithClass: self | > > > > > > | 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 | [pool release]; } @finally { FindClose(handle); } #endif /* * Class swizzle the array to be immutable. We declared the return type * to be OFArray*, so it can't be modified anyway. But not swizzling it * would create a real copy each time -[copy] is called. */ files->isa = [OFArray class]; return files; } + (void)changeToDirectory: (OFString*)path { if (chdir([path cString])) @throw [OFChangeDirectoryFailedException newWithClass: self |
︙ | ︙ |
Modified src/OFHTTPRequest.m from [a6525bb066] to [238deadfe5].
︙ | ︙ | |||
277 278 279 280 281 282 283 284 285 286 287 288 289 290 | newWithClass: isa]; if (cl != [data count]) @throw [OFTruncatedDataException newWithClass: isa]; } result = [[OFHTTPRequestResult alloc] initWithStatusCode: status headers: s_headers data: data]; } @finally { [pool release]; } | > > > > > > > > | 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 | newWithClass: isa]; if (cl != [data count]) @throw [OFTruncatedDataException newWithClass: isa]; } /* * Class swizzle the dictionary to be immutable. We pass it as * OFDictionary*, so it can't be modified anyway. But not * swizzling it would create a real copy each time -[copy] is * called. */ s_headers->isa = [OFDictionary class]; result = [[OFHTTPRequestResult alloc] initWithStatusCode: status headers: s_headers data: data]; } @finally { [pool release]; } |
︙ | ︙ |
Modified src/OFList.m from [e1a0eb97da] to [3bf1022509].
︙ | ︙ | |||
309 310 311 312 313 314 315 316 317 318 319 320 321 322 | [pool releaseObjects]; } [ret appendString: @"]"]; [pool release]; return ret; } - (int)countByEnumeratingWithState: (of_fast_enumeration_state_t*)state objects: (id*)objects count: (int)count_ { | > > > > > > | 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 | [pool releaseObjects]; } [ret appendString: @"]"]; [pool release]; /* * Class swizzle the string to be immutable. We declared the return type * to be OFString*, so it can't be modified anyway. But not swizzling it * would create a real copy each time -[copy] is called. */ ret->isa = [OFString class]; return ret; } - (int)countByEnumeratingWithState: (of_fast_enumeration_state_t*)state objects: (id*)objects count: (int)count_ { |
︙ | ︙ |
Modified src/OFString+XMLUnescaping.m from [d730c1e0aa] to [62778ccd3c].
︙ | ︙ | |||
158 159 160 161 162 163 164 165 166 167 168 169 170 171 | if (in_entity) @throw [OFInvalidEncodingException newWithClass: isa]; [ret appendCStringWithoutUTF8Checking: string + last length: i - last]; return ret; } #ifdef OF_HAVE_BLOCKS - (OFString*)stringByXMLUnescapingWithBlock: (of_string_xml_unescaping_block_t)block { | > > > > > > | 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 | if (in_entity) @throw [OFInvalidEncodingException newWithClass: isa]; [ret appendCStringWithoutUTF8Checking: string + last length: i - last]; /* * Class swizzle the string to be immutable. We declared the return type * to be OFString*, so it can't be modified anyway. But not swizzling it * would create a real copy each time -[copy] is called. */ ret->isa = [OFString class]; return ret; } #ifdef OF_HAVE_BLOCKS - (OFString*)stringByXMLUnescapingWithBlock: (of_string_xml_unescaping_block_t)block { |
︙ | ︙ | |||
242 243 244 245 246 247 248 249 250 251 252 | if (in_entity) @throw [OFInvalidEncodingException newWithClass: isa]; [ret appendCStringWithoutUTF8Checking: string + last length: i - last]; return ret; } #endif @end | > > > > > > | 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 | if (in_entity) @throw [OFInvalidEncodingException newWithClass: isa]; [ret appendCStringWithoutUTF8Checking: string + last length: i - last]; /* * Class swizzle the string to be immutable. We declared the return type * to be OFString*, so it can't be modified anyway. But not swizzling it * would create a real copy each time -[copy] is called. */ ret->isa = [OFString class]; return ret; } #endif @end |
Modified src/OFString.m from [b4df8282b2] to [88740728b0].
︙ | ︙ | |||
997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 | - (OFString*)stringByAppendingString: (OFString*)str { OFMutableString *new; new = [OFMutableString stringWithString: self]; [new appendString: str]; return new; } - (BOOL)hasPrefix: (OFString*)prefix { size_t len = [prefix cStringLength]; | > > > > > > | 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 | - (OFString*)stringByAppendingString: (OFString*)str { OFMutableString *new; new = [OFMutableString stringWithString: self]; [new appendString: str]; /* * Class swizzle the string to be immutable. We declared the return type * to be OFString*, so it can't be modified anyway. But not swizzling it * would create a real copy each time -[copy] is called. */ new->isa = [OFString class]; return new; } - (BOOL)hasPrefix: (OFString*)prefix { size_t len = [prefix cStringLength]; |
︙ | ︙ | |||
1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 | i += delim_len - 1; last = i + 1; } [array addObject: [OFString stringWithCString: string + last]]; [pool release]; return array; } - (intmax_t)decimalValue { int i = 0; intmax_t num = 0; | > > > > > > | 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 | i += delim_len - 1; last = i + 1; } [array addObject: [OFString stringWithCString: string + last]]; [pool release]; /* * Class swizzle the array to be immutable. We declared the return type * to be OFArray*, so it can't be modified anyway. But not swizzling it * would create a real copy each time -[copy] is called. */ array->isa = [OFArray class]; return array; } - (intmax_t)decimalValue { int i = 0; intmax_t num = 0; |
︙ | ︙ |
Modified src/OFURL.m from [27d2646f3d] to [dd90f55a48].
︙ | ︙ | |||
513 514 515 516 517 518 519 520 521 522 | if (query != nil) [desc appendFormat: @"?%@", query]; if (fragment != nil) [desc appendFormat: @"#%@", fragment]; return desc; } @end | > > > > > > | 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 | if (query != nil) [desc appendFormat: @"?%@", query]; if (fragment != nil) [desc appendFormat: @"#%@", fragment]; /* * Class swizzle the string to be immutable. We declared the return type * to be OFString*, so it can't be modified anyway. But not swizzling it * would create a real copy each time -[copy] is called. */ desc->isa = [OFString class]; return desc; } @end |
Modified src/OFXMLElement.m from [ebee134ccb] to [1c6e965299].
︙ | ︙ | |||
216 217 218 219 220 221 222 223 224 225 226 227 228 229 | if (comment != nil) { OFMutableString *str; str = [OFMutableString stringWithString: @"<!--"]; [str appendString: comment]; [str appendString: @"-->"]; return str; } pool = [[OFAutoreleasePool alloc] init]; def_ns = (defaultNamespace != nil ? defaultNamespace : parent_default_ns); | > > > > > > > | 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 | if (comment != nil) { OFMutableString *str; str = [OFMutableString stringWithString: @"<!--"]; [str appendString: comment]; [str appendString: @"-->"]; /* * Class swizzle the string to be immutable. We declared the * return type to be OFString*, so it can't be modified anyway. * But not swizzling it would create a real copy each time * -[copy] is called. */ str->isa = [OFString class]; return str; } pool = [[OFAutoreleasePool alloc] init]; def_ns = (defaultNamespace != nil ? defaultNamespace : parent_default_ns); |
︙ | ︙ |
Modified src/OFXMLParser.m from [c1d0bcacb5] to [69044e1809].
︙ | ︙ | |||
352 353 354 355 356 357 358 359 360 361 362 363 364 365 | length: *i - *last]; pi = [[cache mutableCopy] autorelease]; len = [pi length]; [pi removeCharactersFromIndex: len - 1 toIndex: len]; [delegate parser: self foundProcessingInstructions: pi]; [pool release]; [cache setToCString: ""]; | > > > > > > > | 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 | length: *i - *last]; pi = [[cache mutableCopy] autorelease]; len = [pi length]; [pi removeCharactersFromIndex: len - 1 toIndex: len]; /* * Class swizzle the string to be immutable. We pass it as * OFString*, so it can't be modified anyway. But not swizzling * it would create a real copy each time -[copy] is called. */ pi->isa = [OFString class]; [delegate parser: self foundProcessingInstructions: pi]; [pool release]; [cache setToCString: ""]; |
︙ | ︙ | |||
806 807 808 809 810 811 812 813 814 815 816 817 818 819 | length: *i - *last]; cdata = [[cache mutableCopy] autorelease]; len = [cdata length]; [cdata removeCharactersFromIndex: len - 2 toIndex: len]; #if defined(OF_HAVE_PROPERTIES) && defined(OF_HAVE_BLOCKS) if (CDATAHandler != NULL) CDATAHandler(self, cdata); else #endif [delegate parser: self foundCDATA: cdata]; | > > > > > > > | 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 | length: *i - *last]; cdata = [[cache mutableCopy] autorelease]; len = [cdata length]; [cdata removeCharactersFromIndex: len - 2 toIndex: len]; /* * Class swizzle the string to be immutable. We pass it as OFString*, so * it can't be modified anyway. But not swizzling it would create a * real copy each time -[copy] is called. */ cdata->isa = [OFString class]; #if defined(OF_HAVE_PROPERTIES) && defined(OF_HAVE_BLOCKS) if (CDATAHandler != NULL) CDATAHandler(self, cdata); else #endif [delegate parser: self foundCDATA: cdata]; |
︙ | ︙ | |||
869 870 871 872 873 874 875 876 877 878 879 880 881 882 | length: *i - *last]; comment = [[cache mutableCopy] autorelease]; len = [comment length]; [comment removeCharactersFromIndex: len - 2 toIndex: len]; #if defined(OF_HAVE_PROPERTIES) && defined(OF_HAVE_BLOCKS) if (commentHandler != NULL) commentHandler(self, comment); else #endif [delegate parser: self foundComment: comment]; | > > > > > > > | 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 | length: *i - *last]; comment = [[cache mutableCopy] autorelease]; len = [comment length]; [comment removeCharactersFromIndex: len - 2 toIndex: len]; /* * Class swizzle the string to be immutable. We pass it as OFString*, so * it can't be modified anyway. But not swizzling it would create a * real copy each time -[copy] is called. */ comment->isa = [OFString class]; #if defined(OF_HAVE_PROPERTIES) && defined(OF_HAVE_BLOCKS) if (commentHandler != NULL) commentHandler(self, comment); else #endif [delegate parser: self foundComment: comment]; |
︙ | ︙ |
Modified src/base64.m from [fbdefb1528] to [769602ecfc].
︙ | ︙ | |||
83 84 85 86 87 88 89 90 91 92 93 94 95 96 | [ret appendCStringWithoutUTF8Checking: tb length: 4]; break; } return ret; } BOOL of_base64_decode(OFDataArray *data, const char *str, size_t len) { const uint8_t *buf = (const uint8_t*)str; | > > > > > > | 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 | [ret appendCStringWithoutUTF8Checking: tb length: 4]; break; } /* * Class swizzle the string to be immutable. We declared the return type * to be OFString*, so it can't be modified anyway. But not swizzling it * would create a real copy each time -[copy] is called. */ ret->isa = [OFString class]; return ret; } BOOL of_base64_decode(OFDataArray *data, const char *str, size_t len) { const uint8_t *buf = (const uint8_t*)str; |
︙ | ︙ |