Differences From Artifact [9bc4c1ecdf]:
- File src/OFKernelEventObserver.m — part of check-in [32e8c1ee4c] at 2017-05-21 20:13:25 on branch trunk — OFKernelEventObserver: #if HAVE_* -> #ifdef HAVE_* (user: js, size: 8794) [annotate] [blame] [check-ins using]
To Artifact [1a2dbaaf85]:
- File
src/OFKernelEventObserver.m
— part of check-in
[6b77a5dd8b]
at
2017-05-21 21:28:57
on branch trunk
— Prefix private methods with of_ instead of OF_
This matches Apple's style. (user: js, size: 8794) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
269 270 271 272 273 274 275 | [_mutex unlock]; } #endif [self cancel]; } | | > > > > > | | < < < < < | | 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 |
[_mutex unlock];
}
#endif
[self cancel];
}
- (void)of_addObjectForReading: (id <OFReadyForReadingObserving>)object
{
OF_UNRECOGNIZED_SELECTOR
}
- (void)of_addObjectForWriting: (id <OFReadyForWritingObserving>)object
{
OF_UNRECOGNIZED_SELECTOR
}
- (void)of_removeObjectForReading: (id <OFReadyForReadingObserving>)object
{
OF_UNRECOGNIZED_SELECTOR
}
- (void)of_removeObjectForWriting: (id <OFReadyForWritingObserving>)object
{
OF_UNRECOGNIZED_SELECTOR
}
- (void)of_processQueue
{
void *pool = objc_autoreleasePoolPush();
#ifdef OF_HAVE_THREADS
[_mutex lock];
@try {
#endif
|
| ︙ | ︙ | |||
312 313 314 315 316 317 318 |
id object = queueObjects[i];
switch (action) {
case QUEUE_ADD | QUEUE_READ:
[_readObjects addObject: object];
@try {
| | | | | | | | 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 |
id object = queueObjects[i];
switch (action) {
case QUEUE_ADD | QUEUE_READ:
[_readObjects addObject: object];
@try {
[self of_addObjectForReading: object];
} @catch (id e) {
[_readObjects
removeObjectIdenticalTo: object];
@throw e;
}
break;
case QUEUE_ADD | QUEUE_WRITE:
[_writeObjects addObject: object];
@try {
[self of_addObjectForWriting: object];
} @catch (id e) {
[_writeObjects
removeObjectIdenticalTo: object];
@throw e;
}
break;
case QUEUE_REMOVE | QUEUE_READ:
[self of_removeObjectForReading: object];
[_readObjects removeObjectIdenticalTo: object];
break;
case QUEUE_REMOVE | QUEUE_WRITE:
[self of_removeObjectForWriting: object];
[_writeObjects removeObjectIdenticalTo: object];
break;
default:
OF_ENSURE(0);
}
}
[_queueActions removeAllItems];
[_queueObjects removeAllObjects];
#ifdef OF_HAVE_THREADS
} @finally {
[_mutex unlock];
}
#endif
objc_autoreleasePoolPop(pool);
}
- (bool)of_processReadBuffers
{
bool foundInReadBuffer = false;
for (id object in _readObjects) {
void *pool = objc_autoreleasePoolPush();
if ([object isKindOfClass: [OFStream class]] &&
[object hasDataInReadBuffer] &&
![object of_isWaitingForDelimiter]) {
if ([_delegate respondsToSelector:
@selector(objectIsReadyForReading:)])
[_delegate objectIsReadyForReading: object];
foundInReadBuffer = true;
}
|
| ︙ | ︙ |