@@ -90,11 +90,11 @@ [_FDToEvents release]; [super dealloc]; } -- (void)OF_addObject: (id)object +- (void)of_addObject: (id)object fileDescriptor: (int)fd events: (int)addEvents { struct epoll_event event; intptr_t events; @@ -113,11 +113,11 @@ [_FDToEvents setObject: (void *)(events | addEvents) forKey: (void *)((intptr_t)fd + 1)]; } -- (void)OF_removeObject: (id)object +- (void)of_removeObject: (id)object fileDescriptor: (int)fd events: (int)removeEvents { intptr_t events; @@ -147,34 +147,34 @@ [_FDToEvents setObject: (void *)events forKey: (void *)((intptr_t)fd + 1)]; } } -- (void)OF_addObjectForReading: (id )object +- (void)of_addObjectForReading: (id )object { - [self OF_addObject: object + [self of_addObject: object fileDescriptor: [object fileDescriptorForReading] events: EPOLLIN]; } -- (void)OF_addObjectForWriting: (id )object +- (void)of_addObjectForWriting: (id )object { - [self OF_addObject: object + [self of_addObject: object fileDescriptor: [object fileDescriptorForWriting] events: EPOLLOUT]; } -- (void)OF_removeObjectForReading: (id )object +- (void)of_removeObjectForReading: (id )object { - [self OF_removeObject: object + [self of_removeObject: object fileDescriptor: [object fileDescriptorForReading] events: EPOLLIN]; } -- (void)OF_removeObjectForWriting: (id )object +- (void)of_removeObjectForWriting: (id )object { - [self OF_removeObject: object + [self of_removeObject: object fileDescriptor: [object fileDescriptorForWriting] events: EPOLLOUT]; } - (void)observeForTimeInterval: (of_time_interval_t)timeInterval @@ -181,13 +181,13 @@ { OFNull *nullObject = [OFNull null]; struct epoll_event eventList[EVENTLIST_SIZE]; int events; - [self OF_processQueue]; + [self of_processQueue]; - if ([self OF_processReadBuffers]) + if ([self of_processReadBuffers]) return; events = epoll_wait(_epfd, eventList, EVENTLIST_SIZE, (timeInterval != -1 ? timeInterval * 1000 : -1));