ObjFW  Diff

Differences From Artifact [662ee50aca]:

To Artifact [e75e01d402]:


88
89
90
91
92
93
94
95

96
97
98
99
100
101
102
88
89
90
91
92
93
94

95
96
97
98
99
100
101
102







-
+







	close(_epfd);

	[_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;

	events = (intptr_t)[_FDToEvents
111
112
113
114
115
116
117
118

119
120
121
122
123
124
125
111
112
113
114
115
116
117

118
119
120
121
122
123
124
125







-
+







		@throw [OFObserveFailedException exceptionWithObserver: self
								 errNo: errno];

	[_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;

	events = (intptr_t)[_FDToEvents
	    objectForKey: (void *)((intptr_t)fd + 1)];
145
146
147
148
149
150
151
152

153
154

155
156
157
158
159

160
161

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
145
146
147
148
149
150
151

152
153

154
155
156
157
158

159
160

161
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







-
+

-
+




-
+

-
+




-
+

-
+




-
+

-
+










-
+

-
+







					    errNo: errno];

		[_FDToEvents setObject: (void *)events
				forKey: (void *)((intptr_t)fd + 1)];
	}
}

- (void)OF_addObjectForReading: (id <OFReadyForReadingObserving>)object
- (void)of_addObjectForReading: (id <OFReadyForReadingObserving>)object
{
	[self OF_addObject: object
	[self of_addObject: object
	    fileDescriptor: [object fileDescriptorForReading]
		    events: EPOLLIN];
}

- (void)OF_addObjectForWriting: (id <OFReadyForWritingObserving>)object
- (void)of_addObjectForWriting: (id <OFReadyForWritingObserving>)object
{
	[self OF_addObject: object
	[self of_addObject: object
	    fileDescriptor: [object fileDescriptorForWriting]
		    events: EPOLLOUT];
}

- (void)OF_removeObjectForReading: (id <OFReadyForReadingObserving>)object
- (void)of_removeObjectForReading: (id <OFReadyForReadingObserving>)object
{
	[self OF_removeObject: object
	[self of_removeObject: object
	       fileDescriptor: [object fileDescriptorForReading]
		       events: EPOLLIN];
}

- (void)OF_removeObjectForWriting: (id <OFReadyForWritingObserving>)object
- (void)of_removeObjectForWriting: (id <OFReadyForWritingObserving>)object
{
	[self OF_removeObject: object
	[self of_removeObject: object
	       fileDescriptor: [object fileDescriptorForWriting]
		       events: EPOLLOUT];
}

- (void)observeForTimeInterval: (of_time_interval_t)timeInterval
{
	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));

	if (events < 0)
		@throw [OFObserveFailedException exceptionWithObserver: self