Differences From Artifact [2620dc6f33]:
- File src/OFStreamObserver.m — part of check-in [acb6598856] at 2012-09-12 06:00:29 on branch trunk — OFStreamObserver: Add -[cancel]. (user: js, size: 8721) [annotate] [blame] [check-ins using]
To Artifact [41b087a39c]:
- File
src/OFStreamObserver.m
— part of check-in
[440e95fd4a]
at
2012-09-12 17:27:53
on branch trunk
— Split -[OFStream fileDescriptor].
It is now -[fileDescriptorForReading] and -[fileDescriptorForWriting].
The split was necessary as some stream types (e.g. OFProcess) don't have
a single file descriptor, but two. This allows to use those stream types
with OFStreamObserver as well. (user: js, size: 8761) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
185 186 187 188 189 190 191 |
}
- (void)addStreamForReading: (OFStream*)stream
{
[mutex lock];
@try {
int qi = QUEUE_ADD | QUEUE_READ;
| | | | | 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 |
}
- (void)addStreamForReading: (OFStream*)stream
{
[mutex lock];
@try {
int qi = QUEUE_ADD | QUEUE_READ;
int fd = [stream fileDescriptorForReading];
[queue addObject: stream];
[queueInfo addItem: &qi];
[queueFDs addItem: &fd];
} @finally {
[mutex unlock];
}
[self cancel];
}
- (void)addStreamForWriting: (OFStream*)stream
{
[mutex lock];
@try {
int qi = QUEUE_ADD | QUEUE_WRITE;
int fd = [stream fileDescriptorForWriting];
[queue addObject: stream];
[queueInfo addItem: &qi];
[queueFDs addItem: &fd];
} @finally {
[mutex unlock];
}
[self cancel];
}
- (void)removeStreamForReading: (OFStream*)stream
{
[mutex lock];
@try {
int qi = QUEUE_REMOVE | QUEUE_READ;
int fd = [stream fileDescriptorForReading];
[queue addObject: stream];
[queueInfo addItem: &qi];
[queueFDs addItem: &fd];
} @finally {
[mutex unlock];
}
|
| ︙ | ︙ | |||
241 242 243 244 245 246 247 |
}
- (void)removeStreamForWriting: (OFStream*)stream
{
[mutex lock];
@try {
int qi = QUEUE_REMOVE | QUEUE_WRITE;
| | | 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 |
}
- (void)removeStreamForWriting: (OFStream*)stream
{
[mutex lock];
@try {
int qi = QUEUE_REMOVE | QUEUE_WRITE;
int fd = [stream fileDescriptorForWriting];
[queue addObject: stream];
[queueInfo addItem: &qi];
[queueFDs addItem: &fd];
} @finally {
[mutex unlock];
}
|
| ︙ | ︙ |