Differences From Artifact [0f13518563]:
- File
src/OFRunLoop.m
— part of check-in
[932eb2bd6f]
at
2012-09-20 00:06:22
on branch trunk
— ObjC 1 fix.
Don't let OFRunLoop conform to OFStreamObserverDelegate, as it does not
fully implement the protocol and we have no @optional in ObjC 1. (user: js, size: 12100) [annotate] [blame] [check-ins using]
To Artifact [5d7da15761]:
- File
src/OFRunLoop.m
— part of check-in
[6343e04dcd]
at
2012-10-17 20:16:10
on branch trunk
— Pass exceptions on async I/O.
This makes it possible to handle exceptions that occurred during async
I/O in the specified handler. (user: js, size: 12900) [annotate] [blame] [check-ins using] [more...]
| ︙ | ︙ | |||
304 305 306 307 308 309 310 |
OF_ENSURE(queue != nil);
listObject = [queue firstListObject];
if ([listObject->object isKindOfClass:
[OFRunLoop_ReadQueueItem class]]) {
OFRunLoop_ReadQueueItem *queueItem = listObject->object;
| > > > > | | > > > > | | | > | | > > > > | | | | > > > > | | | > | | > > > > | > > > | > | > | > | | > | > > > > > | > > > > | | > | > | | 304 305 306 307 308 309 310 311 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 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 425 426 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 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 509 510 511 512 513 514 515 516 |
OF_ENSURE(queue != nil);
listObject = [queue firstListObject];
if ([listObject->object isKindOfClass:
[OFRunLoop_ReadQueueItem class]]) {
OFRunLoop_ReadQueueItem *queueItem = listObject->object;
size_t length;
OFException *exception = nil;
@try {
length = [stream readIntoBuffer: queueItem->buffer
length: queueItem->length];
} @catch (OFException *e) {
length = 0;
exception = e;
}
#ifdef OF_HAVE_BLOCKS
if (queueItem->block != NULL) {
if (!queueItem->block(stream, queueItem->buffer,
length, exception)) {
[queue removeListObject: listObject];
if ([queue count] == 0) {
[streamObserver
removeStreamForReading: stream];
[readQueues removeObjectForKey: stream];
}
}
} else {
#endif
BOOL (*func)(id, SEL, OFStream*, void*, size_t,
OFException*) = (BOOL(*)(id, SEL, OFStream*, void*,
size_t, OFException*))
[queueItem->target methodForSelector:
queueItem->selector];
if (!func(queueItem->target, queueItem->selector,
stream, queueItem->buffer, length, exception)) {
[queue removeListObject: listObject];
if ([queue count] == 0) {
[streamObserver
removeStreamForReading: stream];
[readQueues removeObjectForKey: stream];
}
}
#ifdef OF_HAVE_BLOCKS
}
#endif
} else if ([listObject->object isKindOfClass:
[OFRunLoop_ExactReadQueueItem class]]) {
OFRunLoop_ExactReadQueueItem *queueItem = listObject->object;
size_t length;
OFException *exception = nil;
@try {
length = [stream
readIntoBuffer: (char*)queueItem->buffer +
queueItem->readLength
length: queueItem->exactLength -
queueItem->readLength];
} @catch (OFException *e) {
length = 0;
exception = e;
}
queueItem->readLength += length;
if (queueItem->readLength == queueItem->exactLength ||
[stream isAtEndOfStream] || exception != nil) {
#ifdef OF_HAVE_BLOCKS
if (queueItem->block != NULL) {
if (queueItem->block(stream, queueItem->buffer,
queueItem->readLength, exception))
queueItem->readLength = 0;
else {
[queue removeListObject: listObject];
if ([queue count] == 0) {
[streamObserver
removeStreamForReading:
stream];
[readQueues
removeObjectForKey: stream];
}
}
} else {
#endif
BOOL (*func)(id, SEL, OFStream*, void*,
size_t, OFException*) = (BOOL(*)(id, SEL,
OFStream*, void*, size_t, OFException*))
[queueItem->target
methodForSelector: queueItem->selector];
if (func(queueItem->target,
queueItem->selector, stream,
queueItem->buffer, queueItem->readLength,
exception))
queueItem->readLength = 0;
else {
[queue removeListObject: listObject];
if ([queue count] == 0) {
[streamObserver
removeStreamForReading:
stream];
[readQueues
removeObjectForKey: stream];
}
}
#ifdef OF_HAVE_BLOCKS
}
#endif
}
} else if ([listObject->object isKindOfClass:
[OFRunLoop_ReadLineQueueItem class]]) {
OFRunLoop_ReadLineQueueItem *queueItem = listObject->object;
OFString *line;
OFException *exception = nil;
@try {
line = [stream
tryReadLineWithEncoding: queueItem->encoding];
} @catch (OFException *e) {
line = nil;
exception = e;
}
if (line != nil || [stream isAtEndOfStream] ||
exception != nil) {
#ifdef OF_HAVE_BLOCKS
if (queueItem->block != NULL) {
if (!queueItem->block(stream, line,
exception)) {
[queue removeListObject: listObject];
if ([queue count] == 0) {
[streamObserver
removeStreamForReading:
stream];
[readQueues
removeObjectForKey: stream];
}
}
} else {
#endif
BOOL (*func)(id, SEL, OFStream*, OFString*,
OFException*) = (BOOL(*)(id, SEL, OFStream*,
OFString*, OFException*))
[queueItem->target methodForSelector:
queueItem->selector];
if (!func(queueItem->target,
queueItem->selector, stream, line,
exception)) {
[queue removeListObject: listObject];
if ([queue count] == 0) {
[streamObserver
removeStreamForReading:
stream];
[readQueues
removeObjectForKey: stream];
}
}
#ifdef OF_HAVE_BLOCKS
}
#endif
}
} else if ([listObject->object isKindOfClass:
[OFRunLoop_AcceptQueueItem class]]) {
OFRunLoop_AcceptQueueItem *queueItem = listObject->object;
OFTCPSocket *newSocket;
OFException *exception = nil;
@try {
newSocket = [(OFTCPSocket*)stream accept];
} @catch (OFException *e) {
newSocket = nil;
exception = e;
}
#ifdef OF_HAVE_BLOCKS
if (queueItem->block != NULL) {
if (!queueItem->block((OFTCPSocket*)stream,
newSocket, exception)) {
[queue removeListObject: listObject];
if ([queue count] == 0) {
[streamObserver
removeStreamForReading: stream];
[readQueues removeObjectForKey: stream];
}
}
} else {
#endif
BOOL (*func)(id, SEL, OFTCPSocket*, OFTCPSocket*,
OFException*) =
(BOOL(*)(id, SEL, OFTCPSocket*, OFTCPSocket*,
OFException*))
[queueItem->target methodForSelector:
queueItem->selector];
if (!func(queueItem->target, queueItem->selector,
(OFTCPSocket*)stream, newSocket, exception)) {
[queue removeListObject: listObject];
if ([queue count] == 0) {
[streamObserver
removeStreamForReading: stream];
[readQueues removeObjectForKey: stream];
}
|
| ︙ | ︙ |