Differences From Artifact [df8f106867]:
- File src/OFString_UTF8.m — part of check-in [10e0d710ab] at 2012-02-27 13:14:58 on branch trunk — Fix missing includes of <sys/types.h> for ssize_t. (user: js, size: 24777) [annotate] [blame] [check-ins using]
To Artifact [2df9fbd0df]:
- File
src/OFString_UTF8.m
— part of check-in
[28170f5f65]
at
2012-03-15 11:29:24
on branch trunk
— Greatly improve OFObject's memory handling and performance.
A linked-list is put before each memory chunk allocated instead of
having an array of all memory chunks. This means only one malloc now
instead of one malloc and one realloc. This also means that when
checking reallocs and frees, it's no longer necessary to iterate through
all memory chunks, as the linked list also contains the owner, meaning
realloc and free are no longer O(n), but O(1) now.As allocating bigger chunks seems to be a little bit slower than smaller
chunks, it seems that this is slightly slower in benchmarks if only very small
chunks are allocated. However, measuring real world usage, it's a lot faster. (user: js, size: 24829) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 |
- initWithFormat: (OFConstantString*)format
arguments: (va_list)arguments
{
self = [super init];
@try {
int cStringLength;
if (format == nil)
@throw [OFInvalidArgumentException
exceptionWithClass: isa
selector: _cmd];
s = [self allocMemoryWithSize: sizeof(*s)];
memset(s, 0, sizeof(*s));
| > | | | | | > > | | < | 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 |
- initWithFormat: (OFConstantString*)format
arguments: (va_list)arguments
{
self = [super init];
@try {
char *tmp;
int cStringLength;
if (format == nil)
@throw [OFInvalidArgumentException
exceptionWithClass: isa
selector: _cmd];
s = [self allocMemoryWithSize: sizeof(*s)];
memset(s, 0, sizeof(*s));
if ((cStringLength = of_vasprintf(&tmp, [format UTF8String],
arguments)) == -1)
@throw [OFInvalidFormatException
exceptionWithClass: isa];
s->cStringLength = cStringLength;
@try {
switch (of_string_check_utf8(tmp, cStringLength,
&s->length)) {
case 1:
s->UTF8 = YES;
break;
case -1:
@throw [OFInvalidEncodingException
exceptionWithClass: isa];
}
s->cString = [self
allocMemoryWithSize: cStringLength + 1];
memcpy(s->cString, tmp, cStringLength + 1);
} @finally {
free(tmp);
}
} @catch (id e) {
[self release];
@throw e;
}
return self;
|
| ︙ | ︙ |