ObjFW  Diff

Differences From Artifact [daca96d316]:

• File src/OFKernelEventObserver_poll.m — part of check-in [13ee56edf3] at 2014-06-21 21:43:43 on branch trunk — Move all macros from OFObject.h to macros.h

  This means that OFObject.h imports macros.h now, making it unnecessary
  to manually import macros.h in almost every file. And while at it, also
  import autorelease.h in OFObject.h, so that this doesn't need to be
  manually imported in almost every file as well. (user: js, size: 3772) [annotate] [blame] [check-ins using]

To Artifact [ab4899dd72]:

• File src/OFKernelEventObserver_poll.m — part of check-in [1dbe9a4e4e] at 2014-08-22 19:09:34 on branch trunk — Retain sockets until after removal from observer

  Not retaining them caused kevent() to be called on an invalid fd. (user: js, size: 3794) [annotate] [blame] [check-ins using]

129
130
131
132
133
134
135
136
137
138
139
140
141
142
143

- (bool)observeForTimeInterval: (of_time_interval_t)timeInterval
{
	void *pool = objc_autoreleasePoolPush();
	struct pollfd *FDs;
	size_t i, nFDs, realEvents = 0;

	[self OF_processQueue];

	if ([self OF_processCache]) {
		objc_autoreleasePoolPop(pool);
		return true;
	}

	objc_autoreleasePoolPop(pool);

|

129
130
131
132
133
134
135
136
137
138
139
140
141
142
143

- (bool)observeForTimeInterval: (of_time_interval_t)timeInterval
{
	void *pool = objc_autoreleasePoolPush();
	struct pollfd *FDs;
	size_t i, nFDs, realEvents = 0;

	[self OF_processQueueAndStoreRemovedIn: nil];

	if ([self OF_processCache]) {
		objc_autoreleasePoolPop(pool);
		return true;
	}

	objc_autoreleasePoolPop(pool);