ObjFW  Diff

Differences From Artifact [306f8337d7]:

• File src/OFKernelEventObserver_kqueue.m — part of check-in [220513a3f5] at 2015-05-09 18:13:19 on branch trunk — More OFKernelEventObserver refactoring

  This was necessary because select(), poll() and kevent() on FreeBSD and
  OS X would sometimes return 0 events, even if there are some, and
  sometimes return the correct number of events that were pending, meaning
  the number of events returned is unreliable. To make things worse,
  whether it returns 0 or the number of events that were pending is
  completely non-deterministic on both FreeBSD and OS X (running the same
  tests multiple times in a row would make it sometimes work and sometimes
  fail).

  In order to prevent code from depending on the return value of
  -[observeForTimeInterval:] (which would depend on select(), poll() and
  kevent() returning the correct number), OFKernelObserver no longer
  returns whether there were pending events. It is expected that
  -[observe] or -[observeForTimeInterval:] is just called in a loop as
  long as events should be handled.

  The tests have been changed as well to reflect this. What they do now is
  set a deadline and call -[observeForTimeInterval:] with a small timeout
  in a loop until the deadline is reached or all events have been handled.

  Note: DragonFlyBSD has not been tested, but will most likely behave like
  FreeBSD and OS X. (user: js, size: 5089) [annotate] [blame] [check-ins using]

To Artifact [80111af3e0]:

• File src/OFKernelEventObserver_kqueue.m — part of check-in [1ba08eebc5] at 2015-10-19 22:15:13 on branch trunk — Add platform.h & make platform defines consistent (user: js, size: 5087) [annotate] [blame] [check-ins using]

93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127

	if ([_changeList count] >= INT_MAX)
		@throw [OFOutOfRangeException exception];

	memset(&event, 0, sizeof(event));
	event.ident = [object fileDescriptorForReading];
	event.filter = EVFILT_READ;
	event.flags = EV_ADD;
#ifndef __NetBSD__
	event.udata = object;
#else
	event.udata = (intptr_t)object;
#endif

	[_changeList addItem: &event];
}

- (void)OF_addObjectForWriting: (id)object
{
	struct kevent event;

	if ([_changeList count] >= INT_MAX)
		@throw [OFOutOfRangeException exception];

	memset(&event, 0, sizeof(event));
	event.ident = [object fileDescriptorForWriting];
	event.filter = EVFILT_WRITE;
	event.flags = EV_ADD;
#ifndef __NetBSD__
	event.udata = object;
#else
	event.udata = (intptr_t)object;
#endif

	[_changeList addItem: &event];
}

|



















|

93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127

	if ([_changeList count] >= INT_MAX)
		@throw [OFOutOfRangeException exception];

	memset(&event, 0, sizeof(event));
	event.ident = [object fileDescriptorForReading];
	event.filter = EVFILT_READ;
	event.flags = EV_ADD;
#ifndef OF_NETBSD
	event.udata = object;
#else
	event.udata = (intptr_t)object;
#endif

	[_changeList addItem: &event];
}

- (void)OF_addObjectForWriting: (id)object
{
	struct kevent event;

	if ([_changeList count] >= INT_MAX)
		@throw [OFOutOfRangeException exception];

	memset(&event, 0, sizeof(event));
	event.ident = [object fileDescriptorForWriting];
	event.filter = EVFILT_WRITE;
	event.flags = EV_ADD;
#ifndef OF_NETBSD
	event.udata = object;
#else
	event.udata = (intptr_t)object;
#endif

	[_changeList addItem: &event];
}