Differences From Artifact [58de981563]:
- File
src/OFStreamObserver.m
— part of check-in
[f173477bef]
at
2011-09-19 16:34:04
on branch trunk
— Rename -[allocMemoryForNItems:withSize:] and friends.
It is now -[allocMemoryForNItems:ofSize:]. (user: js, size: 8424) [annotate] [blame] [check-ins using]
To Artifact [2c9b5a07cf]:
- File
src/OFStreamObserver.m
— part of check-in
[47caef4f8a]
at
2011-09-20 18:40:54
on branch trunk
— OFStreamObserver improvements.
* Make it possible to close a stream before the add/remove queue has
been processed.
* The actual implementations don't need to handle OFStreams now, but
get the file descriptor instead.
* Use an OFMutex instead of @synchronized. (user: js, size: 8571) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
22 23 24 25 26 27 28 | #include <assert.h> #include <unistd.h> #import "OFStreamObserver.h" #import "OFArray.h" #import "OFDictionary.h" #import "OFStream.h" | | > | 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 | #include <assert.h> #include <unistd.h> #import "OFStreamObserver.h" #import "OFArray.h" #import "OFDictionary.h" #import "OFStream.h" #import "OFDataArray.h" #ifdef _WIN32 # import "OFTCPSocket.h" #endif #import "OFThread.h" #import "OFAutoreleasePool.h" #ifdef HAVE_POLL_H # import "OFStreamObserver_poll.h" #endif #if defined(HAVE_SYS_SELECT_H) || defined(_WIN32) # import "OFStreamObserver_select.h" |
| ︙ | ︙ | |||
86 87 88 89 90 91 92 | struct sockaddr_in cancelAddr2; socklen_t cancelAddrLen; #endif readStreams = [[OFMutableArray alloc] init]; writeStreams = [[OFMutableArray alloc] init]; queue = [[OFMutableArray alloc] init]; | > | | 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 | struct sockaddr_in cancelAddr2; socklen_t cancelAddrLen; #endif readStreams = [[OFMutableArray alloc] init]; writeStreams = [[OFMutableArray alloc] init]; queue = [[OFMutableArray alloc] init]; queueInfo = [[OFDataArray alloc] initWithItemSize: sizeof(int)]; queueFDs = [[OFDataArray alloc] initWithItemSize: sizeof(int)]; #ifndef _WIN32 if (pipe(cancelFD)) @throw [OFInitializationFailedException newWithClass: isa]; #else /* Make sure WSAStartup has been called */ |
| ︙ | ︙ | |||
127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 |
newWithClass: isa];
#endif
maxFD = cancelFD[0];
FDToStream = [self allocMemoryForNItems: maxFD + 1
ofSize: sizeof(OFStream*)];
FDToStream[cancelFD[0]] = nil;
} @catch (id e) {
[self release];
@throw e;
}
return self;
}
- (void)dealloc
{
close(cancelFD[0]);
close(cancelFD[1]);
[(id)delegate release];
[readStreams release];
[writeStreams release];
[queue release];
[queueInfo release];
[super dealloc];
}
- (id <OFStreamObserverDelegate>)delegate
{
OF_GETTER(delegate, YES)
}
- (void)setDelegate: (id <OFStreamObserverDelegate>)delegate_
{
OF_SETTER(delegate, delegate_, YES, NO)
}
- (void)addStreamForReading: (OFStream*)stream
{
| > > > > > > > > | > | > < | > > > < < | > | > < | > > > < < | > | > < | > > > < < | > | > < | > > > | | > > > > | | < < < < < | < | > | > > | > < < | < < | | | | | < | | < | | > > > | 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 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 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 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 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 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 |
newWithClass: isa];
#endif
maxFD = cancelFD[0];
FDToStream = [self allocMemoryForNItems: maxFD + 1
ofSize: sizeof(OFStream*)];
FDToStream[cancelFD[0]] = nil;
#ifdef OF_THREADS
mutex = [[OFMutex alloc] init];
#endif
} @catch (id e) {
[self release];
@throw e;
}
return self;
}
- (void)dealloc
{
close(cancelFD[0]);
close(cancelFD[1]);
[(id)delegate release];
[readStreams release];
[writeStreams release];
[queue release];
[queueInfo release];
[queueFDs release];
#ifdef OF_THREADS
[mutex release];
#endif
[super dealloc];
}
- (id <OFStreamObserverDelegate>)delegate
{
OF_GETTER(delegate, YES)
}
- (void)setDelegate: (id <OFStreamObserverDelegate>)delegate_
{
OF_SETTER(delegate, delegate_, YES, NO)
}
- (void)addStreamForReading: (OFStream*)stream
{
[mutex lock];
@try {
int qi = QUEUE_ADD | QUEUE_READ;
int fd = [stream fileDescriptor];
[queue addObject: stream];
[queueInfo addItem: &qi];
[queueFDs addItem: &fd];
} @finally {
[mutex unlock];
}
#ifndef _WIN32
assert(write(cancelFD[1], "", 1) > 0);
#else
assert(sendto(cancelFD[1], "", 1, 0, (struct sockaddr*)&cancelAddr,
sizeof(cancelAddr)) > 0);
#endif
}
- (void)addStreamForWriting: (OFStream*)stream
{
[mutex lock];
@try {
int qi = QUEUE_ADD | QUEUE_WRITE;
int fd = [stream fileDescriptor];
[queue addObject: stream];
[queueInfo addItem: &qi];
[queueFDs addItem: &fd];
} @finally {
[mutex unlock];
}
#ifndef _WIN32
assert(write(cancelFD[1], "", 1) > 0);
#else
assert(sendto(cancelFD[1], "", 1, 0, (struct sockaddr*)&cancelAddr,
sizeof(cancelAddr)) > 0);
#endif
}
- (void)removeStreamForReading: (OFStream*)stream
{
[mutex lock];
@try {
int qi = QUEUE_REMOVE | QUEUE_READ;
int fd = [stream fileDescriptor];
[queue addObject: stream];
[queueInfo addItem: &qi];
[queueFDs addItem: &fd];
} @finally {
[mutex unlock];
}
#ifndef _WIN32
assert(write(cancelFD[1], "", 1) > 0);
#else
assert(sendto(cancelFD[1], "", 1, 0, (struct sockaddr*)&cancelAddr,
sizeof(cancelAddr)) > 0);
#endif
}
- (void)removeStreamForWriting: (OFStream*)stream
{
[mutex lock];
@try {
int qi = QUEUE_REMOVE | QUEUE_WRITE;
int fd = [stream fileDescriptor];
[queue addObject: stream];
[queueInfo addItem: &qi];
[queueFDs addItem: &fd];
} @finally {
[mutex unlock];
}
#ifndef _WIN32
assert(write(cancelFD[1], "", 1) > 0);
#else
assert(sendto(cancelFD[1], "", 1, 0, (struct sockaddr*)&cancelAddr,
sizeof(cancelAddr)) > 0);
#endif
}
- (void)_addFileDescriptorForReading: (int)fd
{
@throw [OFNotImplementedException newWithClass: isa
selector: _cmd];
}
- (void)_addFileDescriptorForWriting: (int)fd
{
@throw [OFNotImplementedException newWithClass: isa
selector: _cmd];
}
- (void)_removeFileDescriptorForReading: (int)fd
{
@throw [OFNotImplementedException newWithClass: isa
selector: _cmd];
}
- (void)_removeFileDescriptorForWriting: (int)fd
{
@throw [OFNotImplementedException newWithClass: isa
selector: _cmd];
}
- (void)_processQueue
{
[mutex lock];
@try {
OFStream **queueCArray = [queue cArray];
int *queueInfoCArray = [queueInfo cArray];
int *queueFDsCArray = [queueFDs cArray];
size_t i, count = [queue count];
for (i = 0; i < count; i++) {
OFStream *stream = queueCArray[i];
int action = queueInfoCArray[i];
int fd = queueFDsCArray[i];
if ((action & QUEUE_ACTION) == QUEUE_ADD) {
if (fd > maxFD) {
maxFD = fd;
FDToStream = [self
resizeMemory: FDToStream
toNItems: maxFD + 1
ofSize: sizeof(OFStream*)];
}
FDToStream[fd] = stream;
}
if ((action & QUEUE_ACTION) == QUEUE_REMOVE) {
/* FIXME: Maybe downsize? */
FDToStream[fd] = nil;
}
switch (action) {
case QUEUE_ADD | QUEUE_READ:
[readStreams addObject: stream];
[self _addFileDescriptorForReading: fd];
break;
case QUEUE_ADD | QUEUE_WRITE:
[writeStreams addObject: stream];
[self _addFileDescriptorForWriting: fd];
break;
case QUEUE_REMOVE | QUEUE_READ:
[readStreams removeObjectIdenticalTo: stream];
[self _removeFileDescriptorForReading: fd];
break;
case QUEUE_REMOVE | QUEUE_WRITE:
[writeStreams removeObjectIdenticalTo: stream];
[self _removeFileDescriptorForWriting: fd];
break;
default:
assert(0);
}
}
[queue removeNObjects: count];
[queueInfo removeNItems: count];
[queueFDs removeNItems: count];
} @finally {
[mutex unlock];
}
}
- (void)observe
{
[self observeWithTimeout: -1];
}
|
| ︙ | ︙ |